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

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index f66bc50..bc63074 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -526,19 +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) {
@@ -787,10 +787,14 @@ 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:/)) {
                                 // 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) {