JSDOC/TokenReader.js

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

diff --git a/JSDOC/Walker2.js b/JSDOC/Walker2.js
index 48396db..05dae01 100644 (file)
--- a/JSDOC/Walker2.js
+++ b/JSDOC/Walker2.js
@@ -225,7 +225,7 @@ Walker2 = XObject.define(
                  if (token.name == 'VAR' &&
                  
                         this.ts.lookTok(1).type == 'NAME' &&
-                        this.ts.lookTok(2).data == '-' &&
+                        this.ts.lookTok(2).data == '=' &&
                         this.ts.lookTok(3).type == 'NAME'  &&
                         this.ts.lookTok(4).data == ';'  
                         
@@ -238,7 +238,10 @@ Walker2 = XObject.define(
                 
                 }
                 
-                
+                if ((token.data == 'eval') || /\.eval$/.test(token.data)) {
+                    this.currentDoc = false;
+                    continue;
+                }
               
                 // extends scoping  *** not sure if the can be x = Roo.apply(....)
                 // xxx.extends(a,b, {
@@ -423,11 +426,8 @@ Walker2 = XObject.define(
                     
                     
                     // eval can be prefixed with a hint hider for the compresser..
-                    if ((token.data == 'eval') || /\.eval$/.test(token.data)) {
-                        this.currentDoc = false;
-                        continue;
-                    }
-                    /*
+                    
+                    
                     if (this.currentDoc) {
                         //print(token.toString());
                         
@@ -438,8 +438,8 @@ Walker2 = XObject.define(
                         if (((this.ts.lookTok(1).data == ':' )|| (this.ts.lookTok(1).data == '=')) &&
                             (this.ts.lookTok(2).name == "FUNCTION")
                             ) {
-                                this.ts.nextTok();
-                                this.ts.nextTok();
+                               // this.ts.nextTok();
+                               // this.ts.nextTok();
                                 atype = 'FUNCTION';
                         }
                         
@@ -450,11 +450,11 @@ Walker2 = XObject.define(
                             false,
                             atype);
                         
-                        
+                        this.currentDoc = false;
                         
                         
                     }
-                    */
+                 
                     
                     continue; // dont care about other idents..
                     
@@ -477,16 +477,16 @@ Walker2 = XObject.define(
                     //print("GOT FUNCTION");
                     // see if we have an unconsumed doc...
                     
-                    //if (this.currentDoc) {
-                     //       throw {
-                     //           name: "ArgumentError", 
-                     //           message: "Unhandled doc (TOKfunction)" + token.toString()
-                     //       };
-                     //       
+                    if (this.currentDoc) {
+                            throw {
+                                name: "ArgumentError", 
+                                message: "Unhandled doc (TOKfunction)" + token.toString()
+                            };
+                            
                             //this.addSymbol(this.currentDoc.getTag('class')[0].name, true);
 
                             //throw "Unconsumed Doc: (TOKrbrace)" + this.currentDoc.toSource();
-                    //}
+                    }
                     
                      
                      
@@ -534,7 +534,7 @@ Walker2 = XObject.define(
                             (this.ts.lookTok(-3).type = 'FUNCTION')
                         ) {
                         //scopeName = this.ts.look(-3).data;
-                        this.ts.balanceN(Script.TOKlparen);
+                        this.ts.balance("(");
                         token = this.ts.nextTok(); // should be {
                             scopeName = fixAlias(scopeName);
                         var fnScope = new Scope(this.braceNesting, scope, token.n, '$private$');
@@ -656,17 +656,23 @@ Walker2 = XObject.define(
                     if (
                             (this.ts.lookTok(-1).data == '=') &&
                             (this.ts.lookTok(-2).type == 'NAME') &&
-                            (this.ts.lookTok(-3).nane != 'VAR')  
+                            (this.ts.lookTok(-3).name != 'VAR')  
                         ) {
                             
                             scopeName = this.ts.look(-2).data;
+                            //print(scopeName);
                             scopeName = fixAlias(scopeName);
+                            
+                            //print(this.scopes.length);
                             var fnScope = new Scope(this.braceNesting, scope, token.n, 
                                 '$this$='+scopeName + '|'+scopeName
                             );
+                            
                             this.indexedScopes[this.ts.cursor] = fnScope;
                             scope = fnScope;
+                            // push the same scope onto the stack..
                             this.scopesIn(fnScope);
+                            //this.scopesIn(this.scopes[this.scopes.length-1]);
                             
                               
                             locBraceNest++;
@@ -704,7 +710,7 @@ Walker2 = XObject.define(
                     continue;
                     
                 }
-                if (token.data == '{') {
+                if (token.data == '}') {
                     
                      
                         if (this.currentDoc) {
@@ -740,8 +746,8 @@ Walker2 = XObject.define(
          
         addSymbol: function(lastIdent, appendIt, atype )
         {
-            print("Walker.addSymbol : " + lastIdent);
-            print("Walker.curdoc: " + JSON.stringify(this.currentDoc, null,4));
+            //print("Walker.addSymbol : " + lastIdent);
+           // print("Walker.curdoc: " + JSON.stringify(this.currentDoc, null,4));
             
             /*if (!this.currentDoc.tags.length) {
                 
@@ -795,7 +801,7 @@ Walker2 = XObject.define(
                 
                 var s = s.join('|').split('|');
                 //print("FULLSCOPE: " + s);
-               //print("Walker:ADDSymbol: " + s.join('|') );
+             //  print("Walker:ADDSymbol: " + s.join('|') );
                 var _t = '';
                  _s = '';
                 
@@ -848,12 +854,13 @@ Walker2 = XObject.define(
                         //print("Symbol:" + _s);
                     //print(this.currentDoc.src);
                         
-                        throw {
-                            name: "ArgumentError", 
-                            message: "Trying to append symbol '" + _s + "', but no doc available\n" +
-                                this.ts.lookTok(0).toString()
-                        };
-
+                        //throw {
+                        //    name: "ArgumentError", 
+                        //    message: "Trying to append symbol '" + _s + "', but no doc available\n" +
+                        //        this.ts.lookTok(0).toString()
+                        //};
+                        this.currentDoc = false;
+                        return;
                      
                     }