JSDOC/ScopeParser.js

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 09d7212..6786600 100644 (file)
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -212,7 +212,7 @@ ScopeParser.prototype = {
                     
                     //this.log("parseScope GOT VAR/CONST : " + token.toString()); 
                     while (true) {
-                        token = this.ts.next();
+                        token = this.ts.nextTok();
                         
                         if (token.name == "var") { // kludge..
                             continue;
@@ -238,7 +238,7 @@ ScopeParser.prototype = {
                             }
                         }
 
-                        token = this.ts.next();
+                        token = this.ts.nextTok();
                         /*
                         assert token.getType() == Token.SEMI ||
                                 token.getType() == Token.ASSIGN ||
@@ -436,7 +436,7 @@ ScopeParser.prototype = {
             
             
             //this.timerPrint("parseScope TOK : " + token.toString()); 
-            token = this.ts.next();
+            token = this.ts.nextTok();
             //if (this.ts.nextT()) break;
             
         }
@@ -575,7 +575,7 @@ ScopeParser.prototype = {
                     if (this.mode == 'BUILDING_SYMBOL_TREE') {
 
                         if (symbol == "eval") {
-                            if (this.ts.look(-1).isDoc()) {
+                            if (this.ts.look(-1).type == 'COMM') {
                                 // look for eval:var:noreplace\n
                                 var _t = this;
                                 this.ts.look(-1).data.replace(/eval:var:([a-z]+)/ig, function(m, a) {
@@ -604,7 +604,7 @@ ScopeParser.prototype = {
                         //println("<B>??</B>");
                         if (identifier == false) {
 
-                            if (symbol.length <= 3 && JSDOC.Scope.builtin.indexOf(symbol) < 0) {
+                            if (symbol.length <= 3 &&  Scope.builtin.indexOf(symbol) < 0) {
                                 // Here, we found an undeclared and un-namespaced symbol that is
                                 // 3 characters or less in length. Declare it in the global scope.
                                 // We don't need to declare longer symbols since they won't cause
@@ -625,7 +625,7 @@ ScopeParser.prototype = {
                     }
                     break;
             }
-            if (!this.ts.nextT()) break;
+            if (!this.ts.nextTok()) break;
         }
     },
 
@@ -639,9 +639,9 @@ ScopeParser.prototype = {
 
         //token = getToken(-1);
         //assert token.getType() == Token.CATCH;
-        token = this.ts.nextT();
+        token = this.ts.nextTok();
         //assert token.getType() == Token.LP; (
-        token = this.ts.nextT();
+        token = this.ts.nextTok();
         //assert token.getType() == Token.NAME;
         
         symbol = token.data;