X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=4b717953e4ea9ec8b86c8e5fee599d2923e6cf3b;hp=40dc9eca37974d7aac45a008e3f052dc26ab90e0;hb=b8b841c72e36821a75dd6a365cd819b1e0f401f4;hpb=e7664dc7e8cecd61b3af8c7d62e6ba2a8e04fbf0

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 40dc9ec..4b71795 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, '');
@@ -426,7 +426,7 @@ ScopeParser.prototype = {
                     break;
 
                 case "KEYW.CATCH":
-                    print('SCOPE-CATCH:' + token.toString());
+                    //print('SCOPE-CATCH:' + token.toString());
                     //println("<i>"+token.data+"</i>");
                     this.parseCatch();
                     break;
@@ -526,25 +526,29 @@ 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
+                                print("MATCH!?");
                                 var _t = this;
                                 token.prefix.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
-                                    
+                                    print("GOT: " + a);
                                     var hi = _t.getIdentifier(a, thisScope, token);
                                    // println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
                                     if (hi) {
-                                     //   println("PROTECT "+a+" from munge");
+                                        print("PROTECT "+a+" from munge");
+                                        print(JSON.stringify(hi,null,4));
                                         hi.toMunge = false;
                                     }
                                     
@@ -620,7 +624,7 @@ ScopeParser.prototype = {
            */ 
            
            //this.dumpToken(token,  this.scopes, this.braceNesting );
-           //print('EXP' +  token.toString());
+           //print('EXPR' +  token.toString());
             
             
             //println("<i>"+token.data+"</i>");
@@ -770,6 +774,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();
@@ -780,12 +786,18 @@ 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:var:/g)) {
                                 // look for eval:var:noreplace\n
+                                print("GOT MATCH?");
                                 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) {
@@ -876,9 +888,15 @@ ScopeParser.prototype = {
             }
             token =  this.ts.nextTok();
         }
+        
+        
         // return function() {.... 
         while (token.data != "(") {
+            print(token.toString());
             token =  this.ts.nextTok();
+            
+            
+            
         }