projects
/
gnome.introspection-doc-generator
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JSDOC/ScopeParser.js
[gnome.introspection-doc-generator]
/
JSDOC
/
ScopeParser.js
diff --git
a/JSDOC/ScopeParser.js
b/JSDOC/ScopeParser.js
index
7959206
..
9e93c77
100644
(file)
--- a/
JSDOC/ScopeParser.js
+++ b/
JSDOC/ScopeParser.js
@@
-141,7
+141,7
@@
ScopeParser.prototype = {
this.braceNesting = 0;
this.scopes = [];
this.braceNesting = 0;
this.scopes = [];
-
//
print(JSON.stringify(this.ts.tokens, null,4));
+
//
print(JSON.stringify(this.ts.tokens, null,4));
this.globalScope = new Scope(-1, false, -1, '');
this.globalScope = new Scope(-1, false, -1, '');
@@
-243,7
+243,7
@@
ScopeParser.prototype = {
while (token) {
// this.timerPrint("parseScope AFTER lookT: " + token.toString());
//this.dumpToken(token , this.scopes, this.braceNesting);
while (token) {
// this.timerPrint("parseScope AFTER lookT: " + token.toString());
//this.dumpToken(token , this.scopes, this.braceNesting);
-
//
print('SCOPE:' + token.toString());
+ print('SCOPE:' + token.toString());
//this.log(token.data);
if (token.type == 'NAME') {
// print('*' + token.data);
//this.log(token.data);
if (token.type == 'NAME') {
// print('*' + token.data);
@@
-526,17
+526,19
@@
ScopeParser.prototype = {
if (token.type != 'KEYW') {
break;
}
if (token.type != 'KEYW') {
break;
}
-
//
print('SCOPE-KEYW:' + token.toString());
+ print('SCOPE-KEYW:' + token.toString());
// print("Check eval:");
symbol = token.data;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
// print("Check eval:");
symbol = token.data;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
- if (symbol == "eval") {
+ if (token.name == "EVAL") {
+
+ print(JSON.stringify(token, null,4));
// look back one and see if we can find a comment!!!
//if (this.ts.look(-1).type == "COMM") {
// look back one and see if we can find a comment!!!
//if (this.ts.look(-1).type == "COMM") {
- if (token.prefix && token.prefix.match(
'/eval/'
)) {
+ if (token.prefix && token.prefix.match(
/eval/
)) {
// look for eval:var:noreplace\n
var _t = this;
token.prefix.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
// look for eval:var:noreplace\n
var _t = this;
token.prefix.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
@@
-770,6
+772,8
@@
ScopeParser.prototype = {
case 'KEYW':
//if (this.mode == 'BUILDING_SYMBOL_TREE')
// print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
case 'KEYW':
//if (this.mode == 'BUILDING_SYMBOL_TREE')
// print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
+
+ print('EXPR-KEYW:' + token.toString());
if (token.name == "FUNCTION") {
this.parseFunctionDeclaration();
if (token.name == "FUNCTION") {
this.parseFunctionDeclaration();
@@
-780,12
+784,17
@@
ScopeParser.prototype = {
symbol = token.data;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
symbol = token.data;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
-
- if (symbol == "eval") {
- if (token.prefix && token.prefix.match('/eval/')) {
+
+ if (token.name == "EVAL") {
+ print(JSON.stringify(token,null,4));
+ if (token.prefix && token.prefix.match(/eval:var:/)) {
// look for eval:var:noreplace\n
var _t = this;
token.prefix.replace(/eval:var:([a-z]+)/ig, function(m, a) {
// look for eval:var:noreplace\n
var _t = this;
token.prefix.replace(/eval:var:([a-z]+)/ig, function(m, a) {
+
+ print("PROTECT: " + a);
+
+
var hi = _t.getIdentifier(a, currentScope, token);
//println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
var hi = _t.getIdentifier(a, currentScope, token);
//println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {