JSDOC/ScopeParser.vala

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

diff --git a/JSDOC/ScopeParser.vala b/JSDOC/ScopeParser.vala
index bf2deb1..73072b3 100644 (file)
--- a/JSDOC/ScopeParser.vala
+++ b/JSDOC/ScopeParser.vala
@@ -896,13 +896,13 @@ namespace JSDOC {
            var args = token.items;
            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();
@@ -921,11 +921,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);
                
            });
            
@@ -938,9 +936,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) {
@@ -958,16 +956,18 @@ namespace JSDOC {
            scope.preventMunging();
        },
        
-       getIdentifier: function(symbol, scope, token) {
-           var identifier;
-           while (scope != false) {
+       string 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 "";
        }
 };