X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScope.js;h=425a385f206a494a8dd6a8772d3aaf3d96c82f7f;hp=49d6cbdda7d4d6238a21aff1de4fb446ab564e03;hb=41e759fd84cab731cf33d821bb4e8755ff1e4f76;hpb=d69564e8fe96550b418ef516a1ae5e44035da3eb

diff --git a/JSDOC/Scope.js b/JSDOC/Scope.js
index 49d6cbd..425a385 100644
--- a/JSDOC/Scope.js
+++ b/JSDOC/Scope.js
@@ -6,11 +6,12 @@
 * // FIXME - I need this to do next() without doccomments..
 */
 
-Identifier = imports['JSDOC/Identifier.js'].Identifier
-XObject = imports.XObject.XObject; 
+const Identifier = imports.Identifier.Identifier
+const XObject = imports.XObject.XObject; 
 
+Scope.id = 1;
 
-function Scope(braceN, parent, startTokN, lastIdent)
+function Scope(braceN, parent, startTokN, lastIdent, token)
 {
     if (lastIdent.length) {
        //  println("NEW SCOPE: " + lastIdent);
@@ -18,14 +19,15 @@ function Scope(braceN, parent, startTokN, lastIdent)
     
     this.braceN = braceN
     this.parent = parent;
-    this.id = startTokN;
+    this.id = Scope.id++;
     this.identifiers = { };
     this.subScopes = [];
     this.hints = { };
     this.ident = lastIdent;
-    
-    
-    //println("ADD SCOPE(" + this.id + ") TO "+ (parent ? this.parent.id : 'TOP') + "<BR/>");
+    this.gid = Scope.gid++;
+    this.token = token;
+    //print("ADD SCOPE(" + this.gid + ") TO "+ (parent ? this.parent.gid : 'TOP') + ' : ' + 
+    //    (token ? token.toString() : ''));
     
     if (parent) {
         this.parent.subScopes.push(this);
@@ -45,16 +47,45 @@ Scope.prototype = {
     braceN : -1,
     parent : false,
     subScopes : false,
-    identifiers : false, 
+    identifiers : false,  // map of identifiers to {Identifier} objects
     hints: false, 
     mungeM : true, 
     ident: '',
     
     munged : false,
     protectedVars : {}, // only used by to parent..
-    declareIdentifier : function(symbol, token) {
+    
+    /**
+     * dump the scope to StdOut...
+     * 
+     */
+    dump : function(indent) 
+    {
+        indent = indent || '';
+        var str = '';
+        for (var k in this.identifiers) {
+            str += str.length ? ", " : "";
+            str += k + '=>' + this.identifiers[k].mungedValue;
+        }
+        
+        print(
+            indent + "Scope: " + this.id + "\n" +
+            
+            indent + "Started: " + ( this.token ? this.token.toString(): 'TOP' ) + "\n" +
+            indent + "- " + str + "\n"
+        );
+        this.subScopes.forEach(function(s) {
+            s.dump(indent + ' ');
+        });
         
-        //println("ADD IDENT(" + this.id + "):<B>" + symbol+"</B><BR/>");
+        
+    },
+    
+    
+    declareIdentifier : function(symbol, token) 
+    {
+        
+        //print("SCOPE : " + this.gid +  " :SYM: " + symbol + " " + token.toString()+"");
         
         if (typeof(this.identifiers[symbol])== 'undefined') {
             
@@ -69,11 +100,22 @@ Scope.prototype = {
                 // then it's global... 
                 this.identifiers[symbol].toMunge  = false;
         }
+         
+        
         this.addToParentScope(symbol);
         return this.identifiers[symbol];
     },
-    getIdentifier : function(symbol) {
-        return (typeof(this.identifiers[symbol])== 'undefined') ? false : this.identifiers[symbol];
+    getIdentifier : function(symbol, token) {
+        if (typeof(this.identifiers[symbol])== 'undefined') {
+            if (['String', 'Date'].indexOf(symbol)> -1) {
+                return false;
+            }
+            
+            //print("SCOPE : " + this.gid +" = SYMBOL NOT FOUND?" + token.toString());
+            return false;
+        }
+         //print("SCOPE : " + this.gid +" = FOUND:" + token.toString());
+        return this.identifiers[symbol];
     },
     
     addHint : function(varName, varType) {
@@ -120,7 +162,8 @@ Scope.prototype = {
         return result;
     },
     /** - we need to register short vairalbes so they never get munged into.. */
-    addToParentScope: function(ident) {
+    addToParentScope: function(ident) 
+    {
         if (ident.length > 2) {
             return;
         }
@@ -134,7 +177,8 @@ Scope.prototype = {
         }
         
     },
-    isProtectedVar: function(ident) {
+    isProtectedVar: function(ident)
+    {
         if (ident.length > 2) {
             return false;
         }
@@ -149,9 +193,14 @@ Scope.prototype = {
         return false;
     },
     
-    
+    /**
+     * set's all the munged values on the identifiers.
+     * 
+     * 
+     */
 
-    munge :function() {
+    munge :function() 
+    {
 
         if (!this.mungeM) {
             // Stop right here if this scope was flagged as unsafe for munging.
@@ -163,13 +212,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>");
             
@@ -185,30 +239,9 @@ Scope.prototype = {
                     freeSymbols.push(batch[i]);
                 }
             }
-            /*
-            var exsymbols  = function(n) {
-                if (sy.indexOf(n) > -1) {
-                    return;
-                }
-                freeSymbols.push(n);
-            }
-            */
-            addSyms(JSDOC.Scope.ones); 
-            
-            //if (freeSymbols.length == 0) {
-            //    pickFromSet = 2;
-               // JSDOC.Scope.twos.filter(exsymbols);
-                
-            //}
-            //if (freeSymbols.length == 0) {
-            //    pickFromSet = 3;
-            //    throw "disabled  threes!"
-            //    JSDOC.Scope.threes.filter(exsymbols);
-            //    
-            //}
-            //if (freeSymbols.length == 0) {
-            //    throw  "The Compressor ran out of symbols. Aborting...???? ";
-           // }
+             
+            addSyms(Scope.ones); 
+             
             var repsym = '';
             //println(freeSymbols.toSource());
             
@@ -219,23 +252,26 @@ 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 != JSDOC.Identifier) {
-                    continue;
-                }
+                //if (this.identifiers[i].constructor !=  Identifier) {
+                //    print("SKIP NOT IDENTIFIER : " + i)
+                //    continue;
+               // }
                // println("IDENT:" +i+'</BR>');
                 
                 if (!repsym.length) {
                     if (!freeSymbols.length) {
-                        addSyms(JSDOC.Scope.twos); 
+                        addSyms(Scope.twos); 
                     }
                     repsym = freeSymbols.shift(); // pop off beginngin???
                 }
@@ -247,24 +283,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();
         }
     }
  
 
-});
+};
 
 
 
@@ -318,4 +355,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