JSDOC/Walker2.js

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

diff --git a/JSDOC/Walker2.js b/JSDOC/Walker2.js
index db484bf..136b048 100644 (file)
--- a/JSDOC/Walker2.js
+++ b/JSDOC/Walker2.js
@@ -71,6 +71,7 @@ Walker2 = XObject.define(
             
             this.mode = 'BUILDING_SYMBOL_TREE';
             this.parseScope(this.globalScope);
+            
         },
         
 
@@ -155,13 +156,13 @@ Walker2 = XObject.define(
             //print(JSON.stringify(this.ts, null, 4)); Seed.quit();
             
             while (null != (token = this.ts.next())) {
-                //print("TOK"+ token.toString());
+                print("TOK"+ token.toString());
                 //  this.timerPrint("parseScope AFTER lookT: " + token.toString()); 
                   
                 if (token.is('WHIT')) {
                       
                  
-                    if (!token._isDoc) {
+                    if (token.name != 'JSDOC') {
                         continue; //skip.
                     }
                     if (this.currentDoc) {
@@ -169,7 +170,6 @@ Walker2 = XObject.define(
                         
                         this.addSymbol('', true);
 
-                        
                         //throw "Unconsumed Doc (TOKwhitespace): " + this.currentDoc.toSource();
                     }
                     
@@ -330,7 +330,16 @@ Walker2 = XObject.define(
                     
                     
                      // apply ( XXXX,  {
-                         
+                    /*
+                    print(JSON.stringify([
+                        token.data,
+                        this.ts.lookTok(1).data ,
+                        this.ts.lookTok(2).type ,
+                        this.ts.lookTok(3).data ,
+                        this.ts.lookTok(4).data 
+                    ], null, 4));
+                    */
+                    
                     if (/\.(applyIf|apply)$/.test(token.data) && 
                         this.ts.lookTok(1).data == '('  &&
                         this.ts.lookTok(2).type == 'NAME' &&
@@ -348,14 +357,13 @@ Walker2 = XObject.define(
                                       
                         if (this.currentDoc) {
                             this.addSymbol(scopeName,false,'OBJECT');
-
                         }
                      
 
                         
                         this.ts.nextTok(); /// ,
                         this.ts.nextTok(); // {
-                            scopeName = fixAlias(scopeName);
+                        scopeName = fixAlias(scopeName);
                         var fnScope = new Scope(this.braceNesting, scope, token.n, scopeName);
                         this.indexedScopes[this.ts.cursor] = fnScope;
                         scope = fnScope;
@@ -370,7 +378,15 @@ Walker2 = XObject.define(
                     // xxx = new yyy ( {
                         
                     // change scope to xxxx
-                    
+                    /*
+                    print(JSON.stringify([
+                        this.ts.lookTok(1).data ,
+                        this.ts.lookTok(2).name ,
+                        this.ts.lookTok(3).type ,
+                        this.ts.lookTok(4).data ,
+                        this.ts.lookTok(5).data 
+                    ], null, 4));
+                    */
                     if ( this.ts.lookTok(1).data == '=' &&
                         this.ts.lookTok(2).name == 'NEW' &&
                         this.ts.lookTok(3).type == 'NAME' &&
@@ -493,6 +509,7 @@ Walker2 = XObject.define(
                         scopeName = fixAlias(scopeName);
                         var fnScope = new Scope(this.braceNesting, scope, token.n, 
                             '$this$='+scopeName+'.prototype|$private$|'+scopeName+'.prototype');
+                            
                         this.indexedScopes[this.ts.cursor] = fnScope;
                         //scope = fnScope;
                         //this.scopesIn(fnScope);