X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FSymbolSet.js;h=fcefaa1b086d9b2fc844d8320a055af7cbeed9f4;hp=bb753c8149acebe1c5cdf62e1abab4a02a9a0720;hb=91d8e808dcf2b78cbad15149ee0e99775e51556f;hpb=c499d12e35a8e3d9cac968b2476fdaf241df5df1

diff --git a/JSDOC/SymbolSet.js b/JSDOC/SymbolSet.js
index bb753c8..fcefaa1 100644
--- a/JSDOC/SymbolSet.js
+++ b/JSDOC/SymbolSet.js
@@ -2,10 +2,10 @@
 
  
 XObject         = imports.XObject.XObject;
-Options         = imports.Options.Options;
-Parser
-Symbol
-DocComment
+///Options         = imports.BuildDocs.Options;
+//Parser          = imports.Parser.Parser;
+Symbol          = imports.Symbol.Symbol;
+DocComment      = imports.DocComment.DocComment;
 
 
 SymbolSet = XObject.define(
@@ -17,7 +17,7 @@ SymbolSet = XObject.define(
         
         init : function() {
             this._index = {};
-        }
+        },
 
         keys : function() {
             var found = [];
@@ -25,27 +25,27 @@ SymbolSet = XObject.define(
                 found.push(p);
             }
             return found;
-        }
+        },
 
 
         hasSymbol : function(alias) {
             return this.keys().indexOf(alias) > -1;
-        }
+        },
 
         addSymbol : function(symbol) {
-            println("ADDING SYMBOL:"+symbol.alias.toString());
+            //print("ADDING SYMBOL:"+symbol.alias.toString());
             
             if (this.hasSymbol(symbol.alias)) {
-                Options.LOG.warn("Overwriting symbol documentation for: "+symbol.alias + ".");
+                imports.BuildDocs.Options.LOG.warn("Overwriting symbol documentation for: "+symbol.alias + ".");
             }
             this._index[symbol.alias] = symbol;
-        }
+        },
 
         getSymbol : function(alias) {
             
             if (this.hasSymbol(alias)) return this._index[alias];
             return false;
-        }
+        },
 
         toArray : function() {
             var found = [];
@@ -53,12 +53,12 @@ SymbolSet = XObject.define(
                 found.push(this._index[p]);
             }
             return found;
-        }
+        },
 
         deleteSymbol : function(alias) {
             if (!this.hasSymbol(alias)) return;
             delete this._index[alias];
-        }
+        },
 
         renameSymbol : function(oldName, newName) {
             // todo: should check if oldname or newname already exist
@@ -69,13 +69,13 @@ SymbolSet = XObject.define(
             this.deleteSymbol(oldName);
             this._index[newName].alias = newName;
             return newName;
-        }
+        },
 
         relate : function() {
             this.resolveBorrows();
             this.resolveMemberOf();
             this.resolveAugments();
-        }
+        },
 
         resolveBorrows : function() {
             for (p in this._index) {
@@ -86,14 +86,14 @@ SymbolSet = XObject.define(
                 for (var i = 0; i < borrows.length; i++) {
                     var borrowed = this.getSymbol(borrows[i].alias);
                     if (!borrowed) {
-                        Options.LOG.warn("Can't borrow undocumented "+borrows[i].alias+".");
+                        imports.BuildDocs.Options.LOG.warn("Can't borrow undocumented "+borrows[i].alias+".");
                         continue;
                     }
                     
                     var borrowAsName = borrows[i].as;
                     var borrowAsAlias = borrowAsName;
                     if (!borrowAsName) {
-                        Options.LOG.warn("Malformed @borrow, 'as' is required.");
+                        imports.BuildDocs.Options.LOG.warn("Malformed @borrow, 'as' is required.");
                         continue;
                     }
                     
@@ -116,7 +116,7 @@ SymbolSet = XObject.define(
                     this.addSymbol(clone);
                 }
             }
-        }
+        },
 
         resolveMemberOf : function() {
             for (var p in this._index) {
@@ -180,22 +180,22 @@ SymbolSet = XObject.define(
                 if (symbol.memberOf.match(/[.#-]$/)) {
                     symbol.memberOf = symbol.memberOf.substr(0, symbol.memberOf.length-1);
                 }
-                //println("looking for memberOf: " + symbol.memberOf + " FOR " + symbol.alias);
+                //print("looking for memberOf: " + symbol.memberOf + " FOR " + symbol.alias);
                 // add to parent's methods or properties list
                 if (symbol.memberOf) {
                     var container = this.getSymbol(symbol.memberOf);
                     if (!container) {
                         if (SymbolSet.isBuiltin(symbol.memberOf)) {
-                            container = Parser.addBuiltin(symbol.memberOf);
+                            container = imports.Parser.Parser.addBuiltin(symbol.memberOf);
                         }
                         else {
-                           // println("symbol NOT a BUILT IN - createing a container");
+                           // print("symbol NOT a BUILT IN - createing a container");
                             // Eg. Ext.y.z (missing y)
                             // we need to add in the missing symbol...
                             container = new Symbol(symbol.memberOf, [], "OBJECT", new DocComment(""));
                             container.isNamespace = true;
                             this.addSymbol( container );
-                           // println(container.toSource());
+                           // print(container.toSource());
                             //container = this.getSymbol(symbol.memberOf);
                             // fake container ... so dont ad symbols to it..
                             continue;
@@ -209,7 +209,7 @@ SymbolSet = XObject.define(
                     if (container && !container.isNamespace) container.addMember(symbol);
                 }
             }
-        }
+        },
 
         resolveAugments : function() {
             // does this sort out multiple extends???
@@ -228,7 +228,7 @@ SymbolSet = XObject.define(
                         contributer.childClasses.push(symbol.alias);
                         symbol.inheritsFrom.push(contributer.alias);
                         if (!isUnique(symbol.inheritsFrom)) {
-                            Options.LOG.warn("Can't resolve augments: Circular reference: "+symbol.alias+" inherits from "+contributer.alias+" more than once.");
+                            imports.BuildDocs.Options.LOG.warn("Can't resolve augments: Circular reference: "+symbol.alias+" inherits from "+contributer.alias+" more than once.");
                         }
                         else {
                             var cmethods = contributer.methods;
@@ -249,7 +249,7 @@ SymbolSet = XObject.define(
                     }
                     else {
                         
-                        Options.LOG.warn("Can't augment contributer: '"+augments[ii]+"', not found. FOR: " + symbol.alias);
+                        imports.BuildDocs.Options.LOG.warn("Can't augment contributer: '"+augments[ii]+"', not found. FOR: " + symbol.alias);
                         
                         //LOG.warn("We only have the following symbols: \n" + 
                           //      this.keys().toSource().split(",").join(",    \n"));
@@ -257,7 +257,7 @@ SymbolSet = XObject.define(
 
                 }
             }
-        }
+        },
 
         buildAugmentsList : function(symbol)
         {
@@ -268,15 +268,15 @@ SymbolSet = XObject.define(
             }
             
             var _t = this;
-            println("buildAugmentsList:" + symbol.alias);
+            print("buildAugmentsList:" + symbol.alias);
             var addAugments = function (alist, forceit) { // returns number added..
                 if (!alist.length) {
                     return 0;
                 }
-                println("buildAugmentsList:addAugments" + alist.length);
+                print("buildAugmentsList:addAugments" + alist.length);
                 var rval = 0;
                 for(var ii = 0; ii < alist.length; ii++) {
-                    println("getAlias:" + alist[ii]);
+                    print("getAlias:" + alist[ii]);
                     if (alist[ii] == symbol.alias) {
                         continue;
                     }
@@ -297,7 +297,7 @@ SymbolSet = XObject.define(
                     
                     rval++;
                 }
-                println("buildAugmentsList: ADDED:" + rval);
+                print("buildAugmentsList: ADDED:" + rval);
                 return rval;
             }
             addAugments(symbol.augments, true);