X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FWalker2.js;h=e525fab3607b57b9cbf7f6889e4e5c3f61ab99da;hp=48396db1681facad73df1e4f0c1bcdea67119dab;hb=c8377bbd183de807c4b8924f660c7a09cf842312;hpb=fe422e05dc9495d445136cb86dd4a872267c5e56

diff --git a/JSDOC/Walker2.js b/JSDOC/Walker2.js
index 48396db..e525fab 100644
--- a/JSDOC/Walker2.js
+++ b/JSDOC/Walker2.js
@@ -427,7 +427,7 @@ Walker2 = XObject.define(
                         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$');
@@ -704,7 +704,7 @@ Walker2 = XObject.define(
                     continue;
                     
                 }
-                if (token.data == '{') {
+                if (token.data == '}') {
                     
                      
                         if (this.currentDoc) {
@@ -740,8 +740,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 +795,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 = '';