X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=0a32fad972dc48b5bcc7ba7105dff133903533c9;hb=930f84a467fa52c716a5b86e843a6c701ef7890d;hp=4c10cdb022133e809d6fc4c69c7185da7f054388;hpb=bdccec2ae09b452ef11a77cc4c88ff2797ca987e;p=gnome.introspection-doc-generator

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 4c10cdb..0a32fad 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -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);
@@ -526,25 +526,28 @@ 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");
                                         hi.toMunge = false;
                                     }
                                     
@@ -785,10 +788,15 @@ ScopeParser.prototype = {
                         
                         if (token.name == "EVAL") {
                             print(JSON.stringify(token,null,4));
-                            if (token.prefix && token.prefix.match('/eval/')) {
+                            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) {