X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=bc630740c42ebd8be150d38dc17be978f0f587f6;hp=3bfc86dd13c3726dcbf5bd2a4e578837878b933e;hb=ef55015b78daa5a5284b3053c557d08c65d2828c;hpb=3809fda8b3e9c3fbcf1362937d1f62f22faf9601

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 3bfc86d..bc63074 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -141,7 +141,7 @@ ScopeParser.prototype = {
         this.braceNesting = 0;
         this.scopes = [];
         
-        print(JSON.stringify(this.ts.tokens, null,4));
+       // print(JSON.stringify(this.ts.tokens, null,4));
         
         
         this.globalScope = new  Scope(-1, false, -1, '');
@@ -243,7 +243,7 @@ ScopeParser.prototype = {
         while (token) {
           //  this.timerPrint("parseScope AFTER lookT: " + token.toString()); 
             //this.dumpToken(token , this.scopes, this.braceNesting);
-            //print('SCOPE:' + token.toString());
+            print('SCOPE:' + token.toString());
             //this.log(token.data);
             if (token.type == 'NAME') {
             //    print('*' + token.data);
@@ -258,7 +258,7 @@ ScopeParser.prototype = {
                     while (true) {
                         token = this.ts.nextTok();
                         //!this.debug|| print( token.toString());
-                        print('SCOPE-VAR-VAL:' + JSON.stringify(token, null, 4));
+                        //print('SCOPE-VAR-VAL:' + JSON.stringify(token, null, 4));
                         if (!token) { // can return false at EOF!
                             break;
                         }
@@ -302,12 +302,11 @@ ScopeParser.prototype = {
                             var bn = this.braceNesting;
                             var nts = [];
                             while (true) {
-                                var n = this.ts.lookTok();
-                                if (n.data == ',') {
+                                if (!token || token.type == 'VOID' || token.data == ',') {
                                     break;
                                 }
-                                nts.push(n);
-                                this.ts.nextTok();
+                                nts.push(token);
+                                token = this.ts.nextTok();
                             }
                             if (nts.length) {
                                 var TS = this.ts;
@@ -527,17 +526,19 @@ ScopeParser.prototype = {
                     if (token.type != 'KEYW') {
                         break;
                     }
-                    //print('SCOPE-KEYW:' + token.toString());
+                    print('SCOPE-KEYW:' + token.toString());
                    // print("Check eval:");
                 
                     symbol = token.data;
                     
                      if (this.mode == 'BUILDING_SYMBOL_TREE') {
 
-                        if (symbol == "eval") {
+                        if (token.name == "EVAL") {
+                            
+                            print(JSON.stringify(token, null,4));
                             // look back one and see if we can find a comment!!!
                             //if (this.ts.look(-1).type == "COMM") {
-                            if (token.prefix && token.prefix.match('/eval/')) {
+                            if (token.prefix && token.prefix.match(/eval/)) {
                                 // look for eval:var:noreplace\n
                                 var _t = this;
                                 token.prefix.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
@@ -621,7 +622,7 @@ ScopeParser.prototype = {
            */ 
            
            //this.dumpToken(token,  this.scopes, this.braceNesting );
-           //print('EXP' +  token.toString());
+           //print('EXPR' +  token.toString());
             
             
             //println("<i>"+token.data+"</i>");
@@ -771,6 +772,8 @@ ScopeParser.prototype = {
                 case 'KEYW':   
                     //if (this.mode == 'BUILDING_SYMBOL_TREE') 
                     //    print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
+                    
+                    print('EXPR-KEYW:' + token.toString());
                     if (token.name == "FUNCTION") {
                         
                         this.parseFunctionDeclaration();
@@ -781,12 +784,17 @@ ScopeParser.prototype = {
              
                     symbol = token.data;
                     if (this.mode == 'BUILDING_SYMBOL_TREE') {
-
-                        if (symbol == "eval") {
-                            if (token.prefix && token.prefix.match('/eval/')) {
+                        
+                        if (token.name == "EVAL") {
+                            print(JSON.stringify(token,null,4));
+                            if (token.prefix && token.prefix.match(/eval:/)) {
                                 // look for eval:var:noreplace\n
                                 var _t = this;
                                 token.prefix.replace(/eval:var:([a-z]+)/ig, function(m, a) {
+                                    
+                                    print("PROTECT: " + a);
+                                    
+                                    
                                     var hi = _t.getIdentifier(a, currentScope, token);
                                    //println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
                                     if (hi) {
@@ -824,28 +832,30 @@ ScopeParser.prototype = {
         var token;
         var currentScope;
         var identifier;
-
+        
         //token = getToken(-1);
         //assert token.getType() == Token.CATCH;
         token = this.ts.nextTok();
+        
+        //print(JSON.stringify(token,null,4));
         //assert token.getType() == Token.LP; (
         //token = this.ts.nextTok();
         //assert token.getType() == Token.NAME;
         
-        symbol = token.items[0].data;
+        symbol = token.items[0][0].data;
         currentScope = this.scopes[this.scopes.length-1];
 
         if (this.mode == 'BUILDING_SYMBOL_TREE') {
             // We must declare the exception identifier in the containing function
             // scope to avoid errors related to the obfuscation process. No need to
             // display a warning if the symbol was already declared here...
-            currentScope.declareIdentifier(symbol, token);
+            currentScope.declareIdentifier(symbol, token.items[0][0]);
         } else {
             //?? why inc the refcount?? - that should be set when building the tree???
-            identifier = this.getIdentifier(symbol, currentScope, token);
+            identifier = this.getIdentifier(symbol, currentScope, token.items[0][0]);
             identifier.refcount++;
         }
-
+        
         token = this.ts.nextTok();
         //assert token.getType() == Token.RP; // )
     },
@@ -875,13 +885,18 @@ ScopeParser.prototype = {
             }
             token =  this.ts.nextTok();
         }
+        
+        
         // return function() {.... 
-        if (token.name == "RETURN") {
-            token =  this.ts.nextTok();
-        }
-        if (token.name == "FUNCTION") {
+        while (token.data != "(") {
+            print(token.toString());
             token =  this.ts.nextTok();
+            
+            
+            
         }
+        
+        
         //assert token.getType() == Token.LP;
         if (this.mode == 'BUILDING_SYMBOL_TREE') {
             fnScope = new Scope(1, currentScope, token.n, '', token);
@@ -895,7 +910,7 @@ ScopeParser.prototype = {
             fnScope = this.indexedScopes[token.id];
         }
         //if (this.mode == 'BUILDING_SYMBOL_TREE') 
-           // print('FUNC-PARSE:' + JSON.stringify(token,null,4));
+        //  print('FUNC-PARSE:' + JSON.stringify(token,null,4));
         // Parse function arguments.
         var args = token.items;
         for (var argpos =0; argpos < args.length; argpos++) {