X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=77dd6f7ccf0e072e1b7e8cc0787aca8f8ab37bc5;hb=a699000b68dda9c5248328ba41a86d0e4bdb6ac8;hp=49041305b29e4bde2483ec8ed3b7fbb77a9d875e;hpb=d4368d6a39ba7e0f2875e9f42e52cd522ec5c336;p=gnome.introspection-doc-generator diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js index 4904130..77dd6f7 100644 --- a/JSDOC/ScopeParser.js +++ b/JSDOC/ScopeParser.js @@ -577,7 +577,7 @@ ScopeParser.prototype = { //print(scopeIndent + ">> ENTER EXPRESSION" + this.expN); - while (token = this.ts.lookTok()) { + while (token = this.ts.nextTok()) { @@ -635,19 +635,19 @@ ScopeParser.prototype = { var ts = this.ts; var _this = this; token.items.forEach(function(ns) { - print("EXPR-PUNC[:" + JSON.stringify(ns, null, 4)); + print("EXPR-PUNC-MAKE:" + JSON.stringify(ns, null, 4)); _this.ts = new TokenStream(ns); - _this.ts.cursor--; + //_this.ts.cursor--; _this.parseExpression(); }); this.ts = ts; break; -/* + case ']': //Token.RB: - bracketNesting--; - break; -*/ + return; + + case '(': //Token.LP: parensNesting++; break; @@ -785,7 +785,7 @@ ScopeParser.prototype = { print("EXPR-SKIP:" + JSON.stringify(token, null, 4)); break; } - if (!this.ts.nextTok()) break; + } print("<< EXIT EXPRESSION"); this.expN--;