JSDOC/ScopeParser.js

[gnome.introspection-doc-generator] / JSDOC / ScopeParser.js

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index a9cec1c..e7120b4 100644 (file)
--- 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);
@@ -540,9 +540,10 @@ ScopeParser.prototype = {
                             //if (this.ts.look(-1).type == "COMM") {
                             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) {
@@ -787,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) {