JSDOC/Walker2.js

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

diff --git a/JSDOC/Walker2.js b/JSDOC/Walker2.js
index b36685d..fd730b2 100644 (file)
--- a/JSDOC/Walker2.js
+++ b/JSDOC/Walker2.js
@@ -170,11 +170,11 @@ Walker2 = XObject.define(
                         // add it to the current scope????
                         
                         this.addSymbol('', true);
                         // add it to the current scope????
                         
                         this.addSymbol('', true);

-
+                        print ( "Unconsumed Doc: " + token.toString())

                         //throw "Unconsumed Doc (TOKwhitespace): " + this.currentDoc.toSource();
                     }
                     
                         //throw "Unconsumed Doc (TOKwhitespace): " + this.currentDoc.toSource();
                     }
                     

-                    
+                    print ( "NEW COMMENT: " + token.toString())

                     var newDoc = new DocComment(token.data);
                     
                     // it's a scope changer..
                     var newDoc = new DocComment(token.data);
                     
                     // it's a scope changer..


@@ -249,12 +249,8 @@ Walker2 = XObject.define(
                     // a  << scope
                 if (token.type == 'NAME') {
                     
                     // a  << scope
                 if (token.type == 'NAME') {
                     

-                    print("TOK(ident)"+ token.toString());
-                    
-                    
-                       
-                    
-                    
+                    //print("TOK(ident)"+ token.toString());
+                     

                     if (/\.extend$/.test(token.data) &&
                         this.ts.lookTok(1).data == '(' &&
                         this.ts.lookTok(2).type == 'NAME' &&
                     if (/\.extend$/.test(token.data) &&
                         this.ts.lookTok(1).data == '(' &&
                         this.ts.lookTok(2).type == 'NAME' &&


@@ -442,6 +438,8 @@ Walker2 = XObject.define(
                         if (((this.ts.lookTok(1).data == ':' )|| (this.ts.lookTok(1).data == '=')) &&
                             (this.ts.lookTok(2).name == "FUNCTION")
                             ) {
                         if (((this.ts.lookTok(1).data == ':' )|| (this.ts.lookTok(1).data == '=')) &&
                             (this.ts.lookTok(2).name == "FUNCTION")
                             ) {

+                                this.ts.nextTok();
+                                this.ts.nextTok();

                                 atype = 'FUNCTION';
                         }
                         
                                 atype = 'FUNCTION';
                         }
                         


@@ -452,6 +450,9 @@ Walker2 = XObject.define(
                             false,
                             atype);
                         
                             false,
                             atype);
                         

+                        
+                        
+                        

                     }
                  
                     
                     }
                  
                     


@@ -462,7 +463,7 @@ Walker2 = XObject.define(
                 //print ("NOT NAME");
                 
                 
                 //print ("NOT NAME");
                 
                 

-                if (token.type == "STRN")   {
+                if (token.type == "STRN")   { // THIS WILL NOT HAPPEN HERE?!!?

                     if (this.currentDoc) {
                         this.addSymbol(token.data.substring(1,token.data.length-1),false,'OBJECT');
 
                     if (this.currentDoc) {
                         this.addSymbol(token.data.substring(1,token.data.length-1),false,'OBJECT');
 


@@ -472,7 +473,7 @@ Walker2 = XObject.define(
                 // really we only have to deal with object constructs and function calls that change the scope...
                 
                 
                 // really we only have to deal with object constructs and function calls that change the scope...
                 
                 

-                 if (token.name == 'FUNCTION') {
+                if (token.name == 'FUNCTION') {

                     //print("GOT FUNCTION");
                     // see if we have an unconsumed doc...
                     
                     //print("GOT FUNCTION");
                     // see if we have an unconsumed doc...