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

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index c50402d..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;
                             }
@@ -635,9 +635,12 @@ ScopeParser.prototype = {
                             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;
 /*
@@ -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,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--;
     },