JSDOC/Template.js

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

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 89ee136..1b315b0 100644 (file)
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -98,7 +98,7 @@ ScopeParser.prototype = {
         
     },
     warn: function(s) {
-        print('****************' + s);
+        //print('****************' + s);
         this.warnings.push(s);
         //println("WARNING:" + htmlescape(s) + "<BR>");
     },
@@ -133,7 +133,7 @@ ScopeParser.prototype = {
         this.mode = 'BUILDING_SYMBOL_TREE';
         this.parseScope(this.globalScope);
         
-        print("---------------END PASS 1 ---------------- ");
+        //print("---------------END PASS 1 ---------------- ");
         
     },
     mungeSymboltree : function()
@@ -178,7 +178,9 @@ ScopeParser.prototype = {
 
     log : function(str)
     {
-          //println("<B>LOG:</B>" + htmlescape(str) + "<BR/>\n");
+        print ("                    ".substring(0, this.braceNesting*2) + str);
+        
+        //println("<B>LOG:</B>" + htmlescape(str) + "<BR/>\n");
     },
     logR : function(str)
     {
@@ -193,7 +195,7 @@ ScopeParser.prototype = {
     parseScope : function(scope) // parse a token stream..
     {
         //this.timerPrint("parseScope EnterScope"); 
-        print(">>> ENTER SCOPE" + this.scopes.length);
+        //this.log(">>> ENTER SCOPE" + this.scopes.length);
         var symbol;
         var token;
         
@@ -210,7 +212,10 @@ ScopeParser.prototype = {
         while (token) {
           //  this.timerPrint("parseScope AFTER lookT: " + token.toString()); 
              
-            !this.debug|| print(token.type + '.' + token.name+ ":" + token.data);
+            //this.log(token.data);
+            if (token.type == 'NAME') {
+            //    print('*' + token.data);
+            }
             switch(token.type + '.' + token.name) {
                 case "KEYW.VAR":
                 case "KEYW.CONST": // not really relivant as it's only mozzy that does this.
@@ -223,12 +228,15 @@ ScopeParser.prototype = {
                         if (!token) { // can return false at EOF!
                             break;
                         }
-                        if (token.name == "VAR") { // kludge..
+                        if (token.name == "VAR" || token.data == ',') { // kludge..
                             continue;
                         }
                         //this.logR("parseScope GOT VAR  : <B>" + token.toString() + "</B>"); 
                         if (token.type !="NAME") {
-                            print(token.toString());
+                            for(var i = Math.max(this.ts.cursor-10,0); i < this.ts.cursor+1; i++) {
+                                print(this.ts.tokens[i].toString());
+                            }
+                            
                             print( "var without ident");
                             Seed.quit()
                         }
@@ -256,7 +264,9 @@ ScopeParser.prototype = {
                         if (token.name == "IN") {
                             break;
                         } else {
+                            //var bn = this.braceNesting;
                             this.parseExpression();
+                            //this.braceNesting = bn;
                             //this.logR("parseScope DONE  : <B>ParseExpression</B> - tok is:" + this.ts.lookT(0).toString()); 
                             
                             token = this.ts.lookTok(1);
@@ -269,7 +279,9 @@ ScopeParser.prototype = {
                     break;
                 case "KEYW.FUNCTION":
                     //println("<i>"+token.data+"</i>");
+                     var bn = this.braceNesting;
                     this.parseFunctionDeclaration();
+                     this.braceNesting = bn;
                     break;
 
                 case "PUNC.LEFT_CURLY": // {
@@ -277,20 +289,25 @@ ScopeParser.prototype = {
                     isObjectLitAr.push(false);
                     this.braceNesting++;
                     
-                    print(">>>>>> OBJLIT PUSH(false)" + this.braceNesting);
+                    //print(">>>>>> OBJLIT PUSH(false)" + this.braceNesting);
                     break;
 
                 case "PUNC.RIGHT_CURLY": // }
                     //println("<i>"+token.data+"</i>");
                     this.braceNesting--;
                     isObjectLitAr.pop();
-                    print(">>>>>> OBJLIT POP"+ this.braceNesting);
+                    //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();
-                        print("<<<<<<<EXIT SCOPE" +this.scopes.length);
+                        // eat symbol if we are currently at { 
+                        if (this.ts.look(0).data == '{') {
+                            this.ts.nextTok();
+                        }
+                        
+                        //print("<<<<<<<EXIT SCOPE" +this.scopes.length);
                         return;
                     }
                     break;
@@ -328,7 +345,7 @@ ScopeParser.prototype = {
                         // then we are in an object lit.. -> we need to flag the brace as such...
                         isObjectLitAr.pop();
                         isObjectLitAr.push(true);
-                        print(">>>>>> OBJLIT REPUSH(true)");
+                        //print(">>>>>> OBJLIT REPUSH(true)");
                     }
                     isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1];
                     
@@ -359,7 +376,7 @@ ScopeParser.prototype = {
                     if ((this.ts.lookTok(-1).data == "{") && (this.ts.lookTok(1).data == ":")) {
                         isObjectLitAr.pop();
                         isObjectLitAr.push(true);
-                        print(">>>>>> OBJLIT REPUSH(true)");
+                        //print(">>>>>> OBJLIT REPUSH(true)");
                         //println("<i>"+token.data+"</i>");
                         break;
                     }
@@ -460,7 +477,7 @@ ScopeParser.prototype = {
             //if (this.ts.nextT()) break;
             
         }
-        print("<<<<<<<EXIT SCOPE ERR?" +this.scopes.length);
+        //print("<<<<<<<EXIT SCOPE ERR?" +this.scopes.length);
     },
 
 
@@ -488,7 +505,7 @@ ScopeParser.prototype = {
             currentScope = this.scopes[this.scopes.length-1];
             
             //println("<i>"+token.data+"</i>");
-            !this.debug|| print ("EXP" + token.toString());
+            //this.log("EXP:" + token.data);
             switch (token.type) {
                 case 'PUNC':
                     switch(token.data) {
@@ -509,13 +526,13 @@ ScopeParser.prototype = {
                             isObjectLitAr.push(false);
                             
                             this.braceNesting++;
-                            print(">>>>> EXP PUSH(false)"+this.braceNesting);
+                            ///print(">>>>> EXP PUSH(false)"+this.braceNesting);
                             break;
 
                         case '}': //Token.RC:
                             this.braceNesting--;
                             isObjectLitAr.pop();
-                            print(">>>>> EXP POP" + this.braceNesting);    
+                            //print(">>>>> EXP POP" + this.braceNesting);    
                            // assert braceNesting >= expressionBraceNesting;
                             break;
 
@@ -542,7 +559,7 @@ ScopeParser.prototype = {
                         // then we are in an object lit.. -> we need to flag the brace as such...
                         isObjectLitAr.pop();
                         isObjectLitAr.push(true);
-                        print(">>>>> EXP PUSH(true)");
+                        //print(">>>>> EXP PUSH(true)");
                     }
                     
                     
@@ -568,19 +585,20 @@ ScopeParser.prototype = {
                 case 'NAME':
                
                     symbol = token.data;
-                    if (this.ts.lookTok(-1).data == "{"  && this.ts.lookTok(1).data == ":") {
+                  
+                    if (this.ts.look(0).data == "{"  && this.ts.lookTok(2).data == ":") {
                         // then we are in an object lit.. -> we need to flag the brace as such...
                         isObjectLitAr.pop();
                         isObjectLitAr.push(true);
-                         print(">>>>> EXP  PUSH(true)");
+                         //print(">>>>> EXP  PUSH(true)");
                         break;
                     }
                     isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1];
-                    if (isInObjectLitAr && this.ts.lookTok(-1).data == "," && this.ts.lookTok(1).data == ":") {
+                    if (isInObjectLitAr && this.ts.lookTok(0).data == "," && this.ts.lookTok(2).data == ":") {
                         break;
                     }
-                    
-                    if (this.ts.lookTok(-1).data == ".") {
+                    //print(this.ts.lookTok(0).data);
+                    if (this.ts.lookTok(0).data == ".") {
                         //skip '.'
                         break;
                     }
@@ -725,7 +743,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];
           
         }