JSDOC/Walker2.js

diff --git a/JSDOC/Walker2.js b/JSDOC/Walker2.js
index c5ced61..708a102 100644 (file)
--- a/JSDOC/Walker2.js
+++ b/JSDOC/Walker2.js
@@ -545,7 +545,7 @@ Walker2 = XObject.define(
                     //print( [this.ts.lookT(-3).type , this.ts.lookT(-2).type , this.ts.lookT(-1).type ].join(":"));
                     if (
                             (this.ts.lookT(-1).data == ':') && 
-                            (this.ts.lookT(-2).name == 'NAME') &&
+                            (this.ts.lookT(-2).type == 'NAME') &&
                             (this.ts.lookT(-3).data == '(' || this.ts.lookT(-3).data== ',') 
                         ) {
                         //print("got for : function() {"); 
@@ -571,7 +571,7 @@ Walker2 = XObject.define(
                         //$this$=foo
                         
                     if (
-                            (this.ts.lookT(1).name == 'NAME') 
+                            (this.ts.lookT(1).type == 'NAME') 
                         ) {
                         //scopeName = this.ts.look(-3).data;
                         this.ts.balanceN('(');
@@ -634,9 +634,9 @@ Walker2 = XObject.define(
                
                 
                     if (
-                            (this.ts.lookT(-1).tokN == Script.TOKassign) &&
-                            (this.ts.lookT(-2).tokN == Script.TOKidentifier) &&
-                            (this.ts.lookT(-3).tokN != Script.TOKvar)  
+                            (this.ts.lookT(-1).data == '=') &&
+                            (this.ts.lookT(-2).type == 'NAME') &&
+                            (this.ts.lookT(-3).nane != 'VAR')  
                         ) {
                             
                             scopeName = this.ts.look(-2).data;
@@ -658,9 +658,9 @@ Walker2 = XObject.define(
                       
                     //print("GOT LBRACE : check for :");
                     if (
-                            (this.ts.lookT(-1).tokN == Script.TOKcolon) &&
-                            (this.ts.lookT(-2).tokN == Script.TOKidentifier) &&
-                            (this.ts.lookT(-3).tokN != Script.TOKvar) 
+                            (this.ts.lookT(-1).data == ':') &&
+                            (this.ts.lookT(-2).type == 'NAME') &&
+                            (this.ts.lookT(-3).name != 'VAR') 
                         ) {
                             
                             scopeName = this.ts.lookT(-2).data;
@@ -684,7 +684,7 @@ Walker2 = XObject.define(
                     continue;
                     
                 }
-                if (token.tokN == Script.TOKrbrace) {
+                if (token.data == '{') {
                     
                      
                         if (this.currentDoc) {