X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=a35790efc75602cb8687a971827e9d428055ef09;hb=e80166c6012671cf8c2956f1fa5f943669bff60e;hp=e7120b44aaf6306a442253560347058cc477d27e;hpb=d5e878422cd67f7dbde1f3b3b9ee4f12f89d0fae;p=gnome.introspection-doc-generator

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index e7120b4..a35790e 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -1,35 +1,20 @@
 //<Script type="text/javascript">
 
-Scope = imports.Scope.Scope;
-TokenStream = imports.TokenStream.TokenStream;
+const Scope = imports.Scope.Scope;
+const TokenStream = imports.TokenStream.TokenStream;
 /**
 * Scope stuff
 * 
-* // FIXME - I need this to do next() without doccomments..
-* 
-* 
-* 
-* Need to make this alot simpler...
-* 
-* so debugging is possible.
-* 
-* 
-* at present it just runs along the stream and finds stuff then calls parseExpr .. etc,,
-* 
-* 
-* It would be better to parse blocks of code rather than the whole stream..
-* 
-* 
+* This code now uses the collapsed tree
 * 
 * 
 * 
 */
 
-ScopeParser = function(ts) {
+const ScopeParser = function(ts) {
     this.ts = ts; // {TokenStream}
     this.warnings = [];
-    this.scopes = [];
-    this.indexedScopes = {};
+    this.indexedg = {};
     this.timer = new Date() * 1;
     this.debug = false;
 }
@@ -122,7 +107,6 @@ ScopeParser.prototype = {
     // defaults should not be initialized here =- otherwise they get duped on new, rather than initalized..
     warnings : false,
     ts : false,
-    scopes : false,
     global : false,
     mode : "", //"BUILDING_SYMBOL_TREE",
     braceNesting : 0,
@@ -139,13 +123,12 @@ ScopeParser.prototype = {
         
         this.ts.rewind();
         this.braceNesting = 0;
-        this.scopes = [];
         
        // print(JSON.stringify(this.ts.tokens, null,4));
         
         
         this.globalScope = new  Scope(-1, false, -1, '');
-        indexedScopes = { 0 : this.globalScope };
+        this.indexedScopes = { 0 : this.globalScope };
         
         this.mode = 'BUILDING_SYMBOL_TREE';
         this.parseScope(this.globalScope);
@@ -183,12 +166,15 @@ ScopeParser.prototype = {
 
         this.ts.rewind();
         this.braceNesting = 0;
-        this.scopes= [];
         this.mode = 'PASS2_SYMBOL_TREE';
         
         //println("MUNGING?");
         
         this.parseScope(this.globalScope);
+        
+        //this.globalScope.dump();
+        
+        
         this.globalScope.munge();
     },
 
@@ -223,12 +209,7 @@ ScopeParser.prototype = {
         
         var isObjectLitAr = [ false ];
         var isInObjectLitAr;
-        thisScope = scope;
-        if (thisScope && thisScope.gid != this.scopes[this.scopes.length-1]) {
-            this.scopes.push(scope);
-        } else {
-            thisScope = this.scopes[this.scopes.length-1]
-        }
+        
        
         //var scopeIndent = ''; 
         //this.scopes.forEach(function() {
@@ -245,9 +226,9 @@ ScopeParser.prototype = {
             //this.dumpToken(token , this.scopes, this.braceNesting);
             //print('SCOPE:' + token.toString());
             //this.log(token.data);
-            if (token.type == 'NAME') {
+            //if (token.type == 'NAME') {
             //    print('*' + token.data);
-            }
+            //}
             switch(token.type + '.' + token.name) {
                 case "KEYW.VAR":
                 case "KEYW.CONST": // not really relivant as it's only mozzy that does this.
@@ -258,7 +239,7 @@ ScopeParser.prototype = {
                     while (true) {
                         token = this.ts.nextTok();
                         //!this.debug|| print( token.toString());
-                        //print('SCOPE-VAR-VAL:' + JSON.stringify(token, null, 4));
+                       // print('SCOPE-VAR-VAL:' + JSON.stringify(token, null, 4));
                         if (!token) { // can return false at EOF!
                             break;
                         }
@@ -277,10 +258,10 @@ ScopeParser.prototype = {
                         
 
                         if (this.mode == "BUILDING_SYMBOL_TREE") {
-                            identifier = thisScope.getIdentifier(token.data,token) ;
+                            identifier = scope.getIdentifier(token.data,token) ;
                             
                             if (identifier == false) {
-                                thisScope.declareIdentifier(token.data, token);
+                                scope.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...");
@@ -311,7 +292,7 @@ ScopeParser.prototype = {
                             if (nts.length) {
                                 var TS = this.ts;
                                 this.ts = new TokenStream(nts);
-                                this.parseExpression();
+                                this.parseExpression(scope);
                                 this.ts = TS;
                             }
                                
@@ -320,7 +301,8 @@ ScopeParser.prototype = {
                             //this.logR("parseScope DONE  : <B>ParseExpression</B> - tok is:" + this.ts.lookT(0).toString()); 
                             
                             token = this.ts.lookTok(1);
-                            !this.debug|| print("AFTER EXP: " + token.toString());
+                            //!this.debug|| 
+                           // print("AFTER EXP: " + token.toString());
                             if (token.data == ';') {
                                 break;
                             }
@@ -331,12 +313,14 @@ ScopeParser.prototype = {
                     //this.ts.dump(vstart , this.ts.cursor);
                     
                     break;
+                    
+                    
                 case "KEYW.FUNCTION":
                     //if (this.mode == 'BUILDING_SYMBOL_TREE') 
                     //    print('SCOPE-FUNC:' + JSON.stringify(token,null,4));
                     //println("<i>"+token.data+"</i>");
                      var bn = this.braceNesting;
-                    this.parseFunctionDeclaration();
+                    this.parseFunctionDeclaration(scope);
                      this.braceNesting = bn;
                     break;
 
@@ -348,6 +332,8 @@ ScopeParser.prototype = {
                     var curTS = this.ts;
                     if (token.props) {
                         
+                        // { a : ... , c : .... }
+                        
                         for (var prop in token.props) {
                             
                             
@@ -356,14 +342,14 @@ ScopeParser.prototype = {
                                 // parse a function..
                                 this.ts = new TokenStream(token.props[prop].val);
                                 this.ts.nextTok();
-                                this.parseFunctionDeclaration();
+                                this.parseFunctionDeclaration(scope);
                                 
                                 continue;
                             }
                             // key value..
                             
                             this.ts = new TokenStream(token.props[prop].val);
-                            this.parseExpression();
+                            this.parseExpression(scope);
                             
                         }
                         this.ts = curTS;
@@ -373,12 +359,21 @@ ScopeParser.prototype = {
                         break;
                     }
                     
+                    // ( ... ) or { .... } not object literals..
                     
                     var _this = this;
-                    token.items.forEach(function(expr) {
-                          _this.ts = new TokenStream(expr);
-                          _this.parseExpression()
-                    });
+ 	            for (var xx =0; xx < token.items.length; xx++) {
+				expr = token.items[xx];
+                    //token.items.forEach(function(expr) {
+                            //print(expr.toString());
+                           _this.ts = new TokenStream(expr);
+                            //if (curTS.data == '(') {
+                                _this.parseScope(scope)
+                            //} else {
+                              //  _this.parseExpression(scope)
+                            //}
+                          
+                    }  
                     this.ts = curTS;
                     //print("NOT PROPS"); Seed.quit();
                     
@@ -391,26 +386,7 @@ ScopeParser.prototype = {
                 case "PUNC.RIGHT_CURLY": // }
                     //print("<< EXIT SCOPE");
                     return;
-                /*
-                    //println("<i>"+token.data+"</i>");
-                    this.braceNesting--;
-                    isObjectLitAr.pop();
-                    //print(">>>>>> OBJLIT POP"+ this.braceNesting);
-                        //assert braceNesting >= scope.getBra ceNesting();
-                    
-                    if (this.braceNesting < expressionBraceNesting) {
-                        var ls = this.scopes.pop();
-                        ls.getUsedSymbols();
-                        // eat symbol if we are currently at { 
-                        if (this.ts.look(0).data == '{') {
-                            this.ts.nextTok();
-                        }
-                        
-                        print("<<<<<<<EXIT SCOPE" +this.scopes.length);
-                        return;
-                    }
-                    break;
-*/
+              
                 case "KEYW.WITH":
                     //print('SCOPE-WITH:' + token.toString());
                     //println("<i>"+token.data+"</i>");   
@@ -420,7 +396,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(thisScope);
+                        this.protectScopeFromObfuscation(scope);
                         this.warn("Using 'with' is not recommended." + (this.munge ? " Moreover, using 'with' reduces the level of compression!" : ""), true);
                     }
                     break;
@@ -428,17 +404,9 @@ ScopeParser.prototype = {
                 case "KEYW.CATCH":
                     //print('SCOPE-CATCH:' + token.toString());
                     //println("<i>"+token.data+"</i>");
-                    this.parseCatch();
+                    this.parseCatch(scope);
                     break;
-                /*
-                case Token.SPECIALCOMMENT:
-                        if (mode == BUILDING_SYMBOL_TREE) {
-                            protectScopeFromObfuscation(scope);
-                            this.warn("Using JScript conditional comments is not recommended." + (munge ? " Moreover, using JScript conditional comments reduces the level of compression." : ""), true);
-                        }
-                        break;
-                */
-                
+
                 case "STRN.DOUBLE_QUOTE": // used for object lit detection..
                 case "STRN.SINGLE_QUOTE":
                   //  print('SCOPE-STRING:' + token.toString());
@@ -466,18 +434,13 @@ ScopeParser.prototype = {
                         
                     }
                     
-                    
-                    
                     break;
                 
                 case "NAME.NAME":
                     //print('SCOPE-NAME:' + token.toString());
                     //print("DEAL WITH NAME:");
                     // got identifier..
-                    
                     // look for  { ** : <- indicates obj literal.. ** this could occur with numbers ..
-                     
-                    
                     // skip anyting with "." before it..!!
                      
                     if (this.ts.lookTok(-1).data == ".") {
@@ -500,7 +463,7 @@ ScopeParser.prototype = {
                         //println("GOT IDENT: <B>" + symbol + "</B><BR/>");
                              
                             //println("GOT IDENT (2): <B>" + symbol + "</B><BR/>");
-                        identifier = this.getIdentifier(symbol, thisScope, token);
+                        identifier = this.getIdentifier(symbol, scope, token);
                         
                         if (identifier == false) {
 // BUG!find out where builtin is defined...
@@ -526,7 +489,7 @@ ScopeParser.prototype = {
                     if (token.type != 'KEYW') {
                         break;
                     }
-                    print('SCOPE-KEYW:' + token.toString());
+                    //print('SCOPE-KEYW:' + token.toString());
                    // print("Check eval:");
                 
                     symbol = token.data;
@@ -535,19 +498,20 @@ ScopeParser.prototype = {
 
                         if (token.name == "EVAL") {
                             
-                            print(JSON.stringify(token, null,4));
+                            //print(JSON.stringify(token, null,4));
                             // look back one and see if we can find a comment!!!
                             //if (this.ts.look(-1).type == "COMM") {
                             if (token.prefix && token.prefix.match(/eval/)) {
                                 // look for eval:var:noreplace\n
-                                print("MATCH!?");
+                                //print("MATCH!?");
                                 var _t = this;
                                 token.prefix.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
-                                    print("GOT: " + a);
-                                    var hi = _t.getIdentifier(a, thisScope, token);
+                                    //print("GOT: " + a);
+                                    var hi = _t.getIdentifier(a, scope, token);
                                    // println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
                                     if (hi) {
-                                     //   println("PROTECT "+a+" from munge");
+                                      //  print("PROTECT "+a+" from munge");
+                                        //print(JSON.stringify(hi,null,4));
                                         hi.toMunge = false;
                                     }
                                     
@@ -557,7 +521,7 @@ ScopeParser.prototype = {
                             } else {
                                 
                             
-                                this.protectScopeFromObfuscation(thisScope);
+                                this.protectScopeFromObfuscation(scope);
                                 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);
                             }
 
@@ -580,7 +544,7 @@ ScopeParser.prototype = {
     },
 
     expN : 0,
-    parseExpression : function() {
+    parseExpression : function(scope) {
 
         // Parse the expression until we encounter a comma or a semi-colon
         // in the same brace nesting, bracket nesting and paren nesting.
@@ -595,7 +559,7 @@ ScopeParser.prototype = {
         
         var symbol;
         var token;
-        var currentScope;
+        
         var identifier;
 
         var expressionBraceNesting = this.braceNesting + 0;
@@ -604,11 +568,11 @@ ScopeParser.prototype = {
         var isInObjectLitAr;
         var isObjectLitAr = [ false ];
         
-        currentScope = this.scopes[this.scopes.length-1];
+        
             
         
         //print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
-        while (token = this.ts.nextTok()) {
+        while ((token = this.ts.nextTok())) {
      
         
             
@@ -623,7 +587,7 @@ ScopeParser.prototype = {
            */ 
            
            //this.dumpToken(token,  this.scopes, this.braceNesting );
-           //print('EXPR' +  token.toString());
+            //print('EXPR' +  token.toString());
             
             
             //println("<i>"+token.data+"</i>");
@@ -653,17 +617,21 @@ ScopeParser.prototype = {
                             if (token.props) {
                                 
                                 for (var prop in token.props) {
+                                    if (!token.props[prop].val.length) {
+                                        print(JSON.stringify(token.props, null,4));
+                                    }
+                                    
                                     if (token.props[prop].val[0].data == 'function') {
                                         // parse a function..
                                         this.ts = new TokenStream(token.props[prop].val);
                                         this.ts.nextTok();
-                                        this.parseFunctionDeclaration();
+                                        this.parseFunctionDeclaration(scope);
                                         continue;
                                     }
                                     // key value..
                                     
                                     this.ts = new TokenStream(token.props[prop].val);
-                                    this.parseExpression();
+                                    this.parseExpression(scope);
                                     
                                 }
                                 this.ts = curTS;
@@ -677,7 +645,7 @@ ScopeParser.prototype = {
                             var _this = this;
                             token.items.forEach(function(expr) {
                                   _this.ts = new TokenStream(expr);
-                                  _this.parseExpression()
+                                  _this.parseExpression(scope)
                             });
                             this.ts = curTS;
                         
@@ -739,7 +707,7 @@ ScopeParser.prototype = {
                     
                     if (this.mode == 'PASS2_SYMBOL_TREE') {
 
-                        identifier = this.getIdentifier(symbol, currentScope, token);
+                        identifier = this.getIdentifier(symbol, scope, token);
                         //println("<B>??</B>");
                         if (identifier == false) {
 
@@ -774,30 +742,29 @@ ScopeParser.prototype = {
                     //if (this.mode == 'BUILDING_SYMBOL_TREE') 
                     //    print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
                     
-                    print('EXPR-KEYW:' + token.toString());
+                    //print('EXPR-KEYW:' + token.toString());
                     if (token.name == "FUNCTION") {
                         
-                        this.parseFunctionDeclaration();
+                        this.parseFunctionDeclaration(scope);
                         break;
                     }
                
-                    
-             
+                     
                     symbol = token.data;
                     if (this.mode == 'BUILDING_SYMBOL_TREE') {
                         
                         if (token.name == "EVAL") {
-                            print(JSON.stringify(token,null,4));
+                            //print(JSON.stringify(token,null,4));
                             if (token.prefix && token.prefix.match(/eval:var:/g)) {
                                 // look for eval:var:noreplace\n
-                                print("GOT MATCH?");
+                               // print("GOT MATCH?");
                                 var _t = this;
                                 token.prefix.replace(/eval:var:([a-z]+)/ig, function(m, a) {
                                     
-                                    print("PROTECT: " + a);
+                                    //print("PROTECT: " + a);
                                     
                                     
-                                    var hi = _t.getIdentifier(a, currentScope, token);
+                                    var hi = _t.getIdentifier(a, scope, token);
                                    //println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
                                     if (hi) {
                                       //  println("PROTECT "+a+" from munge");
@@ -808,7 +775,7 @@ ScopeParser.prototype = {
                                 });
                                 
                             } else {
-                                this.protectScopeFromObfuscation(currentScope);
+                                this.protectScopeFromObfuscation(scope);
                                 this.warn("Using 'eval' is not recommended." + (this.munge ? " Moreover, using 'eval' reduces the level of compression!" : ""), true);
                             }
                             
@@ -828,62 +795,64 @@ ScopeParser.prototype = {
     },
 
 
-    parseCatch : function() {
+    parseCatch : function(scope) {
 
         var symbol;
         var token;
-        var currentScope;
+         
         var identifier;
         
         //token = getToken(-1);
         //assert token.getType() == Token.CATCH;
-        token = this.ts.nextTok();
+        token = this.ts.nextTok(1);
+        token = this.ts.nextTok(1);
+        
         
-        //print(JSON.stringify(token,null,4));
+        //print(JSON.stringify(this.ts,null,4));
         //assert token.getType() == Token.LP; (
         //token = this.ts.nextTok();
         //assert token.getType() == Token.NAME;
         
         symbol = token.items[0][0].data;
-        currentScope = this.scopes[this.scopes.length-1];
+        
 
         if (this.mode == 'BUILDING_SYMBOL_TREE') {
             // We must declare the exception identifier in the containing function
             // scope to avoid errors related to the obfuscation process. No need to
             // display a warning if the symbol was already declared here...
-            currentScope.declareIdentifier(symbol, token.items[0][0]);
+            scope.declareIdentifier(symbol, token.items[0][0]);
         } else {
             //?? why inc the refcount?? - that should be set when building the tree???
-            identifier = this.getIdentifier(symbol, currentScope, token.items[0][0]);
+            identifier = this.getIdentifier(symbol, scope, token.items[0][0]);
             identifier.refcount++;
         }
         
-        token = this.ts.nextTok();
+        //token = this.ts.nextTok();
         //assert token.getType() == Token.RP; // )
     },
     
-    parseFunctionDeclaration : function() 
+    parseFunctionDeclaration : function(scope) 
     {
         //print("PARSE FUNCTION");
         var symbol;
         var token;
-        var currentScope  = false; 
+        
         var fnScope = false;
         var identifier;
         var b4braceNesting = this.braceNesting + 0;
         
         //this.logR("<B>PARSING FUNCTION</B>");
-        currentScope = this.scopes[this.scopes.length-1];
+        
 
         token = this.ts.nextTok();
         if (token.type == "NAME") {
             if (this.mode == 'BUILDING_SYMBOL_TREE') {
                 // Get the name of the function and declare it in the current scope.
                 symbol = token.data;
-                if (currentScope.getIdentifier(symbol,token) != false) {
+                if (scope.getIdentifier(symbol,token) != false) {
                     this.warn("The function " + symbol + " has already been declared in the same scope...", true);
                 }
-                currentScope.declareIdentifier(symbol,token);
+                scope.declareIdentifier(symbol,token);
             }
             token =  this.ts.nextTok();
         }
@@ -891,17 +860,15 @@ ScopeParser.prototype = {
         
         // return function() {.... 
         while (token.data != "(") {
-            print(token.toString());
+            //print(token.toString());
             token =  this.ts.nextTok();
-            
-            
-            
+             
         }
         
         
         //assert token.getType() == Token.LP;
         if (this.mode == 'BUILDING_SYMBOL_TREE') {
-            fnScope = new Scope(1, currentScope, token.n, '', token);
+            fnScope = new Scope(1, scope, token.n, '', token);
             
             //println("STORING SCOPE" + this.ts.cursor);
             
@@ -991,4 +958,4 @@ ScopeParser.prototype = {
         }
         return false;
     }
-};
\ No newline at end of file
+};