X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=447946232f05cfb67d8178c16400ca545f1fa221;hb=821f387fe87df1182af1b55f621418b1ad4adb01;hp=c8ed33660a7fe2d6269dc61663e10f63a56df8a7;hpb=2493ac484f85bde0ff352f6b7f641d4a3726520f;p=gnome.introspection-doc-generator

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index c8ed336..4479462 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -223,10 +223,12 @@ ScopeParser.prototype = {
         
         var isObjectLitAr = [ false ];
         var isInObjectLitAr;
-        if (scope) {
+        thisScope = scope;
+        if (thisScope) {
             this.scopes.push(scope);
+        } else {
+            thisScope = this.scopes[this.scopes.length-1]
         }
-        
        
         //var scopeIndent = ''; 
         //this.scopes.forEach(function() {
@@ -275,10 +277,10 @@ ScopeParser.prototype = {
                         
 
                         if (this.mode == "BUILDING_SYMBOL_TREE") {
-                            identifier = scope.getIdentifier(token.data) ;
+                            identifier = thisScope.getIdentifier(token.data) ;
                             
                             if (identifier == false) {
-                                scope.declareIdentifier(token.data, token);
+                                thisScope.declareIdentifier(token.data, token);
                             } else {
                                 token.identifier = identifier;
                                 this.warn("(SCOPE) The variable " + token.data  + ' (line:' + token.line + ")  has already been declared in the same scope...");
@@ -346,7 +348,7 @@ ScopeParser.prototype = {
                             // key value..
                             
                             this.ts = new TokenStream(token.props[prop].val);
-                            this.parseScope(scope);
+                            this.parseScope(false);
                             
                         }
                         this.ts = curTS;
@@ -360,7 +362,7 @@ ScopeParser.prototype = {
                     var _this = this;
                     token.items.forEach(function(expr) {
                           _this.ts = new TokenStream(expr);
-                          _this.parseExpression(scope)
+                          _this.parseExpression()
                     });
                     this.ts = curTS;
                     //print("NOT PROPS"); Seed.quit();
@@ -403,7 +405,7 @@ ScopeParser.prototype = {
                         // object member. As a consequence, the only thing we can
                         // do is turn the obfuscation off for the highest scope
                         // containing the 'with' block.
-                        this.protectScopeFromObfuscation(scope);
+                        this.protectScopeFromObfuscation(thisScope);
                         this.warn("Using 'with' is not recommended." + (this.munge ? " Moreover, using 'with' reduces the level of compression!" : ""), true);
                     }
                     break;
@@ -495,7 +497,7 @@ ScopeParser.prototype = {
                         //println("GOT IDENT: <B>" + symbol + "</B><BR/>");
                              
                             //println("GOT IDENT (2): <B>" + symbol + "</B><BR/>");
-                        identifier = this.getIdentifier(symbol, scope);
+                        identifier = this.getIdentifier(symbol, thisScope);
                         
                         if (identifier == false) {
 // BUG!find out where builtin is defined...
@@ -535,7 +537,7 @@ ScopeParser.prototype = {
                                 var _t = this;
                                 this.ts.look(-1).data.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
                                     
-                                    var hi = _t.getIdentifier(a, scope);
+                                    var hi = _t.getIdentifier(a, thisScope);
                                    // println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
                                     if (hi) {
                                      //   println("PROTECT "+a+" from munge");
@@ -548,7 +550,7 @@ ScopeParser.prototype = {
                             } else {
                                 
                             
-                                this.protectScopeFromObfuscation(scope);
+                                this.protectScopeFromObfuscation(thisScope);
                                 this.warn("Using 'eval' is not recommended. (use  eval:var:noreplace in comments to optimize) " + (this.munge ? " Moreover, using 'eval' reduces the level of compression!" : ""), true);
                             }
 
@@ -704,16 +706,20 @@ ScopeParser.prototype = {
                       
              
                 case 'NAME':
-                    if (this.mode == 'BUILDING_SYMBOL_TREE') 
+                    if (this.mode == 'BUILDING_SYMBOL_TREE') {
+                        
                         print("EXPR-NAME:" + JSON.stringify(token, null, 4));
+                    } else {
+                        print("EXPR-NAME:" + token.toString());
+                       }
                     symbol = token.data;
                     //print("in NAME = " + token.toString());
                     //print("in NAME 0: " + this.ts.look(0).toString());
                     //print("in NAME 2: " + this.ts.lookTok(2).toString());
                     
-                    //print(this.ts.lookTok(0).data);
+                    //print(this.ts.lookTok(-1).data);
                     // prefixed with '.'
-                    if (this.ts.lookTok(0).data == ".") {
+                    if (this.ts.lookTok(-1).data == ".") {
                         //skip '.'
                         break;
                     }
@@ -732,6 +738,8 @@ ScopeParser.prototype = {
                                 // any conflict with other munged symbols.
                                 this.globalScope.declareIdentifier(symbol, token);
                                 this.warn("Found an undeclared symbol: " + symbol + ' (line:' + token.line + ')', true);
+                                print("Found an undeclared symbol: " + symbol + ' (line:' + token.line + ')');
+                                throw "OOPS";
                             } else {
                                 print("undeclared:" + token.toString())
                             }
@@ -864,11 +872,11 @@ ScopeParser.prototype = {
             
             //println("STORING SCOPE" + this.ts.cursor);
             
-            this.indexedScopes[this.ts.cursor] = fnScope;
+            this.indexedScopes[token.id] = fnScope;
             
         } else {
             //qln("FETCHING SCOPE" + this.ts.cursor);
-            fnScope = this.indexedScopes[this.ts.cursor];
+            fnScope = this.indexedScopes[token.id];
           
         }
         if (this.mode == 'BUILDING_SYMBOL_TREE')