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

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 97b3fac..d515586 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -321,7 +321,8 @@ ScopeParser.prototype = {
                     break;
 
                 case "PUNC.LEFT_CURLY": // {
-                    
+                case "PUNC.LEFT_PAREN": // (    
+                    print('SCOPE-CURLY/PAREN:' + token.toString());
                     //println("<i>"+token.data+"</i>");
                     var curTS = this.ts;
                     if (token.props) {
@@ -345,7 +346,7 @@ ScopeParser.prototype = {
                         break;
                     }
                     
-                    print('SCOPE-CURLY:' + JSON.stringify(token,null,4));
+                    
                     var _this = this;
                     token.items.forEach(function(expr) {
                           _this.ts = new TokenStream(expr);
@@ -361,6 +362,7 @@ ScopeParser.prototype = {
                     break;
 
                 case "PUNC.RIGHT_CURLY": // }
+                    print("<< EXIT SCOPE");
                     return;
                 /*
                     //println("<i>"+token.data+"</i>");
@@ -554,6 +556,7 @@ ScopeParser.prototype = {
             //if (this.ts.nextT()) break;
             
         }
+        print("<<< EXIT SCOPE");
         //print("<<<<<<<EXIT SCOPE ERR?" +this.scopes.length);
     },
 
@@ -624,46 +627,63 @@ ScopeParser.prototype = {
                             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;