SymbolSet.js in distil-0.10.0

- old
+ new

@@ -14,12 +14,13 @@
 JSDOC.SymbolSet.prototype.hasSymbol = function(alias) {
 	return this._index.hasKey(alias);
 }
 
 JSDOC.SymbolSet.prototype.addSymbol = function(symbol) {
-	if (this.hasSymbol(symbol.alias)) {
+	if (JSDOC.opt.a && this.hasSymbol(symbol.alias)) {
 		LOG.warn("Overwriting symbol documentation for: "+symbol.alias + ".");
+		this.deleteSymbol(symbol.alias);
 	}
 	this._index.set(symbol.alias, symbol);
 }
 
 JSDOC.SymbolSet.prototype.getSymbol = function(alias) {
@@ -109,15 +110,15 @@
 }
 
 JSDOC.SymbolSet.prototype.resolveMemberOf = function() {
 	for (var p = this._index.first(); p; p = this._index.next()) {
 		var symbol = p.value;
+
 		if (symbol.is("FILE") || symbol.is("GLOBAL")) continue;
 		
 		// the memberOf value was provided in the @memberOf tag
 		else if (symbol.memberOf) {
-			
 			// like foo.bar is a memberOf foo
 			if (symbol.alias.indexOf(symbol.memberOf) == 0) {
 				var memberMatch = new RegExp("^("+symbol.memberOf+")[.#-]?(.+)$");
 				var aliasParts = symbol.alias.match(memberMatch);
 				
@@ -140,9 +141,10 @@
 			}
 		}
 		// the memberOf must be calculated
 		else {
 			var parts = symbol.alias.match(/^(.*[.#-])([^.#-]+)$/);
+
 			if (parts) {
 				symbol.memberOf = parts[1];
 				symbol.name = parts[2];				
 			}
 		}