JSDOC/Scope.js

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

diff --git a/JSDOC/Scope.js b/JSDOC/Scope.js
index 592a532..3a03c4b 100644 (file)
--- a/JSDOC/Scope.js
+++ b/JSDOC/Scope.js
@@ -6,7 +6,7 @@
 * // FIXME - I need this to do next() without doccomments..
 */
 
-Identifier = imports['JSDOC/Identifier.js'].Identifier
+Identifier = imports.Identifier.Identifier
 XObject = imports.XObject.XObject; 
 
 
@@ -23,9 +23,9 @@ function Scope(braceN, parent, startTokN, lastIdent)
     this.subScopes = [];
     this.hints = { };
     this.ident = lastIdent;
+    this.gid = Scope.gid++;
     
-    
-    //println("ADD SCOPE(" + this.id + ") TO "+ (parent ? this.parent.id : 'TOP') + "<BR/>");
+    print("ADD SCOPE(" + this.gid + ") TO "+ (parent ? this.parent.gid : 'TOP'));
     
     if (parent) {
         this.parent.subScopes.push(this);
@@ -54,7 +54,7 @@ Scope.prototype = {
     protectedVars : {}, // only used by to parent..
     declareIdentifier : function(symbol, token) {
         
-        //println("ADD IDENT(" + this.id + "):<B>" + symbol+"</B><BR/>");
+        print("SCOPE : " + this.gid +  " : " + token.toString()+"");
         
         if (typeof(this.identifiers[symbol])== 'undefined') {
             
@@ -73,7 +73,16 @@ Scope.prototype = {
         return this.identifiers[symbol];
     },
     getIdentifier : function(symbol) {
-        return (typeof(this.identifiers[symbol])== 'undefined') ? false : this.identifiers[symbol];
+        if (typeof(this.identifiers[symbol])== 'undefined') {
+            if (['String', 'Date'].indexOf(symbol)) {
+                return false;
+            }
+            
+            print("SCOPE : " + this.gid +" = SYMBOL NOT FOUND?" + symbol);
+            return false;
+        }
+        
+        return this.identifiers[symbol];
     },
     
     addHint : function(varName, varType) {
@@ -178,10 +187,10 @@ Scope.prototype = {
         if (this.parent) {
             
             var all = [];
-            for (var i in this.identifiers) {
-                all.push(i);
+            for (var ii in this.identifiers) {
+                all.push(ii);
             }
-            print("MUNGE: " + all.join(', '));
+            //print("MUNGE: " + all.join(', '));
             
             //println("MUNGE: Building FreeSyms:" + this.id+"</BR>");
             
@@ -210,19 +219,21 @@ Scope.prototype = {
                 
                 
                 if (!this.identifiers[i].toMunge) {
-                    print("SKIP toMunge==false : " + i)
+                    //print("SKIP toMunge==false : " + i)
                     continue;
                 }
                 
                 if (this.isProtectedVar(i)) {
+                    //print("SKIP PROTECTED: " + i)
                     continue; // 
                 }
                 
                 
                 
-                if (this.identifiers[i].constructor !=  Identifier) {
-                    continue;
-                }
+                //if (this.identifiers[i].constructor !=  Identifier) {
+                //    print("SKIP NOT IDENTIFIER : " + i)
+                //    continue;
+               // }
                // println("IDENT:" +i+'</BR>');
                 
                 if (!repsym.length) {
@@ -239,7 +250,7 @@ Scope.prototype = {
                 //println([     repsym,mungedValue ]);
                 
                 if (this.mungeM && repsym.length < mungedValue.length) {
-                    print("REPLACE:"+ mungedValue +" with " + repsym );    
+                    //print("REPLACE:"+ mungedValue +" with " + repsym );    
                     mungedValue = repsym;
                     repsym = '';
                 }
@@ -250,8 +261,8 @@ Scope.prototype = {
         }
         this.munged = true;
         //println("Doing sub scopes");
-        for (var i = 0; i < this.subScopes.length; i++) {
-            var ss = this.subScopes[i];
+        for (var j = 0; j < this.subScopes.length; j++) {
+            var ss = this.subScopes[j];
             ss.munge();
         }
     }
@@ -311,4 +322,4 @@ XObject.extend(Scope, {
 })
 // init the scope constants..
 Scope.init();
- 
\ No newline at end of file
+Scope.gid = 0;
\ No newline at end of file