X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=7d1c6063b9729db07a7ef289854376a422f625aa;hb=8ada0d86c2c673774b95e910ff35dfa6aaa367f5;hp=ee8f1c75c7c2d104d6717f0bd04a169a0b0abe8e;hpb=7f3a0ba1ceed67925de215ad5357f3ab7e4526ea;p=gnome.introspection-doc-generator diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js index ee8f1c7..7d1c606 100644 --- a/JSDOC/ScopeParser.js +++ b/JSDOC/ScopeParser.js @@ -608,7 +608,7 @@ ScopeParser.prototype = { if (this.braceNesting == expressionBraceNesting && bracketNesting == 0 && parensNesting == 0) { - print(scopeIndent + "<< EXIT EXPRESSION"); + print("<< EXIT EXPRESSION"); this.expN--; return; } @@ -631,13 +631,23 @@ ScopeParser.prototype = { break; case '[': //Token.LB: - bracketNesting++; + + var ts = this.ts; + var _this = this; + token.items.forEach(function(ns) { + print("EXPR-PUNC[:" + JSON.stringify(ns, null, 4)); + _this.ts = new TokenStream(ns); + _this.ts.cursor--; + _this.parseExpression(); + }); + this.ts = ts; + break; - +/* case ']': //Token.RB: bracketNesting--; break; - +*/ case '(': //Token.LP: parensNesting++; break; @@ -734,7 +744,7 @@ ScopeParser.prototype = { //println("EID"); - case 'KEYW': + case 'KEYW': print("EXPR-KEYW:" + JSON.stringify(token, null, 4)); if (token.name == "FUNCTION") { @@ -771,11 +781,13 @@ ScopeParser.prototype = { } 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--; },