JSDOC/ScopeParser.js
[gnome.introspection-doc-generator] / JSDOC / ScopeParser.js
index a69b251..77dd6f7 100644 (file)
@@ -577,7 +577,7 @@ ScopeParser.prototype = {
             
         
         //print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
-        while (token = this.ts.lookTok()) {
+        while (token = this.ts.nextTok()) {
      
         
             
@@ -637,17 +637,17 @@ ScopeParser.prototype = {
                             token.items.forEach(function(ns) {
                                  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--;