X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FSymbolSet.js;h=5843a946d5fe56a337a2f3425505b5bdfcbb75f8;hp=753a2ac657ed3d3f16d760ba71d31f9858436482;hb=47d710e1ad8352be849a59e4728f421627e568a6;hpb=43fae08258b804236ece204f31b289d02f41a2f4 diff --git a/JSDOC/SymbolSet.js b/JSDOC/SymbolSet.js index 753a2ac..5843a94 100644 --- a/JSDOC/SymbolSet.js +++ b/JSDOC/SymbolSet.js @@ -17,11 +17,15 @@ SymbolSet = XObject.define( Object, { + _index : false, + + init : function() { this._index = {}; }, - keys : function() { + keys : function() + { var found = []; for (var p in this._index) { found.push(p); @@ -31,12 +35,14 @@ SymbolSet = XObject.define( hasSymbol : function(alias) { - return this.keys().indexOf(alias) > -1; + return typeof(this._index[alias]) != 'undefined'; + //return this.keys().indexOf(alias) > -1; }, addSymbol : function(symbol) { //print("ADDING SYMBOL:"+symbol.alias.toString()); + if (this.hasSymbol(symbol.alias)) { imports.BuildDocs.Options.LOG.warn("Overwriting symbol documentation for: "+symbol.alias + "."); } @@ -56,6 +62,17 @@ SymbolSet = XObject.define( } return found; }, + /** + * for serializing + */ + toJSON : function() { + return { + '*object' : 'SymbolSet', + _index : this._index + }; + + }, + deleteSymbol : function(alias) { if (!this.hasSymbol(alias)) return; @@ -82,6 +99,9 @@ SymbolSet = XObject.define( resolveBorrows : function() { for (p in this._index) { var symbol = this._index[p]; + + + if (symbol.is("FILE") || symbol.is("GLOBAL")) continue; var borrows = symbol.inherits; @@ -229,10 +249,10 @@ SymbolSet = XObject.define( if (contributer) { contributer.childClasses.push(symbol.alias); symbol.inheritsFrom.push(contributer.alias); - if (!isUnique(symbol.inheritsFrom)) { - imports.BuildDocs.Options.LOG.warn("Can't resolve augments: Circular reference: "+symbol.alias+" inherits from "+contributer.alias+" more than once."); - } - else { + //if (!isUnique(symbol.inheritsFrom)) { + // 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; var cproperties = contributer.properties; var cfgs = contributer.cfgs; @@ -247,7 +267,7 @@ SymbolSet = XObject.define( } - } + //} } else { @@ -306,6 +326,7 @@ SymbolSet = XObject.define( //while(addAugments(symbol.augments) > 0) { } } + }) SymbolSet.isBuiltin = function(name) {