JSDOC/ScopeParser.vala

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

diff --git a/JSDOC/ScopeParser.vala b/JSDOC/ScopeParser.vala
index 8a0bfa6..28e95ba 100644 (file)
--- a/JSDOC/ScopeParser.vala
+++ b/JSDOC/ScopeParser.vala
@@ -515,12 +515,15 @@ namespace JSDOC {
                                    //print("MATCH!?");
                                    var _t = this;
                                    
+                                   var regex = new GLib.Regex ("eval:var:([a-z_]+)",GLib.RegexCompileFlags.CASELESS );
+
+                
                                    
-                                   token.prefix.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
-                                       //print("GOT: " + a);
-                                       var hi = _t.getIdentifier(a, scope, token);
-                                      // println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
-                                       if (hi) {
+                                   regex.replace_eval (token.prefix, token.prefix.length, 0, 0, (match_info, result) => {
+                                               var a =  match_info.fetch(0);
+                                       var hi = this.getIdentifier(a, scope, token);
+                                              // println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
+                                       if (hi.length > 0) {
                                          //  print("PROTECT "+a+" from munge");
                                            //print(JSON.stringify(hi,null,4));
                                            hi.toMunge = false;
@@ -815,14 +818,10 @@ namespace JSDOC {
 
        void parseCatch(scope) {
 
-           var symbol;
-           var token;
-            
-           var identifier;
            
            //token = getToken(-1);
            //assert token.getType() == Token.CATCH;
-           token = this.ts.nextTok(1);
+           var token = this.ts.nextTok(1);
            token = this.ts.nextTok(1);
            
            
@@ -831,7 +830,7 @@ namespace JSDOC {
            //token = this.ts.nextTok();
            //assert token.getType() == Token.NAME;
            
-           symbol = token.items[0][0].data;
+           var symbol = token.items[0][0].data;
            
 
            if (this.mode == ScopeParserMode.BUILDING_SYMBOL_TREE) {
@@ -841,30 +840,28 @@ namespace JSDOC {
                scope.declareIdentifier(symbol, token.items[0][0]);
            } else {
                //?? why inc the refcount?? - that should be set when building the tree???
-               identifier = this.getIdentifier(symbol, scope, token.items[0][0]);
+               var identifier = this.getIdentifier(symbol, scope, token.items[0][0]);
                identifier.refcount++;
            }
            
            //token = this.ts.nextTok();
            //assert token.getType() == Token.RP; // )
-       },
+       }
        
-       parseFunctionDeclaration : function(scope) 
+       void parseFunctionDeclaration (Scope scope) 
        {
            //print("PARSE FUNCTION");
-           var symbol;
-           var token;
            
            var fnScope = false;
-           var identifier;
+           
            var b4braceNesting = this.braceNesting + 0;
            
            //this.logR("<B>PARSING FUNCTION</B>");
            
 
-           token = this.ts.nextTok();
+           var token = this.ts.nextTok();
            if (token.type == "NAME") {
-               if (this.mode == 'BUILDING_SYMBOL_TREE') {
+               if (this.mode == ScopeParserMode.BUILDING_SYMBOL_TREE) {
                    // Get the name of the function and declare it in the current scope.
                    symbol = token.data;
                    if (scope.getIdentifier(symbol,token) != false) {
@@ -883,9 +880,9 @@ namespace JSDOC {
                 
            }
            
-           
+           Scope fnScope;
            //assert token.getType() == Token.LP;
-           if (this.mode == 'BUILDING_SYMBOL_TREE') {
+           if (this.mode == ScopeParserMode.BUILDING_SYMBOL_TREE) {
                fnScope = new Scope(1, scope, token.n, '', token);
                
                //println("STORING SCOPE" + this.ts.cursor);
@@ -900,15 +897,15 @@ namespace JSDOC {
            //  print('FUNC-PARSE:' + JSON.stringify(token,null,4));
            // Parse function arguments.
            var args = token.items;
-           for (var argpos =0; argpos < args.length; argpos++) {
+           for (var argpos =0; argpos < args.size; argpos++) {
                 
-               token = args[argpos][0];
+               token = args.get(argpos).get(0);
                //print ("FUNC ARGS: " + token.toString())
                //assert token.getType() == Token.NAME ||
                //        token.getType() == Token.COMMA;
-               if (token.type == 'NAME' && this.mode == 'BUILDING_SYMBOL_TREE') {
-                   symbol = token.data;
-                   identifier = fnScope.declareIdentifier(symbol,token);
+               if (token.type == "NAME" && this.mode == ScopeParserMode.BUILDING_SYMBOL_TREE) {
+                   var symbol = token.data;
+                   var identifier = fnScope.declareIdentifier(symbol,token);
                    if (symbol == "$super" && argpos == 0) {
                        // Exception for Prototype 1.6...
                        identifier.preventMunging();
@@ -927,11 +924,9 @@ namespace JSDOC {
            //token = this.ts.nextTok();
            //print(token.toString());
            var outTS = this.ts;
-           var _this = this;
-           token.items.forEach(function(tar) {
-               _this.ts = new TokenStream(tar);
-               _this.parseScope(fnScope);
-               
+               foreach(var tar in token.items) {
+               this.ts = new TokenStream(tar);
+               this.parseScope(fnScope);
                
            });
            
@@ -944,9 +939,9 @@ namespace JSDOC {
            //print("ENDFN -1: " + this.ts.lookTok(-1).toString());
            //print("ENDFN 0: " + this.ts.lookTok(0).toString());
            //print("ENDFN 1: " + this.ts.lookTok(1).toString());
-       },
+       }
        
-       protectScopeFromObfuscation : function(scope) {
+       void protectScopeFromObfuscation (scope) {
                //assert scope != null;
            
            if (scope == this.globalScope) {
@@ -962,18 +957,20 @@ namespace JSDOC {
 
            //assert scope.getParentScope() == globalScope;
            scope.preventMunging();
-       },
+       }
        
-       getIdentifier: function(symbol, scope, token) {
-           var identifier;
-           while (scope != false) {
+       Token getIdentifier(string symbol, Scope in_scope, Token token) 
+       {
+           string identifier;
+           var scope = in_scope;
+           while (scope != null) {
                identifier = scope.getIdentifier(symbol, token);
                //println("ScopeParser.getIdentgetUsedSymbols("+symbol+")=" + scope.getUsedSymbols().join(','));
-               if (identifier) {
+               if (identifier.length) {
                    return identifier;
                }
                scope = scope.parent;
            }
-           return false;
+           return "";
        }
-};
+}