Fix private member name mangling.

frog/minfrog

 #!/usr/bin/env node
 //  ********** Library dart:core **************
 //  ********** Natives dart:core **************
 function $defProp(obj, prop, value) {
   Object.defineProperty(obj, prop,
       {value: value, enumerable: false, writable: true, configurable: true});
 }
 Function.prototype.bind = Function.prototype.bind ||
   function(thisObj) {
     var func = this;
@@ skipping 5555 matching lines @@
   else {
     return $globals.world._members.$index(name);
   }
 }
 Library.prototype._addMember = function(member) {
   if (member.get$isPrivate()) {
     if (member.get$isStatic()) {
       if (member.declaringType.get$isTop()) {
         $globals.world._addTopName(member);
       }
-      return;
-    }
-    var mset = this._privateMembers.$index(member.name);
-    if ($eq$(mset)) {
-      var $$list = $globals.world.libraries.getValues();
-      for (var $$i = $$list.iterator(); $$i.hasNext(); ) {
-        var lib = $$i.next();
-        if (lib.get$_privateMembers().containsKey(member.get$jsname())) {
-          member._jsname = ("_" + this.get$jsname() + member.get$jsname());
-          break;
-        }
-      }
-      mset = new MemberSet(member, true);
-      this._privateMembers.$setindex(member.name, mset);
     }
     else {
-      mset.get$members().add(member);
+      var members = this._privateMembers.$index(member.name);
+      if ($eq$(members)) {
+        members = new MemberSet(member, true);
+        this._privateMembers.$setindex(member.name, members);
+      }
+      else {
+        members.add(member);
+      }
+      this._makePrivateMembersUnique(member, members);
     }
   }
   else {
     $globals.world._addMember(member);
   }
 }
+Library.prototype._makePrivateMembersUnique = function(member, members) {
+  if (members.jsnameUnique) {
+    member._jsname = members.jsname;
+    return;
+  }
+  var name = members.name;
+  var $$list = $globals.world.libraries.getValues();
+  for (var $$i = $$list.iterator(); $$i.hasNext(); ) {
+    var lib = $$i.next();
+    if ((null == lib ? null != (this) : lib !== this) && lib.get$_privateMembers().containsKey(name)) {
+      var uniqueName = ("_" + this.get$jsname() + members.jsname);
+      members.jsname = uniqueName;
+      members.jsnameUnique = true;
+      members.members.forEach((function (uniqueName, each) {
+        each.set$_jsname(uniqueName);
+      }).bind(null, uniqueName)
+      );
+      return;
+    }
+  }
+}
 Library.prototype.getOrAddFunctionType = function(enclosingElement, name, func, data) {
   var def = new FunctionTypeDefinition(func, null, func.span);
   var type = new DefinedType(name, this, def, false);
   type.addMethod(":call", func);
   var m = type.get$members().$index(":call");
   m.set$enclosingElement(enclosingElement);
   m.resolve();
   m.set$_methodData(data);
   type.set$interfaces([$globals.world.functionType]);
   return type;
@@ skipping 1277 matching lines @@
   return this.factories.getValues().every((function (constructors) {
     return constructors.isEmpty();
   })
   );
 }
 // ********** Code for MemberSet **************
 function MemberSet(member, isVar) {
   this.jsname = member.get$jsname();
   this.name = member.name;
   this._preparedForSet = false;
+  this.jsnameUnique = false;
   this.isVar = isVar;
   this.members = [member];
 }
 MemberSet.prototype.get$name = function() { return this.name; };
 MemberSet.prototype.get$members = function() { return this.members; };
+MemberSet.prototype.get$isVar = function() { return this.isVar; };
 MemberSet.prototype.get$jsname = function() { return this.jsname; };
