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
ee8f1c7
..
77dd6f7
100644
(file)
--- a/
JSDOC/ScopeParser.js
+++ b/
JSDOC/ScopeParser.js
@@
-577,9
+577,9
@@
ScopeParser.prototype = {
//print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
//print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
- while (token = this.ts.
look
Tok()) {
+ while (token = this.ts.
next
Tok()) {
-
+
/*
// moved out of loop?
/*
// moved out of loop?
@@
-592,7
+592,7
@@
ScopeParser.prototype = {
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
-
//print('EXP' + this.expN + ':' +
token.toString());
+
print('EXP' +
token.toString());
//println("<i>"+token.data+"</i>");
//println("<i>"+token.data+"</i>");
@@
-608,7
+608,7
@@
ScopeParser.prototype = {
if (this.braceNesting == expressionBraceNesting &&
bracketNesting == 0 &&
parensNesting == 0) {
if (this.braceNesting == expressionBraceNesting &&
bracketNesting == 0 &&
parensNesting == 0) {
- print(
scopeIndent +
"<< EXIT EXPRESSION");
+ print("<< EXIT EXPRESSION");
this.expN--;
return;
}
this.expN--;
return;
}
@@
-631,13
+631,23
@@
ScopeParser.prototype = {
break;
case '[': //Token.LB:
break;
case '[': //Token.LB:
- bracketNesting++;
+
+ var ts = this.ts;
+ var _this = this;
+ token.items.forEach(function(ns) {
+ print("EXPR-PUNC-MAKE:" + JSON.stringify(ns, null, 4));
+ _this.ts = new TokenStream(ns);
+ //_this.ts.cursor--;
+ _this.parseExpression();
+ });
+ this.ts = ts;
+
break;
break;
-
+
case ']': //Token.RB:
case ']': //Token.RB:
-
bracketNesting--
;
- break;
-
+
return
;
+
+
case '(': //Token.LP:
parensNesting++;
break;
case '(': //Token.LP:
parensNesting++;
break;
@@
-734,7
+744,7
@@
ScopeParser.prototype = {
//println("<B>EID</B>");
//println("<B>EID</B>");
-
case 'KEYW':
+ case 'KEYW':
print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
if (token.name == "FUNCTION") {
print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
if (token.name == "FUNCTION") {
@@
-771,11
+781,13
@@
ScopeParser.prototype = {
}
break;
}
}
break;
}
-
+ default:
+ print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
+ break;
}
}
- if (!this.ts.nextTok()) break;
+
}
}
- print(
scopeIndent +
"<< EXIT EXPRESSION");
+ print("<< EXIT EXPRESSION");
this.expN--;
},
this.expN--;
},