X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FWalker2.js;h=27f09844ceee88ec81006014df63888c9873da08;hb=af0a1ddee2c17e71f1eaf457663ea814a88266d7;hp=a94c3dc62247e1ffe4d59c2b2db07748bfa0e625;hpb=3dd8b3f742c2e4d8b0ae6fa81fc98121525bf9fe;p=gnome.introspection-doc-generator

diff --git a/JSDOC/Walker2.js b/JSDOC/Walker2.js
index a94c3dc..27f0984 100644
--- a/JSDOC/Walker2.js
+++ b/JSDOC/Walker2.js
@@ -4,7 +4,7 @@ XObject      = imports.XObject.XObject;
 Scope        = imports.Scope.Scope;
 DocComment   = imports.DocComment.DocComment;
 Symbol       = imports.Symbol.Symbol;
-Parser       = imports.Parser.Parser;
+
 
 /**
 * Scope stuff
@@ -156,7 +156,7 @@ Walker2 = XObject.define(
             //print(JSON.stringify(this.ts, null, 4)); Seed.quit();
             
             while (null != (token = this.ts.next())) {
-                //print("TOK"+ token.toString());
+                print("TOK"+ token.toString());
                 //  this.timerPrint("parseScope AFTER lookT: " + token.toString()); 
                   
                 if (token.is('COMM')) {
@@ -740,7 +740,8 @@ Walker2 = XObject.define(
          
         addSymbol: function(lastIdent, appendIt, atype )
         {
-            print("addSymbol : " + lastIdent);
+            print("Walker.addSymbol : " + lastIdent);
+            
             /*if (!this.currentDoc.tags.length) {
                 
               
@@ -816,7 +817,7 @@ Walker2 = XObject.define(
                 
                 /// calc scope!!
                 //print("ADDING SYMBOL: "+ s.join('|') +"\n"+ _s + "\n" +Script.prettyDump(this.currentDoc.toSource()));
-                
+                print("Walker.addsymbol - add : " + _s);
                 if (appendIt && !lastIdent.length) {
                     
                     // append, and no symbol???
@@ -825,6 +826,7 @@ Walker2 = XObject.define(
                     if (this.currentDoc.getTag('class').length) {
                         _s = this.currentDoc.getTag('class')[0].desc;
                         var symbol = new Symbol(_s, [], "CONSTRUCTOR", this.currentDoc);
+                        Parser       = imports.Parser.Parser;
                         Parser.addSymbol(symbol);
                         this.symbols[_s] = symbol;
                         return;
@@ -850,22 +852,30 @@ Walker2 = XObject.define(
                     return;
                 }
             }    
+            print("Walker.addsymbol - chkdup: " + _s);
             if (typeof(this.symbols[_s]) != 'undefined') {
                 
                 if (this.symbols[_s].comment.hasTags) {
                     // then existing comment doesnt has tags 
-                     throw "DUPLICATE Symbol " + _s;
+                    throw {
+                        name: "ArgumentError", 
+                        message:"DUPLICATE Symbol " + _s
+                    };
+                     
                 }
                 // otherwise existing comment has tags - overwrite..
                 
                 
             }
+            print("Walker.addsymbol - ATYPE: " + _s);
+
             if (typeof(atype) == "undefined") {
                 atype = 'OBJECT'; //this.currentDoc.getTag('class').length ? 'OBJECT' : 'FUNCTION';;
                }
             
+            print("Walker.addsymbol - add : ");
             var symbol = new Symbol(_s, [], atype, this.currentDoc);
-            
+            Parser       = imports.Parser.Parser;
             Parser.addSymbol(symbol);
             this.symbols[_s] = symbol;