X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=111bbc5a6edfbdddee1c98cb72dafaccc882db10;hb=0ff3cbd55bdbbd1a914eaa8ecf63ca1d372b0cb4;hp=72cf11dd88e1018f75908970acae316813e45f2e;hpb=65abdb8e42781ec7497d0168fd7c49245cf5472d;p=gnome.introspection-doc-generator

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 72cf11d..111bbc5 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,9 +329,15 @@ 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]);
+                                this.ts = new TokenStream(token.props[prop].val);
+                                this.ts.nextTok();
+                                this.parseFunctionDeclaration();
+                                
                                 continue;
                             }
                             // key value..
@@ -611,19 +618,16 @@ 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;
 
                        
@@ -644,7 +648,7 @@ ScopeParser.prototype = {
                                     // key value..
                                     
                                     this.ts = new TokenStream(token.props[prop].val);
-                                    this.parseScope(scope);
+                                    this.parseScope(currentScope);
                                     
                                 }
                                 this.ts = curTS;
@@ -658,7 +662,7 @@ ScopeParser.prototype = {
                             var _this = this;
                             token.items.forEach(function(expr) {
                                   _this.ts = new TokenStream(expr);
-                                  _this.parseExpression(scope)
+                                  _this.parseExpression()
                             });
                             this.ts = curTS;
                         
@@ -688,7 +692,8 @@ ScopeParser.prototype = {
                     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();
@@ -717,7 +722,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());
@@ -774,7 +780,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();
@@ -810,8 +817,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;
             }
             
@@ -892,8 +900,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++) {