JSDOC/Walker2.js
[gnome.introspection-doc-generator] / JSDOC / Walker2.js
index 6f51a69..57cfea3 100644 (file)
@@ -170,11 +170,11 @@ Walker2 = XObject.define(
                         // add it to the current scope????
                         
                         this.addSymbol('', true);
-                        print ( "Unconsumed Doc: " + token.toString())
+                        //print ( "Unconsumed Doc: " + token.toString())
                         //throw "Unconsumed Doc (TOKwhitespace): " + this.currentDoc.toSource();
                     }
                     
-                    print ( "NEW COMMENT: " + token.toString())
+                   // print ( "NEW COMMENT: " + token.toString())
                     var newDoc = new DocComment(token.data);
                     
                     // it's a scope changer..
@@ -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,7 +450,7 @@ Walker2 = XObject.define(
                             false,
                             atype);
                         
-                        
+                        this.currentDoc = false;
                         
                         
                     }
@@ -741,6 +741,7 @@ Walker2 = XObject.define(
         addSymbol: function(lastIdent, appendIt, atype )
         {
             //print("Walker.addSymbol : " + lastIdent);
+            //print("Walker.curdoc: " + JSON.stringify(this.currentDoc, null,4));
             
             /*if (!this.currentDoc.tags.length) {
                 
@@ -789,8 +790,12 @@ Walker2 = XObject.define(
                 }
                 s.push(lastIdent);
                 
+                //print("FULLSCOPE: " + JSON.stringify(s));
+                
+                
                 var s = s.join('|').split('|');
-               //print("Walker:ADDSymbol: " + s.join('|') );
+                //print("FULLSCOPE: " + s);
+               print("Walker:ADDSymbol: " + s.join('|') );
                 var _t = '';
                  _s = '';
                 
@@ -807,13 +812,14 @@ Walker2 = XObject.define(
                     if (s[i].substring(0,6) == '$this$') {
                         var ts = s[i].split('=');
                         _t = ts[1];
+                        _s = ''; // ??? VERY QUESTIONABLE!!!
                         continue;
                     }
                     // when to use $this$ (probabl for events)
                     _s += _s.length ? '.' : '';
                     _s += s[i];
                 }
-                    
+                print("FULLSCOPE: s , t : " + _s +', ' + _t);
                 
                 /// calc scope!!
                 //print("ADDING SYMBOL: "+ s.join('|') +"\n"+ _s + "\n" +Script.prettyDump(this.currentDoc.toSource()));