X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FSymbolSet.js;h=5843a946d5fe56a337a2f3425505b5bdfcbb75f8;hb=47d710e1ad8352be849a59e4728f421627e568a6;hp=67330449afbaffae350772c78d59ead36e128bff;hpb=0197f32aa27e2315c39b6da11d50d63be66f0a7c;p=gnome.introspection-doc-generator diff --git a/JSDOC/SymbolSet.js b/JSDOC/SymbolSet.js index 6733044..5843a94 100644 --- a/JSDOC/SymbolSet.js +++ b/JSDOC/SymbolSet.js @@ -42,6 +42,7 @@ SymbolSet = XObject.define( 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 + "."); } @@ -64,12 +65,12 @@ SymbolSet = XObject.define( /** * for serializing */ - toObject : function() { - var ret = {} - for (var p in this._index) { - ret[p] = this._index[p].toObject(); - } - return ret; + toJSON : function() { + return { + '*object' : 'SymbolSet', + _index : this._index + }; + }, @@ -98,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;