JSDOC/Walker2.js

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

diff --git a/JSDOC/Walker2.js b/JSDOC/Walker2.js
index 4e2e650..fdcc3c0 100644 (file)
--- a/JSDOC/Walker2.js
+++ b/JSDOC/Walker2.js
@@ -154,14 +154,14 @@ Walker2 = XObject.define(
             
             //print(JSON.stringify(this.ts, null, 4)); Seed.quit();
             
-            while (false != (token = this.ts.next())) {
+            while (null != (token = this.ts.next())) {
                 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 +169,6 @@ Walker2 = XObject.define(
                         
                         this.addSymbol('', true);
 
-                        
                         //throw "Unconsumed Doc (TOKwhitespace): " + this.currentDoc.toSource();
                     }
                     
@@ -262,20 +261,20 @@ Walker2 = XObject.define(
                            
                         ) {
                         // ignore test for ( a and ,
-                        this.ts.nextT(); /// (
-                        token = this.ts.nextT(); // a
+                        this.ts.nextTok(); /// (
+                        token = this.ts.nextTok(); // a
                         scopeName = token.data;
                         
                         if (this.currentDoc) {
                             this.addSymbol(scopeName,false,'OBJECT');
 
                         }
-                        this.ts.nextT(); // ,
-                        this.ts.nextT(); // b
+                        this.ts.nextTok(); // ,
+                        this.ts.nextTok(); // b
                         
                         
-                        this.ts.nextT(); // ,
-                        token = this.ts.nextT(); // {
+                        this.ts.nextTok(); // ,
+                        token = this.ts.nextTok(); // {
                             
                         scopeName = fixAlias(scopeName);
                         
@@ -308,11 +307,11 @@ Walker2 = XObject.define(
                             this.addSymbol(scopeName,false,'OBJECT');
 
                         }
-                        this.ts.nextT(); /// (
-                        this.ts.nextT(); // parent
+                        this.ts.nextTok(); /// (
+                        this.ts.nextTok(); // parent
                         
-                        this.ts.nextT(); // ,
-                        token =  this.ts.nextT(); // {
+                        this.ts.nextTok(); // ,
+                        token =  this.ts.nextTok(); // {
                              
                         
                         scopeName = fixAlias(scopeName);
@@ -338,11 +337,11 @@ Walker2 = XObject.define(
                         this.ts.lookTok(4).data == '{' 
                         
                         ) {
-                        this.ts.nextT(); /// (
+                        this.ts.nextTok(); /// (
                          
                         //print("GOT : applyIF!"); 
                          
-                        token = this.ts.nextT(); // b
+                        token = this.ts.nextTok(); // b
                         scopeName = token.data;
                         
                                       
@@ -353,8 +352,8 @@ Walker2 = XObject.define(
                      
 
                         
-                        this.ts.nextT(); /// ,
-                        this.ts.nextT(); // {
+                        this.ts.nextTok(); /// ,
+                        this.ts.nextTok(); // {
                             scopeName = fixAlias(scopeName);
                         var fnScope = new Scope(this.braceNesting, scope, token.n, scopeName);
                         this.indexedScopes[this.ts.cursor] = fnScope;
@@ -371,6 +370,14 @@ Walker2 = XObject.define(
                         
                     // 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' &&
@@ -383,11 +390,11 @@ Walker2 = XObject.define(
                             
                         }
                         
-                        this.ts.nextT(); /// =
-                        this.ts.nextT(); /// new
-                        this.ts.nextT(); /// yyy
-                        this.ts.nextT(); /// (
-                        this.ts.nextT(); /// {
+                        this.ts.nextTok(); /// =
+                        this.ts.nextTok(); /// new
+                        this.ts.nextTok(); /// yyy
+                        this.ts.nextTok(); /// (
+                        this.ts.nextTok(); /// {
                             
                         scopeName = fixAlias(scopeName);
                         var fnScope = new Scope(this.braceNesting, scope, token.n, scopeName);
@@ -486,7 +493,7 @@ Walker2 = XObject.define(
                         ) {
                         scopeName = this.ts.lookTok(-2).data;
                         this.ts.balanceN('(');
-                        token = this.ts.nextT(); // should be {
+                        token = this.ts.nextTok(); // should be {
                         //print("FOO=FUNCITON() {}" + this.ts.context() + "\n" + token.toString());
                         
                         
@@ -519,7 +526,7 @@ Walker2 = XObject.define(
                         ) {
                         //scopeName = this.ts.look(-3).data;
                         this.ts.balanceN(Script.TOKlparen);
-                        token = this.ts.nextT(); // should be {
+                        token = this.ts.nextTok(); // should be {
                             scopeName = fixAlias(scopeName);
                         var fnScope = new Scope(this.braceNesting, scope, token.n, '$private$');
                         this.indexedScopes[this.ts.cursor] = fnScope;
@@ -553,7 +560,7 @@ Walker2 = XObject.define(
                         //scopeName = this.ts.look(-3).data;
                         this.ts.balanceN(Script.TOKlparen);
                         //print(token.toString())
-                        token = this.ts.nextT(); // should be {
+                        token = this.ts.nextTok(); // should be {
                         //print(token.toString())
                         scopeName = fixAlias(scopeName);
                         var fnScope = new Scope(this.braceNesting, scope, token.n, '');
@@ -575,7 +582,7 @@ Walker2 = XObject.define(
                         ) {
                         //scopeName = this.ts.look(-3).data;
                         this.ts.balanceN('(');
-                        token = this.ts.nextT(); // should be {
+                        token = this.ts.nextTok(); // should be {
                             
                         var fnScope = new Scope(this.braceNesting, scope, token.n, '');
                         this.indexedScopes[this.ts.cursor] = fnScope;
@@ -603,7 +610,7 @@ Walker2 = XObject.define(
                         ) {
                         //scopeName = this.ts.look(-3).data;
                         this.ts.balanceN('(');
-                        token = this.ts.nextT(); // should be {
+                        token = this.ts.nextTok(); // should be {
                         var fnScope = new Scope(this.braceNesting, scope, token.n, '$private$');
                         this.indexedScopes[this.ts.cursor] = fnScope;
                         //scope = ;