JSDOC/TokenReader.js

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

diff --git a/JSDOC/Walker2.js b/JSDOC/Walker2.js
index df3e793..05dae01 100644 (file)
--- a/JSDOC/Walker2.js
+++ b/JSDOC/Walker2.js
@@ -225,7 +225,7 @@ Walker2 = XObject.define(
                  if (token.name == 'VAR' &&
                  
                         this.ts.lookTok(1).type == 'NAME' &&
-                        this.ts.lookTok(2).data == '-' &&
+                        this.ts.lookTok(2).data == '=' &&
                         this.ts.lookTok(3).type == 'NAME'  &&
                         this.ts.lookTok(4).data == ';'  
                         
@@ -660,15 +660,19 @@ Walker2 = XObject.define(
                         ) {
                             
                             scopeName = this.ts.look(-2).data;
+                            //print(scopeName);
                             scopeName = fixAlias(scopeName);
-                            //var fnScope = new Scope(this.braceNesting, scope, token.n, 
-                            //    '$this$='+scopeName + '|'+scopeName
-                            //);
                             
-                            //this.indexedScopes[this.ts.cursor] = fnScope;
-                            //scope = fnScope;
+                            //print(this.scopes.length);
+                            var fnScope = new Scope(this.braceNesting, scope, token.n, 
+                                '$this$='+scopeName + '|'+scopeName
+                            );
+                            
+                            this.indexedScopes[this.ts.cursor] = fnScope;
+                            scope = fnScope;
                             // push the same scope onto the stack..
-                            this.scopesIn(this.scopes[this.scopes.length-1]);
+                            this.scopesIn(fnScope);
+                            //this.scopesIn(this.scopes[this.scopes.length-1]);
                             
                               
                             locBraceNest++;
@@ -742,7 +746,7 @@ Walker2 = XObject.define(
          
         addSymbol: function(lastIdent, appendIt, atype )
         {
-            print("Walker.addSymbol : " + lastIdent);
+            //print("Walker.addSymbol : " + lastIdent);
            // print("Walker.curdoc: " + JSON.stringify(this.currentDoc, null,4));
             
             /*if (!this.currentDoc.tags.length) {