JSDOC/ScopeParser.js

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

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 1c38b44..7a6e0da 100644 (file)
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -178,7 +178,7 @@ ScopeParser.prototype = {
 
     log : function(str)
     {
-        print ("                    ".substring(0, this.braceNesting) + str);
+        print ("                    ".substring(0, this.braceNesting*2) + str);
         
         //println("<B>LOG:</B>" + htmlescape(str) + "<BR/>\n");
     },
@@ -212,7 +212,7 @@ ScopeParser.prototype = {
         while (token) {
           //  this.timerPrint("parseScope AFTER lookT: " + token.toString()); 
              
-            this.log(token.type + '.' + token.name+ ":" + token.data);
+            this.log(token.data);
             if (token.type == 'NAME') {
             //    print('*' + token.data);
             }
@@ -261,9 +261,9 @@ ScopeParser.prototype = {
                         if (token.name == "IN") {
                             break;
                         } else {
-                            var bn = this.braceNesting;
+                            //var bn = this.braceNesting;
                             this.parseExpression();
-                            this.braceNesting = bn;
+                            //this.braceNesting = bn;
                             //this.logR("parseScope DONE  : <B>ParseExpression</B> - tok is:" + this.ts.lookT(0).toString()); 
                             
                             token = this.ts.lookTok(1);
@@ -296,9 +296,14 @@ ScopeParser.prototype = {
                     //print(">>>>>> OBJLIT POP"+ this.braceNesting);
                         //assert braceNesting >= scope.getBra ceNesting();
                     
-                    if (this.braceNesting < 0) {
+                    if (this.braceNesting < expressionBraceNesting) {
                         var ls = this.scopes.pop();
                         ls.getUsedSymbols();
+                        // eat symbol if we are currently at { 
+                        if (this.ts.look(0).data == '{') {
+                            this.ts.nextTok();
+                        }
+                        
                         //print("<<<<<<<EXIT SCOPE" +this.scopes.length);
                         return;
                     }
@@ -734,7 +739,7 @@ ScopeParser.prototype = {
             this.indexedScopes[this.ts.cursor] = fnScope;
             
         } else {
-            //println("FETCHING SCOPE" + this.ts.cursor);
+            //qln("FETCHING SCOPE" + this.ts.cursor);
             fnScope = this.indexedScopes[this.ts.cursor];
           
         }