JSDOC/ScopeParser.js

[gnome.introspection-doc-generator] / JSDOC / ScopeParser.js

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index a8f67a9..389ff9a 100644 (file)
--- 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,9 +635,12 @@ ScopeParser.prototype = {
                             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;
 /*
@@ -741,7 +744,7 @@ ScopeParser.prototype = {
                     
                     
                     //println("<B>EID</B>");
-                 case 'KEYW':   
+                case 'KEYW':   
                     print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
                     if (token.name == "FUNCTION") {
                         
@@ -778,9 +781,11 @@ ScopeParser.prototype = {
                         }
                         break;
                     } 
-                   
+                default: 
+                    print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
+                    break;
             }
-            if (!this.ts.nextTok()) break;
+            
         }
         print("<< EXIT EXPRESSION");
         this.expN--;