X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=7c77be0748d3c77f55576f1d68e431cec599771c;hb=75e06430ca5dcb9ec1aca8d4f9cc209fc37bcd0c;hp=444ac481b0cfe6fc7539fa36ab65e54125d7a100;hpb=62ff7fed3acfbd87caacf6ad0c73d8af0a298e89;p=gnome.introspection-doc-generator

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 444ac48..7c77be0 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -1,7 +1,7 @@
 //<Script type="text/javascript">
 
-Scope = imports.Scope.Scope;
-TokenStream = imports.TokenStream.TokenStream;
+const Scope = imports.Scope.Scope;
+const TokenStream = imports.TokenStream.TokenStream;
 /**
 * Scope stuff
 * 
@@ -11,7 +11,7 @@ TokenStream = imports.TokenStream.TokenStream;
 * 
 */
 
-ScopeParser = function(ts) {
+const ScopeParser = function(ts) {
     this.ts = ts; // {TokenStream}
     this.warnings = [];
     this.indexedg = {};
@@ -176,6 +176,8 @@ ScopeParser.prototype = {
         
         
         this.globalScope.munge();
+        this.globalScope.dump();
+        
     },
 
 
@@ -225,10 +227,10 @@ ScopeParser.prototype = {
           //  this.timerPrint("parseScope AFTER lookT: " + token.toString()); 
             //this.dumpToken(token , this.scopes, this.braceNesting);
             //print('SCOPE:' + token.toString());
-            this.log(token.data);
-            if (token.type == 'NAME') {
+            //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.
@@ -362,8 +364,10 @@ ScopeParser.prototype = {
                     // ( ... ) or { .... } not object literals..
                     
                     var _this = this;
-                    token.items.forEach(function(expr) {
-                           //print(JSON.stringify(expr, null,4));
+ 	            for (var xx =0; xx < token.items.length; xx++) {
+				expr = token.items[xx];
+                    //token.items.forEach(function(expr) {
+                            //print(expr.toString());
                            _this.ts = new TokenStream(expr);
                             //if (curTS.data == '(') {
                                 _this.parseScope(scope)
@@ -371,7 +375,7 @@ ScopeParser.prototype = {
                               //  _this.parseExpression(scope)
                             //}
                           
-                    });
+                    }  
                     this.ts = curTS;
                     //print("NOT PROPS"); Seed.quit();
                     
@@ -570,7 +574,7 @@ ScopeParser.prototype = {
             
         
         //print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
-        while (token = this.ts.nextTok()) {
+        while ((token = this.ts.nextTok())) {
      
         
             
@@ -825,7 +829,7 @@ ScopeParser.prototype = {
             identifier.refcount++;
         }
         
-        token = this.ts.nextTok();
+        //token = this.ts.nextTok();
         //assert token.getType() == Token.RP; // )
     },
     
@@ -860,9 +864,7 @@ ScopeParser.prototype = {
         while (token.data != "(") {
             //print(token.toString());
             token =  this.ts.nextTok();
-            
-            
-            
+             
         }
         
         
@@ -958,4 +960,4 @@ ScopeParser.prototype = {
         }
         return false;
     }
-};
\ No newline at end of file
+};