X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=17947d43eb8c754e3454fa65ee7554c43eb19da0;hb=c54cac895264e90610559df06d94f2d05730774d;hp=619dd6c8f7f63ea1ca7cd9e09760aeb3426a8c8e;hpb=462346234089eecf2266b206fa50a984e73cc7ed;p=gnome.introspection-doc-generator

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 619dd6c..17947d4 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -313,7 +313,8 @@ ScopeParser.prototype = {
                     
                     break;
                 case "KEYW.FUNCTION":
-                    print('SCOPE-FUNC:' + JSON.stringify(token,null,4));
+                    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();
@@ -328,7 +329,9 @@ ScopeParser.prototype = {
                     if (token.props) {
                         
                         for (var prop in token.props) {
-                            if (token.props[prop].val.data == 'function') {
+                            
+                             print('SCOPE-PROPS:' + JSON.stringify(token.props[prop],null,4));
+                            if (token.props[prop].val[0].data == 'function') {
                                 // parse a function..
                                 this.parseFunctProp(token.props[prop]);
                                 continue;
@@ -611,68 +614,82 @@ ScopeParser.prototype = {
             //this.log("EXP:" + token.data);
             switch (token.type) {
                 case 'PUNC':
-                    print("EXPR-PUNC:" + JSON.stringify(token, null, 4));
+                    print("EXPR-PUNC:" + token.toString());
                     
                     switch(token.data) {
                          
                         case ';':
+                            print("<< EXIT EXPRESSION");
+                            break;
+
                         case ',':
-                            if (this.braceNesting == expressionBraceNesting &&
-                                    bracketNesting == 0 &&
-                                    parensNesting == 0) {
-                                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:
+                       
                         
-                            var ts = this.ts;
-                            var _this = this;
-                            token.items.forEach(function(ns) {
-                                 print("EXPR-PUNC-MAKE:" + JSON.stringify(ns, null, 4));
-                                _this.ts = new TokenStream(ns);
-                                //_this.ts.cursor--;
-                                _this.parseExpression();
-                            });
-                            this.ts = ts;
+                         
                             
-                            break;
- 
+                        case ')': //Token.RP:
                         case ']': //Token.RB:
+                        case '}': //Token.RB:
                             print("<< EXIT EXPRESSION");
                             return;
                            
  
-                        case '(': //Token.LP:
+             
                             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.mode == 'BUILDING_SYMBOL_TREE')    
+                        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();
@@ -701,7 +718,8 @@ ScopeParser.prototype = {
                       
              
                 case 'NAME':
-                    print("EXPR-NAME:" + JSON.stringify(token, null, 4));
+                    if (this.mode == 'BUILDING_SYMBOL_TREE') 
+                        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());
@@ -758,7 +776,8 @@ ScopeParser.prototype = {
                     
                     //println("<B>EID</B>");
                 case 'KEYW':   
-                    print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
+                    if (this.mode == 'BUILDING_SYMBOL_TREE') 
+                        print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
                     if (token.name == "FUNCTION") {
                         
                         this.parseFunctionDeclaration();
@@ -794,8 +813,9 @@ ScopeParser.prototype = {
                         }
                         break;
                     } 
-                default: 
-                    print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
+                default:
+                    if (this.mode == 'BUILDING_SYMBOL_TREE') 
+                        print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
                     break;
             }
             
@@ -876,8 +896,8 @@ ScopeParser.prototype = {
             fnScope = this.indexedScopes[this.ts.cursor];
           
         }
-        
-        print('FUNC-PARSE:' + JSON.stringify(token,null,4));
+        if (this.mode == 'BUILDING_SYMBOL_TREE') 
+            print('FUNC-PARSE:' + JSON.stringify(token,null,4));
         // Parse function arguments.
         var args = token.items;
         for (var argpos =0; argpos < args.length; argpos++) {