JSDOC/ScopeParser.js

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

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 1dc8a20..1f3a5d6 100644 (file)
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -854,9 +854,10 @@ ScopeParser.prototype = {
         
         print('FUNC-PARSE:' + JSON.stringify(token,null,4));
         // Parse function arguments.
-        for (var argpos =0; argpos < token.items.length; argpos++) {
+        var args = token.items;
+        for (var argpos =0; argpos < args.length; argpos++) {
              
-            token = token.items[argpos][0];
+            token = args[argpos][0];
            // print ("FUNC ARGS: " + token.toString())
             //assert token.getType() == Token.NAME ||
             //        token.getType() == Token.COMMA;
@@ -870,20 +871,24 @@ ScopeParser.prototype = {
                 argpos++;
             }
         }
-
+        
         token = this.ts.nextTok();
+       // print('FUNC-BODY:' + JSON.stringify(token,null,4));
+        //Seed.quit();
         //print(token.toString());
         // assert token.getType() == Token.LC;
-        this.braceNesting++;
-
-        token = this.ts.nextTok();
+        //this.braceNesting++;
+        
+        //token = this.ts.nextTok();
         //print(token.toString());
-     
-
+        var outTS = this.ts;
+        this.ts = new TokenStream(token.items);
+        print(JSON.stringify(this.ts,null,4);
         this.parseScope(fnScope);
+        this.ts = outTS;
         // now pop it off the stack!!!
        
-        this.braceNesting = b4braceNesting;
+        //this.braceNesting = b4braceNesting;
         //print("ENDFN -1: " + this.ts.lookTok(-1).toString());
         //print("ENDFN 0: " + this.ts.lookTok(0).toString());
         //print("ENDFN 1: " + this.ts.lookTok(1).toString());