JSDOC/Walker2.js
[gnome.introspection-doc-generator] / JSDOC / Walker2.js
index 1a94ae7..48396db 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..
@@ -427,7 +427,7 @@ Walker2 = XObject.define(
                         this.currentDoc = false;
                         continue;
                     }
-                    
+                    /*
                     if (this.currentDoc) {
                         //print(token.toString());
                         
@@ -454,7 +454,7 @@ Walker2 = XObject.define(
                         
                         
                     }
-                 
+                    */
                     
                     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();
-                    }
+                    //}
                     
                      
                      
@@ -790,7 +790,11 @@ Walker2 = XObject.define(
                 }
                 s.push(lastIdent);
                 
+                //print("FULLSCOPE: " + JSON.stringify(s));
+                
+                
                 var s = s.join('|').split('|');
+                //print("FULLSCOPE: " + s);
                //print("Walker:ADDSymbol: " + s.join('|') );
                 var _t = '';
                  _s = '';
@@ -808,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()));