JSDOC/Walker2.js

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

diff --git a/JSDOC/Walker2.js b/JSDOC/Walker2.js
index 7e97ce8..5411d6e 100644 (file)
--- a/JSDOC/Walker2.js
+++ b/JSDOC/Walker2.js
@@ -159,10 +159,11 @@ Walker2 = XObject.define(
                 //print("TOK"+ token.toString());
                 //  this.timerPrint("parseScope AFTER lookT: " + token.toString()); 
                   
-                if (token.is('WHIT')) {
+                if (token.is('COMM')) {
                       
                  
                     if (token.name != 'JSDOC') {
+                        //print("Walker2 : spce is not JSDOC");
                         continue; //skip.
                     }
                     if (this.currentDoc) {
@@ -178,7 +179,7 @@ Walker2 = XObject.define(
                     
                     // it's a scope changer..
                     if (newDoc.getTag("scope").length) {
-                        //print(newDoc.getTag("scope").toSource());
+                        //print("Walker2 : doctag changes scope");
                         //throw "done";
                         scope.ident = '$private$|' + newDoc.getTag("scope")[0].desc;
                         continue;
@@ -188,6 +189,7 @@ Walker2 = XObject.define(
                     if (newDoc.getTag("scopeAlias").length) {
                         //print(newDoc.getTag("scopeAlias").toSource());
                         // @scopeAlias a=b
+                        //print("Walker2 : doctag changes scope (alias)");
                         var sal = newDoc.getTag("scopeAlias")[0].desc.split("=");
                         aliases[sal[0]] = sal[1];
                         
@@ -197,6 +199,7 @@ Walker2 = XObject.define(
                     
                     /// got a  doc comment..
                     //token.data might be this.??? (not sure though)
+                    //print("Walker2 : setting currentDoc");
                     this.currentDoc = newDoc;
                     continue;
                 }
@@ -208,8 +211,8 @@ Walker2 = XObject.define(
                 // things that stop comments carrying on...??
                 
                 if (this.currentDoc && (
-                        token.tokN.data == ';' || 
-                        token.tokN.data == '}')) {
+                        token.data == ';' || 
+                        token.data == '}')) {
                     this.addSymbol('', true);
                     //throw "Unconsumed Doc ("+ token.toString() +"): " + this.currentDoc.toSource();
                 }
@@ -457,7 +460,7 @@ Walker2 = XObject.define(
                         //print("ADD SYM:" + atype + ":" + token.toString() + this.ts.lookTok(1).toString() + this.ts.lookTok(2).toString());
                         
                         this.addSymbol(
-                            this.ts.lookTok(-1).tokN == Script.TOKdot ? token.data :    fixAlias(token.data),
+                            this.ts.lookTok(-1).data == '.' ? token.data :    fixAlias(token.data),
                             false,
                             atype);
                         
@@ -737,7 +740,7 @@ Walker2 = XObject.define(
          
         addSymbol: function(lastIdent, appendIt, atype )
         {
-            print("addSymbol : " + lastIndent);
+            print("addSymbol : " + lastIdent);
             /*if (!this.currentDoc.tags.length) {