X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScope.js;h=23914787b11daa47ec5959cba6232e2d026f402c;hb=697cb830154e481fff7534c9a3716fe8f7918b59;hp=60a53f1103778e8aecd1f5007d28eb27baadfdf1;hpb=7e15a4e61f102c53069fff918146e92818561d2a;p=gnome.introspection-doc-generator

diff --git a/JSDOC/Scope.js b/JSDOC/Scope.js
index 60a53f1..2391478 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; 
 
 
@@ -170,13 +170,18 @@ Scope.prototype = {
         }
         
 
-        //println("MUNGE: Scope:" + this.id+"</BR>");
+        
         
         var pickFromSet = 1;
 
         // Do not munge symbols in the global scope!
         if (this.parent) {
-
+            
+            var all = [];
+            for (var ii in this.identifiers) {
+                all.push(ii);
+            }
+            //print("MUNGE: " + all.join(', '));
             
             //println("MUNGE: Building FreeSyms:" + this.id+"</BR>");
             
@@ -193,7 +198,7 @@ Scope.prototype = {
                 }
             }
              
-            addSyms(JSDOC.Scope.ones); 
+            addSyms(Scope.ones); 
              
             var repsym = '';
             //println(freeSymbols.toSource());
@@ -205,18 +210,21 @@ Scope.prototype = {
                 
                 
                 if (!this.identifiers[i].toMunge) {
+                    //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) {
@@ -233,24 +241,25 @@ Scope.prototype = {
                 //println([     repsym,mungedValue ]);
                 
                 if (this.mungeM && repsym.length < mungedValue.length) {
-                    //println("REPLACE:"+ mungedValue +" with " + repsym + "<BR>");
+                    //print("REPLACE:"+ mungedValue +" with " + repsym );    
                     mungedValue = repsym;
                     repsym = '';
                 }
+                
                 identifier.mungedValue =  mungedValue;
             }
             //println("MUNGE: Done " + this.id+"</BR>");
         }
         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();
         }
     }
  
 
-});
+};