-MemberSet.prototype.get$isVar = function() { return this.isVar; };
 MemberSet.prototype.toString = function() {
   return ("" + this.name + ":" + this.members.get$length());
 }
 MemberSet.prototype.add = function(member) {
   this.members.add(member);
 }
 MemberSet.prototype.get$isOperator = function() {
   return this.members.$index((0)).get$isOperator();
 }
 MemberSet.prototype.get$treatAsField = function() {
@@ skipping 7354 matching lines @@
 World.prototype.analyzeCode = function(lib) {
   this.gen = new WorldGenerator(this.findMainMethod(lib), new CodeWriter());
   this.gen.analyze();
 }
 World.prototype.generateCode = function(lib) {
   this.gen.run();
   this.frogCode = this.gen.writer.get$text();
   this.jsBytesWritten = this.frogCode.length;
   this.gen = null;
 }
-World.prototype._message = function(color, prefix, message, span, span1, span2, throwing) {
+World.prototype._lang_message = function(color, prefix, message, span, span1, span2, throwing) {
   if (this.messageHandler != null) {
     this.messageHandler(prefix, message, span);
     if (span1 != null) {
       this.messageHandler(prefix, message, span1);
     }
     if (span2 != null) {
       this.messageHandler(prefix, message, span2);
     }
   }
   else {
     var messageWithPrefix = $globals.options.useColors ? ($add$($add$($add$(color, prefix), $globals._NO_COLOR), message)) : ($add$(prefix, message));
     var text = messageWithPrefix;
     if (span != null) {
       text = span.toMessageString(messageWithPrefix);
     }
     print$(text);
     if (span1 != null) {
       print$(span1.toMessageString(messageWithPrefix));
     }
     if (span2 != null) {
       print$(span2.toMessageString(messageWithPrefix));
     }
   }
   if (throwing) {
     $throw(new CompilerException($add$(prefix, message), span));
   }
 }
 World.prototype.error = function(message, span, span1, span2) {
   this.errors++;
-  this._message($globals._RED_COLOR, "error: ", message, span, span1, span2, $globals.options.throwOnErrors);
+  this._lang_message($globals._RED_COLOR, "error: ", message, span, span1, span2, $globals.options.throwOnErrors);
 }
 World.prototype.warning = function(message, span, span1, span2) {
   if ($globals.options.warningsAsErrors) {
     this.error(message, span, span1, span2);
     return;
   }
   this.warnings++;
   if ($globals.options.showWarnings) {
-    this._message($globals._MAGENTA_COLOR, "warning: ", message, span, span1, span2, $globals.options.throwOnWarnings);
+    this._lang_message($globals._MAGENTA_COLOR, "warning: ", message, span, span1, span2, $globals.options.throwOnWarnings);
   }
 }
 World.prototype.fatal = function(message, span, span1, span2) {
   this.errors++;
   this.seenFatal = true;
-  this._message($globals._RED_COLOR, "fatal: ", message, span, span1, span2, $globals.options.throwOnFatal || $globals.options.throwOnErrors);
+  this._lang_message($globals._RED_COLOR, "fatal: ", message, span, span1, span2, $globals.options.throwOnFatal || $globals.options.throwOnErrors);
 }
 World.prototype.internalError = function(message, span, span1, span2) {
-  this._message($globals._NO_COLOR, "We are sorry, but...", message, span, span1, span2, true);
+  this._lang_message($globals._NO_COLOR, "We are sorry, but...", message, span, span1, span2, true);
 }
 World.prototype.info = function(message, span, span1, span2) {
   if ($globals.options.showInfo) {
-    this._message($globals._GREEN_COLOR, "info: ", message, span, span1, span2, false);
+    this._lang_message($globals._GREEN_COLOR, "info: ", message, span, span1, span2, false);
   }
 }
 World.prototype.withoutForceDynamic = function(fn) {
   var oldForceDynamic = $globals.options.forceDynamic;
   $globals.options.forceDynamic = false;
   try {
     return fn();
   } finally {
     $globals.options.forceDynamic = oldForceDynamic;
   }
@@ skipping 533 matching lines @@
 var const$0002 = Object.create(EmptyQueueException.prototype, {});
 var const$0006 = Object.create(IllegalAccessException.prototype, {});
 var const$0007 = ImmutableList.ImmutableList$from$factory([]);
 var const$0009 = new JSSyntaxRegExp("^[a-zA-Z]:/");
 var const$0010 = ImmutableList.ImmutableList$from$factory(["__PROTO__", "prototype", "constructor"]);
 var const$0011 = ImmutableList.ImmutableList$from$factory(["NaN", "Infinity", "undefined", "eval", "parseInt", "parseFloat", "isNan", "isFinite", "decodeURI", "decodeURIComponent", "encodeURI", "encodeURIComponent", "Object", "Function", "Array", "String", "Boolean", "Number", "Date", "RegExp", "Error", "EvalError", "RangeError", "ReferenceError", "SyntaxError", "TypeError", "URIError", "Math", "arguments", "escape", "unescape", "applicationCache", "closed", "Components", "content", "controllers", "crypto", "defaultStatus", "dialogArguments", "directories", "document", "frameElement", "frames", "fullScreen", "globalStorage", "history", "innerHeight", "innerWidth", "length", "location", "locationbar", "localStorage", "menubar", "mozInnerScreenX", "mozInnerScreenY", "mozScreenPixelsPerCssPixel", "name", "navigator", "opener", "outerHeight", "outerWidth", "pageXOffset", "pageYOffset", "parent", "personalbar", "pkcs11", "returnValue", "screen", "scrollbars", "scrollMaxX", "scrollMaxY", "self", "sessionStorage", "sidebar", "status", "statusbar", "toolbar", "top", "window", "alert", "addEventListener", "atob", "back", "blur", "btoa", "captureEvents", "clearInterval", "clearTimeout", "close", "confirm", "disableExternalCapture", "dispatchEvent", "dump", "enableExternalCapture", "escape", "find", "focus", "forward", "GeckoActiveXObject", "getAttention", "getAttentionWithCycleCount", "getComputedStyle", "getSelection", "home", "maximize", "minimize", "moveBy", "moveTo", "open", "openDialog", "postMessage", "print", "prompt", "QueryInterface", "releaseEvents", "removeEventListener", "resizeBy", "resizeTo", "restore", "routeEvent", "scroll", "scrollBy", "scrollByLines", "scrollByPages", "scrollTo", "setInterval", "setResizeable", "setTimeout", "showModalDialog", "sizeToContent", "stop", "uuescape", "updateCommands", "XPCNativeWrapper", "XPCSafeJSOjbectWrapper", "onabort", "onbeforeunload", "onchange", "onclick", "onclose", "oncontextmenu", "ondragdrop", "onerror", "onfocus", "onhashchange", "onkeydown", "onkeypress", "onkeyup", "onload", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onmozorientation", "onpaint", "onreset", "onresize", "onscroll", "onselect", "onsubmit", "onunload", "ontouchcancel", "ontouchend", "ontouchmove", "ontouchstart", "ongesturestart", "ongesturechange", "ongestureend", "uneval", "getPrototypeOf", "let", "yield", "abstract", "int", "short", "boolean", "interface", "static", "byte", "long", "char", "final", "native", "synchronized", "float", "package", "throws", "goto", "private", "transient", "implements", "protected", "volatile", "double", "public", "attachEvent", "clientInformation", "clipboardData", "createPopup", "dialogHeight", "dialogLeft", "dialogTop", "dialogWidth", "onafterprint", "onbeforedeactivate", "onbeforeprint", "oncontrolselect", "ondeactivate", "onhelp", "onresizeend", "event", "external", "Debug", "Enumerator", "Global", "Image", "ActiveXObject", "VBArray", "Components", "toString", "getClass", "constructor", "prototype", "valueOf", "Anchor", "Applet", "Attr", "Canvas", "CanvasGradient", "CanvasPattern", "CanvasRenderingContext2D", "CDATASection", "CharacterData", "Comment", "CSS2Properties", "CSSRule", "CSSStyleSheet", "Document", "DocumentFragment", "DocumentType", "DOMException", "DOMImplementation", "DOMParser", "Element", "Event", "ExternalInterface", "FlashPlayer", "Form", "Frame", "History", "HTMLCollection", "HTMLDocument", "HTMLElement", "IFrame", "Image", "Input", "JSObject", "KeyEvent", "Link", "Location", "MimeType", "MouseEvent", "Navigator", "Node", "NodeList", "Option", "Plugin", "ProcessingInstruction", "Range", "RangeException", "Screen", "Select", "Table", "TableCell", "TableRow", "TableSelection", "Text", "TextArea", "UIEvent", "Window", "XMLHttpRequest", "XMLSerializer", "XPathException", "XPathResult", "XSLTProcessor", "java", "Packages", "netscape", "sun", "JavaObject", "JavaClass", "JavaArray", "JavaMember", "$wnd", "$doc", "$entry", "$moduleName", "$moduleBase", "$gwt_version", "$sessionId", "$stack", "$stackDepth", "$location", "call"]);
 var const$0012 = ImmutableList.ImmutableList$from$factory(["break", "delete", "function", "return", "typeof", "case", "do", "if", "switch", "var", "catch", "else", "in", "this", "void", "continue", "false", "instanceof", "throw", "while", "debugger", "finally", "new", "true", "with", "default", "for", "null", "try", "abstract", "double", "goto", "native", "static", "boolean", "enum", "implements", "package", "super", "byte", "export", "import", "private", "synchronized", "char", "extends", "int", "protected", "throws", "class", "final", "interface", "public", "transient", "const", "float", "long", "short", "volatile"]);
 var $globals = {};
 $static_init();
 main();