X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=d515586748615901df5a0ebe752e48f8e68bca63;hb=0c1f4c84d2c895a915a71327ce0de52250b1e11d;hp=80d4a93f7d89f9cb31a7e34c31093acc8222c82f;hpb=b9be67102006df885d9118528ff952dd148e0910;p=gnome.introspection-doc-generator

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 80d4a93..d515586 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -1,11 +1,28 @@
 //<Script type="text/javascript">
 
-Scope = imports['JSDOC/Scope.js'].Scope;
-
+Scope = imports.Scope.Scope;
+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..
+* 
+* 
+* 
+* 
+* 
 */
 
 ScopeParser = function(ts) {
@@ -187,43 +204,8 @@ ScopeParser.prototype = {
             //println("<B>LOG:</B>" + str + "<BR/>");
     },
 
+     
     
-    dumpLine : false,
-    dumpToken: function (tok, scope, brace) {
-        if (this.dumpLine == false) {
-            this.dumpLine = {
-                str : tok.data + ' ',
-                scope : scope.length,
-                brace : brace
-            }
-            return;
-        }
-        
-        if (this.dumpLine.scope == scope.length && this.dumpLine.brace == brace) {
-            this.dumpLine.str +=  tok.data + ' ';
-            if (this.dumpLine.str.length > 80 || tok.data ==';') {
-                
-                print(
-                //    (new Array(this.dumpLine.scope)).join("  ") + '|' + 
-                    (new Array(this.dumpLine.brace+1)).join("  ") + this.dumpLine.str);
-                this.dumpLine.str = '';
-            }
-            return;
-        }
-        
-        print(
-          //  (new Array(this.dumpLine.scope)).join("  ") + '|' + 
-            (new Array(this.dumpLine.brace+1)).join("  ") + this.dumpLine.str); 
-        
-        
-        this.dumpLine = {
-            str : tok.data + ' ',
-            scope : scope.length,
-            brace : brace
-        }
-        
-    },
-
 
 
     parseScope : function(scope) // parse a token stream..
@@ -243,11 +225,11 @@ ScopeParser.prototype = {
         var isInObjectLitAr;
         this.scopes.push(scope);
        
-        var scopeIndent = ''; 
-        this.scopes.forEach(function() {
-            scopeIndent += '   '; 
-        });
-        print(scopeIndent + ">> ENTER SCOPE");
+        //var scopeIndent = ''; 
+        //this.scopes.forEach(function() {
+        //    scopeIndent += '   '; 
+        //});
+        print(">> ENTER SCOPE");
         
         
         
@@ -255,7 +237,8 @@ ScopeParser.prototype = {
         token = this.ts.lookTok(1);
         while (token) {
           //  this.timerPrint("parseScope AFTER lookT: " + token.toString()); 
-            this.dumpToken(token , this.scopes, this.braceNesting);
+            //this.dumpToken(token , this.scopes, this.braceNesting);
+            print('SCOPE:' + token.toString());
             //this.log(token.data);
             if (token.type == 'NAME') {
             //    print('*' + token.data);
@@ -263,12 +246,14 @@ ScopeParser.prototype = {
             switch(token.type + '.' + token.name) {
                 case "KEYW.VAR":
                 case "KEYW.CONST": // not really relivant as it's only mozzy that does this.
+                    print('SCOPE-VAR:' + token.toString());
+                    var vstart = this.ts.cursor +1;
                     
                     //this.log("parseScope GOT VAR/CONST : " + token.toString()); 
                     while (true) {
                         token = this.ts.nextTok();
-                        !this.debug|| print( token.toString());
-                      
+                        //!this.debug|| print( token.toString());
+                        print('SCOPE-VAR:' + token.toString());
                         if (!token) { // can return false at EOF!
                             break;
                         }
@@ -276,7 +261,7 @@ ScopeParser.prototype = {
                             continue;
                         }
                         //this.logR("parseScope GOT VAR  : <B>" + token.toString() + "</B>"); 
-                        if (token.type !="NAME") {
+                        if (token.type != "NAME") {
                             for(var i = Math.max(this.ts.cursor-10,0); i < this.ts.cursor+1; i++) {
                                 print(this.ts.tokens[i].toString());
                             }
@@ -322,8 +307,13 @@ ScopeParser.prototype = {
                             }
                         }
                     }
+                    
+                    //print("VAR:")
+                    //this.ts.dump(vstart , this.ts.cursor);
+                    
                     break;
                 case "KEYW.FUNCTION":
+                    print('SCOPE-FUNC:' + JSON.stringify(token,null,4));
                     //println("<i>"+token.data+"</i>");
                      var bn = this.braceNesting;
                     this.parseFunctionDeclaration();
@@ -331,14 +321,50 @@ ScopeParser.prototype = {
                     break;
 
                 case "PUNC.LEFT_CURLY": // {
+                case "PUNC.LEFT_PAREN": // (    
+                    print('SCOPE-CURLY/PAREN:' + token.toString());
                     //println("<i>"+token.data+"</i>");
-                    isObjectLitAr.push(false);
-                    this.braceNesting++;
+                    var curTS = this.ts;
+                    if (token.props) {
+                        
+                        for (var prop in token.props) {
+                            if (token.props[prop].val.data == 'function') {
+                                // parse a function..
+                                this.parseFunctProp(token.props[prop]);
+                                continue;
+                            }
+                            // key value..
+                            
+                            this.ts = new TokenStream(token.props[prop].val);
+                            this.parseScope(scope);
+                            
+                        }
+                        this.ts = curTS;
+                        
+                        // it's an object literal..
+                        // the values could be replaced..
+                        break;
+                    }
+                    
+                    
+                    var _this = this;
+                    token.items.forEach(function(expr) {
+                          _this.ts = new TokenStream(expr);
+                          _this.parseExpression(scope)
+                    });
+                    this.ts = curTS;
+                    //print("NOT PROPS"); Seed.quit();
+                    
+                    //isObjectLitAr.push(false);
+                    //this.braceNesting++;
                     
                     //print(">>>>>> OBJLIT PUSH(false)" + this.braceNesting);
                     break;
 
                 case "PUNC.RIGHT_CURLY": // }
+                    print("<< EXIT SCOPE");
+                    return;
+                /*
                     //println("<i>"+token.data+"</i>");
                     this.braceNesting--;
                     isObjectLitAr.pop();
@@ -357,8 +383,9 @@ ScopeParser.prototype = {
                         return;
                     }
                     break;
-
+*/
                 case "KEYW.WITH":
+                    print('SCOPE-WITH:' + token.toString());
                     //println("<i>"+token.data+"</i>");   
                     if (this.mode == "BUILDING_SYMBOL_TREE") {
                         // Inside a 'with' block, it is impossible to figure out
@@ -372,6 +399,7 @@ ScopeParser.prototype = {
                     break;
 
                 case "KEYW.CATCH":
+                    print('SCOPE-CATCH:' + token.toString());
                     //println("<i>"+token.data+"</i>");
                     this.parseCatch();
                     break;
@@ -386,7 +414,9 @@ ScopeParser.prototype = {
                 
                 case "STRN.DOUBLE_QUOTE": // used for object lit detection..
                 case "STRN.SINGLE_QUOTE":
+                    print('SCOPE-STRING:' + token.toString());
                     //println("<i>"+token.data+"</i>");
+
                     if (this.ts.lookTok(-1).data == '{' && this.ts.lookTok(1).data == ':') {
                         // then we are in an object lit.. -> we need to flag the brace as such...
                         isObjectLitAr.pop();
@@ -414,7 +444,7 @@ ScopeParser.prototype = {
                     break;
                 
                 case "NAME.NAME":
-                
+                    print('SCOPE-NAME:' + token.toString());
                     //print("DEAL WITH NAME:");
                     // got identifier..
                     
@@ -443,6 +473,8 @@ ScopeParser.prototype = {
                         //println("<i>"+token.data+"</i>");
                         break;
                     }
+                    //print("SYMBOL: " + token.toString());
+                    
                     symbol = token.data;
                     if (this.mode == 'PASS2_SYMBOL_TREE') {
                         
@@ -479,6 +511,7 @@ ScopeParser.prototype = {
                     if (token.type != 'KEYW') {
                         break;
                     }
+                    print('SCOPE-KEYW:' + token.toString());
                    // print("Check eval:");
                 
                     symbol = token.data;
@@ -523,10 +556,11 @@ ScopeParser.prototype = {
             //if (this.ts.nextT()) break;
             
         }
+        print("<<< EXIT SCOPE");
         //print("<<<<<<<EXIT SCOPE ERR?" +this.scopes.length);
     },
 
-
+    expN : 0,
     parseExpression : function() {
 
         // Parse the expression until we encounter a comma or a semi-colon
@@ -534,7 +568,7 @@ ScopeParser.prototype = {
         // Parse functions if any...
         //println("<i>EXP</i><BR/>");
         !this.debug || print("PARSE EXPR");
-       
+        this.expN++;
          
         // for printing stuff..
        
@@ -553,14 +587,11 @@ ScopeParser.prototype = {
         
         currentScope = this.scopes[this.scopes.length-1];
             
-        var scopeIndent = ''; 
-        this.scopes.forEach(function() {
-            scopeIndent += '   '; 
-        });
-        print(scopeIndent + ">> ENTER EXPRESSION");
-        while (token = this.ts.lookTok()) {
+        
+        //print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
+        while (token = this.ts.nextTok()) {
      
-
+        
             
            /*
             // moved out of loop?
@@ -572,13 +603,16 @@ ScopeParser.prototype = {
             });
            */ 
            
-           this.dumpToken(token,  this.scopes, this.braceNesting );
+           //this.dumpToken(token,  this.scopes, this.braceNesting );
+           print('EXP' +  token.toString());
             
             
             //println("<i>"+token.data+"</i>");
             //this.log("EXP:" + token.data);
             switch (token.type) {
                 case 'PUNC':
+                    print("EXPR-PUNC:" + JSON.stringify(token, null, 4));
+                    
                     switch(token.data) {
                          
                         case ';':
@@ -586,46 +620,75 @@ ScopeParser.prototype = {
                             if (this.braceNesting == expressionBraceNesting &&
                                     bracketNesting == 0 &&
                                     parensNesting == 0) {
-                                print(scopeIndent + "<< EXIT EXPRESSION");
+                                print("<< EXIT EXPRESSION");
+                                this.expN--;
                                 return;
                             }
                             break;
 
                        
-
+                        case '(': //Token.LP:
                         case '{': //Token.LC:
-                            isObjectLitAr.push(false);
+                        case '[': //Token.LB:
+                            print('SCOPE-CURLY/PAREN/BRACE:' + token.toString());
+                            //println("<i>"+token.data+"</i>");
+                            var curTS = this.ts;
+                            if (token.props) {
+                                
+                                for (var prop in token.props) {
+                                    if (token.props[prop].val.data == 'function') {
+                                        // parse a function..
+                                        this.parseFunctProp(token.props[prop]);
+                                        continue;
+                                    }
+                                    // key value..
+                                    
+                                    this.ts = new TokenStream(token.props[prop].val);
+                                    this.parseScope(currentScope);
+                                    
+                                }
+                                this.ts = curTS;
+                                
+                                // it's an object literal..
+                                // the values could be replaced..
+                                break;
+                            }
                             
-                            this.braceNesting++;
+                            
+                            var _this = this;
+                            token.items.forEach(function(expr) {
+                                  _this.ts = new TokenStream(expr);
+                                  _this.parseExpression()
+                            });
+                            this.ts = curTS;
+                        
+                        
+                    
                             ///print(">>>>> EXP PUSH(false)"+this.braceNesting);
                             break;
 
-                        case '}': //Token.RC:
-                            this.braceNesting--;
-                            isObjectLitAr.pop();
-                            //print(">>>>> EXP POP" + this.braceNesting);    
-                           // assert braceNesting >= expressionBraceNesting;
-                            break;
-
-                        case '[': //Token.LB:
-                            bracketNesting++;
-                            break;
-
+                       
+                        
+                         
+                            
+                        case ')': //Token.RP:
                         case ']': //Token.RB:
-                            bracketNesting--;
-                            break;
-
-                        case '(': //Token.LP:
+                        case '}': //Token.RB:
+                            print("<< EXIT EXPRESSION");
+                            return;
+                           
+ 
+             
                             parensNesting++;
                             break;
 
-                        case ')': //Token.RP:
-                            parensNesting--;
-                            break;
+                        
+                            
                     }
                     break;
                     
                 case 'STRN': // used for object lit detection..
+                    print("EXPR-STR:" + JSON.stringify(token, null, 4));
                     if (this.ts.lookTok(-1).data == "{" && this.ts.lookTok(1).data == ":" ) {
                         // then we are in an object lit.. -> we need to flag the brace as such...
                         isObjectLitAr.pop();
@@ -654,7 +717,7 @@ ScopeParser.prototype = {
                       
              
                 case 'NAME':
-               
+                    print("EXPR-NAME:" + JSON.stringify(token, null, 4));
                     symbol = token.data;
                     //print("in NAME = " + token.toString());
                     //print("in NAME 0: " + this.ts.look(0).toString());
@@ -710,8 +773,8 @@ ScopeParser.prototype = {
                     
                     
                     //println("<B>EID</B>");
-                 case 'KEYW':   
-                 
+                case 'KEYW':   
+                    print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
                     if (token.name == "FUNCTION") {
                         
                         this.parseFunctionDeclaration();
@@ -747,11 +810,14 @@ ScopeParser.prototype = {
                         }
                         break;
                     } 
-                   
+                default: 
+                    print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
+                    break;
             }
-            if (!this.ts.nextTok()) break;
+            
         }
-        print(scopeIndent + "<< EXIT EXPRESSION");
+        print("<< EXIT EXPRESSION");
+        this.expN--;
     },
 
 
@@ -789,7 +855,7 @@ ScopeParser.prototype = {
     
     parseFunctionDeclaration : function() 
     {
-        print("PARSE FUNCTION");
+        //print("PARSE FUNCTION");
         var symbol;
         var token;
         var currentScope  = false; 
@@ -827,10 +893,12 @@ ScopeParser.prototype = {
           
         }
         
+        print('FUNC-PARSE:' + JSON.stringify(token,null,4));
         // Parse function arguments.
-        var argpos = 0;
-        while (this.ts.lookTok().data != ')') { //(token = consumeToken()).getType() != Token.RP) {
-            token = this.ts.nextTok();
+        var args = token.items;
+        for (var argpos =0; argpos < args.length; argpos++) {
+             
+            token = args[argpos][0];
            // print ("FUNC ARGS: " + token.toString())
             //assert token.getType() == Token.NAME ||
             //        token.getType() == Token.COMMA;
@@ -844,69 +912,33 @@ ScopeParser.prototype = {
                 argpos++;
             }
         }
-
+        
         token = this.ts.nextTok();
-        print(token.toString());
+        //print('FUNC-BODY:' + JSON.stringify(token.items,null,4));
+        //Seed.quit();
+        //print(token.toString());
         // assert token.getType() == Token.LC;
-        this.braceNesting++;
-
-        token = this.ts.nextTok();
-        print(token.toString());
-        if (token.type == "STRN" && this.ts.lookTok(1).data == ';') {
-            /*
-            
-            NOT SUPPORTED YET!?!!?!
+        //this.braceNesting++;
+        
+        //token = this.ts.nextTok();
+        //print(token.toString());
+        var outTS = this.ts;
+        var _this = this;
+        token.items.forEach(function(tar) {
+            _this.ts = new TokenStream(tar);
+            _this.parseScope(fnScope);
             
-            // This is a hint. Hints are empty statements that look like
-            // "localvar1:nomunge, localvar2:nomunge"; They allow developers
-            // to prevent specific symbols from getting obfuscated (some heretic
-            // implementations, such as Prototype 1.6, require specific variable
-            // names, such as $super for example, in order to work appropriately.
-            // Note: right now, only "nomunge" is supported in the right hand side
-            // of a hint. However, in the future, the right hand side may contain
-            // other values.
-            consumeToken();
-            String hints = token.getValue();
-            // Remove the leading and trailing quotes...
-            hints = hints.substring(1, hints.length() - 1).trim();
-            StringTokenizer st1 = new StringTokenizer(hints, ",");
-            while (st1.hasMoreTokens()) {
-                String hint = st1.nextToken();
-                int idx = hint.indexOf(':');
-                if (idx <= 0 || idx >= hint.length() - 1) {
-                    if (mode == BUILDING_SYMBOL_TREE) {
-                        // No need to report the error twice, hence the test...
-                        this.warn("Invalid hint syntax: " + hint, true);
-                    }
-                    break;
-                }
-                String variableName = hint.substring(0, idx).trim();
-                String variableType = hint.substring(idx + 1).trim();
-                if (mode == BUILDING_SYMBOL_TREE) {
-                    fnScope.addHint(variableName, variableType);
-                } else if (mode == CHECKING_SYMBOL_TREE) {
-                    identifier = fnScope.getIdentifier(variableName);
-                    if (identifier != null) {
-                        if (variableType.equals("nomunge")) {
-                            identifier.preventMunging();
-                        } else {
-                            this.warn("Unsupported hint value: " + hint, true);
-                        }
-                    } else {
-                        this.warn("Hint refers to an unknown identifier: " + hint, true);
-                    }
-                }
-            }
-            */
-        }
-
-        this.parseScope(fnScope);
+        });
+        
+        //print(JSON.stringify(this.ts,null,4));
+        //this.parseScope(fnScope);
+        this.ts = outTS;
         // now pop it off the stack!!!
        
-        this.braceNesting = b4braceNesting;
-        print("ENDFN -1: " + this.ts.lookTok(-1).toString());
-        print("ENDFN 0: " + this.ts.lookTok(0).toString());
-        print("ENDFN 1: " + this.ts.lookTok(1).toString());
+        //this.braceNesting = b4braceNesting;
+        //print("ENDFN -1: " + this.ts.lookTok(-1).toString());
+        //print("ENDFN 0: " + this.ts.lookTok(0).toString());
+        //print("ENDFN 1: " + this.ts.lookTok(1).toString());
     },
     
     protectScopeFromObfuscation : function(scope) {