X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=77dd6f7ccf0e072e1b7e8cc0787aca8f8ab37bc5;hb=a699000b68dda9c5248328ba41a86d0e4bdb6ac8;hp=7d1c6063b9729db07a7ef289854376a422f625aa;hpb=8ada0d86c2c673774b95e910ff35dfa6aaa367f5;p=gnome.introspection-doc-generator

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 7d1c606..77dd6f7 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -577,9 +577,9 @@ ScopeParser.prototype = {
             
         
         //print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
-        while (token = this.ts.lookTok()) {
+        while (token = this.ts.nextTok()) {
      
-
+        
             
            /*
             // moved out of loop?
@@ -592,7 +592,7 @@ ScopeParser.prototype = {
            */ 
            
            //this.dumpToken(token,  this.scopes, this.braceNesting );
-           //print('EXP' + this.expN + ':' + token.toString());
+           print('EXP' +  token.toString());
             
             
             //println("<i>"+token.data+"</i>");
@@ -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--;