X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScope.js;h=afd488d1ccef95db790580e0097a8f2f90af8aee;hp=1367bb483ca68bc1b127b5f38f51bbd76a588c84;hb=05502e1f18a4e2562a4c44c6b83dbbd99f26dbec;hpb=cf2fb223db3146ecf71f6ca003fb89f65b10aac9

diff --git a/JSDOC/Scope.js b/JSDOC/Scope.js
index 1367bb4..afd488d 100644
--- 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,7 +23,7 @@ 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/>");
     
@@ -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("ADD IDENT(" + this.id + "):" + symbol+"");
         
         if (typeof(this.identifiers[symbol])== 'undefined') {
             
@@ -178,10 +178,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,12 +210,12 @@ 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)
+                    //print("SKIP PROTECTED: " + i)
                     continue; // 
                 }
                 
@@ -241,7 +241,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 = '';
                 }
@@ -252,8 +252,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();
         }
     }
@@ -313,4 +313,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