JSDOC/ScopeParser.js

[gnome.introspection-doc-generator] / JSDOC / ScopeParser.js

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 72cf11d..20b0233 100644 (file)
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -611,19 +611,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 +641,7 @@ ScopeParser.prototype = {
                                     // key value..
                                     
                                     this.ts = new TokenStream(token.props[prop].val);
-                                    this.parseScope(scope);
+                                    this.parseScope(currentScope);
                                     
                                 }
                                 this.ts = curTS;
@@ -658,7 +655,7 @@ ScopeParser.prototype = {
                             var _this = this;
                             token.items.forEach(function(expr) {
                                   _this.ts = new TokenStream(expr);
-                                  _this.parseExpression(scope)
+                                  _this.parseExpression()
                             });
                             this.ts = curTS;