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

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index a8f67a9..619dd6c 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -321,11 +321,12 @@ 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) {
-                        var curTS = this.ts;
+                        
                         for (var prop in token.props) {
                             if (token.props[prop].val.data == 'function') {
                                 // parse a function..
@@ -342,18 +343,28 @@ ScopeParser.prototype = {
                         
                         // it's an object literal..
                         // the values could be replaced..
-                        
+                        break;
                     }
-                    print('SCOPE-CURLY:' + JSON.stringify(token,null,4));
-                    print("NOT PROPS"); Seed.quit();
                     
-                    isObjectLitAr.push(false);
-                    this.braceNesting++;
+                    
+                    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();
@@ -545,6 +556,7 @@ ScopeParser.prototype = {
             //if (this.ts.nextT()) break;
             
         }
+        print("<<< EXIT SCOPE");
         //print("<<<<<<<EXIT SCOPE ERR?" +this.scopes.length);
     },
 
@@ -577,9 +589,9 @@ ScopeParser.prototype = {
             
         
         //print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
-        while (token = this.ts.lookTok()) {
+        while (token = this.ts.nextTok()) {
      
-
+        
             
            /*
             // moved out of loop?
@@ -592,7 +604,7 @@ ScopeParser.prototype = {
            */ 
            
            //this.dumpToken(token,  this.scopes, this.braceNesting );
-           //print('EXP' + this.expN + ':' + token.toString());
+           print('EXP' +  token.toString());
             
             
             //println("<i>"+token.data+"</i>");
@@ -635,16 +647,20 @@ ScopeParser.prototype = {
                             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.RB:
-                            bracketNesting--;
-                            break;
-*/
+                            print("<< EXIT EXPRESSION");
+                            return;
+                           
+ 
                         case '(': //Token.LP:
                             parensNesting++;
                             break;
@@ -741,7 +757,7 @@ ScopeParser.prototype = {
                     
                     
                     //println("<B>EID</B>");
-                 case 'KEYW':   
+                case 'KEYW':   
                     print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
                     if (token.name == "FUNCTION") {
                         
@@ -778,9 +794,11 @@ ScopeParser.prototype = {
                         }
                         break;
                     } 
-                   
+                default: 
+                    print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
+                    break;
             }
-            if (!this.ts.nextTok()) break;
+            
         }
         print("<< EXIT EXPRESSION");
         this.expN--;