Fix for http://code.google.com/p/dart/issues/detail?id=1363: use the simplename for the key, not ...

dart/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 $throw(e) {
   // If e is not a value, we can use V8's captureStackTrace utility method.
   // TODO(jmesserly): capture the stack trace on other JS engines.
@@ skipping 117 matching lines @@
     return (tmp < 0) ? Math.ceil(tmp) : Math.floor(tmp);
   } else {
     return x.$truncdiv(y);
   }
 }
 // ********** Code for Object **************
 $defProp(Object.prototype, "get$dynamic", function() {
   "use strict"; return this;
 });
 $defProp(Object.prototype, "noSuchMethod", function(name, args) {
-  $throw(new NoSuchMethodException(this, name, args, ""));
+  $throw(new NoSuchMethodException(this, name, args));
 });
 $defProp(Object.prototype, "_pushBlock$1", function($0) {
   return this.noSuchMethod("_pushBlock", [$0]);
 });
 $defProp(Object.prototype, "analyze$1", function($0) {
   return this.noSuchMethod("analyze", [$0]);
 });
 $defProp(Object.prototype, "contains$1", function($0) {
   return this.noSuchMethod("contains", [$0]);
 });
@@ skipping 76 matching lines @@
 IndexOutOfRangeException.prototype.toString$0 = IndexOutOfRangeException.prototype.toString;
 // ********** Code for IllegalAccessException **************
 function IllegalAccessException() {
 
 }
 IllegalAccessException.prototype.toString = function() {
   return "Attempt to modify an immutable object";
 }
 IllegalAccessException.prototype.toString$0 = IllegalAccessException.prototype.toString;
 // ********** Code for NoSuchMethodException **************
-function NoSuchMethodException(_receiver, _functionName, _arguments, _extraMessage) {
+function NoSuchMethodException(_receiver, _functionName, _arguments, _existingArgumentNames) {
+  this._existingArgumentNames = _existingArgumentNames;
   this._receiver = _receiver;
   this._functionName = _functionName;
-  this._extraMessage = _extraMessage;
   this._arguments = _arguments;
 }
 NoSuchMethodException.prototype.toString = function() {
   var sb = new StringBufferImpl("");
   for (var i = (0);
    i < this._arguments.get$length(); i++) {
     if (i > (0)) {
       sb.add(", ");
     }
     sb.add(this._arguments.$index(i));
   }
-  sb.add("]");
-  var x = this._extraMessage;
-  return $add(("NoSuchMethodException - receiver: '" + this._receiver + "' "), ("function name: '" + this._functionName + "' arguments: [" + sb + "]" + x));
+  if (null == this._existingArgumentNames) {
+    return $add($add(("NoSuchMethodException : method not found: '" + this._functionName + "'\n"), ("Receiver: " + this._receiver + "\n")), ("Arguments: [" + sb + "]"));
+  }
+  else {
+    var actualParameters = sb.toString();
+    sb = new StringBufferImpl("");
+    for (var i = (0);
+     i < this._existingArgumentNames.get$length(); i++) {
+      if (i > (0)) {
+        sb.add(", ");
+      }
+      sb.add(this._existingArgumentNames.$index(i));
+    }
+    var formalParameters = sb.toString();
+    return $add($add($add("NoSuchMethodException: incorrect number of arguments passed to ", ("method named '" + this._functionName + "'\nReceiver: " + this._receiver + "\n")), ("Tried calling: " + this._functionName + "(" + actualParameters + ")\n")), ("Found: " + this._functionName + "(" + formalParameters + ")"));
+  }
 }
 NoSuchMethodException.prototype.toString$0 = NoSuchMethodException.prototype.toString;
 // ********** Code for ClosureArgumentMismatchException **************
 function ClosureArgumentMismatchException() {
 
 }
 ClosureArgumentMismatchException.prototype.toString = function() {
   return "Closure argument mismatch";
 }
 ClosureArgumentMismatchException.prototype.toString$0 = ClosureArgumentMismatchException.prototype.toString;
@@ skipping 625 matching lines @@
 // ********** Code for HashMapImplementation_Dynamic$DoubleLinkedQueueEntry_KeyValuePair **************
 $inherits(HashMapImplementation_Dynamic$DoubleLinkedQueueEntry_KeyValuePair, HashMapImplementation);
 function HashMapImplementation_Dynamic$DoubleLinkedQueueEntry_KeyValuePair() {
   this._numberOfEntries = (0);
   this._numberOfDeleted = (0);
   this._loadLimit = HashMapImplementation._computeLoadLimit((8));
   this._keys = new Array((8));
   this._values = new Array((8));
 }
 HashMapImplementation_Dynamic$DoubleLinkedQueueEntry_KeyValuePair.prototype.remove$1 = HashMapImplementation_Dynamic$DoubleLinkedQueueEntry_KeyValuePair.prototype.remove;
-// ********** Code for HashMapImplementation_Library$Library **************
-$inherits(HashMapImplementation_Library$Library, HashMapImplementation);
-function HashMapImplementation_Library$Library() {
-  this._numberOfEntries = (0);
-  this._numberOfDeleted = (0);
-  this._loadLimit = HashMapImplementation._computeLoadLimit((8));
-  this._keys = new Array((8));
-  this._values = new Array((8));
-}
-// ********** Code for HashMapImplementation_Member$Member **************
-$inherits(HashMapImplementation_Member$Member, HashMapImplementation);
-function HashMapImplementation_Member$Member() {
-  this._numberOfEntries = (0);
-  this._numberOfDeleted = (0);
-  this._loadLimit = HashMapImplementation._computeLoadLimit((8));
-  this._keys = new Array((8));
-  this._values = new Array((8));
-}
 // ********** Code for HashMapImplementation_dart_core_String$dart_core_String **************
 $inherits(HashMapImplementation_dart_core_String$dart_core_String, HashMapImplementation);
 function HashMapImplementation_dart_core_String$dart_core_String() {
   this._numberOfEntries = (0);
   this._numberOfDeleted = (0);
   this._loadLimit = HashMapImplementation._computeLoadLimit((8));
   this._keys = new Array((8));
   this._values = new Array((8));
 }
 HashMapImplementation_dart_core_String$dart_core_String.prototype.remove$1 = HashMapImplementation_dart_core_String$dart_core_String.prototype.remove;
 // ********** Code for HashMapImplementation_dart_core_String$VariableValue **************
 $inherits(HashMapImplementation_dart_core_String$VariableValue, HashMapImplementation);
 function HashMapImplementation_dart_core_String$VariableValue() {
   this._numberOfEntries = (0);
   this._numberOfDeleted = (0);
   this._loadLimit = HashMapImplementation._computeLoadLimit((8));
   this._keys = new Array((8));
   this._values = new Array((8));
 }
 HashMapImplementation_dart_core_String$VariableValue.prototype.remove$1 = HashMapImplementation_dart_core_String$VariableValue.prototype.remove;
+// ********** Code for HashMapImplementation_Library$Library **************
+$inherits(HashMapImplementation_Library$Library, HashMapImplementation);
+function HashMapImplementation_Library$Library() {
+  this._numberOfEntries = (0);
+  this._numberOfDeleted = (0);
+  this._loadLimit = HashMapImplementation._computeLoadLimit((8));
+  this._keys = new Array((8));
+  this._values = new Array((8));
+}
+// ********** Code for HashMapImplementation_Member$Member **************
+$inherits(HashMapImplementation_Member$Member, HashMapImplementation);
+function HashMapImplementation_Member$Member() {
+  this._numberOfEntries = (0);
+  this._numberOfDeleted = (0);
+  this._loadLimit = HashMapImplementation._computeLoadLimit((8));
+  this._keys = new Array((8));
+  this._values = new Array((8));
+}
 // ********** Code for HashMapImplementation_Type$Type **************
 $inherits(HashMapImplementation_Type$Type, HashMapImplementation);
 function HashMapImplementation_Type$Type() {
   this._numberOfEntries = (0);
   this._numberOfDeleted = (0);
   this._loadLimit = HashMapImplementation._computeLoadLimit((8));
   this._keys = new Array((8));
   this._values = new Array((8));
 }
 // ********** Code for HashSetImplementation **************
@@ skipping 60 matching lines @@
   return this._backingMap.isEmpty();
 }
 HashSetImplementation.prototype.get$length = function() {
   return this._backingMap.get$length();
 }
 HashSetImplementation.prototype.iterator = function() {
   return new HashSetIterator(this);
 }
 HashSetImplementation.prototype.contains$1 = HashSetImplementation.prototype.contains;
 HashSetImplementation.prototype.remove$1 = HashSetImplementation.prototype.remove;
+// ********** Code for HashSetImplementation_dart_core_String **************
+$inherits(HashSetImplementation_dart_core_String, HashSetImplementation);
+function HashSetImplementation_dart_core_String() {
+  this._backingMap = new HashMapImplementation_dart_core_String$dart_core_String();
+}
+HashSetImplementation_dart_core_String.prototype.contains$1 = HashSetImplementation_dart_core_String.prototype.contains;
 // ********** Code for HashSetImplementation_Library **************
 $inherits(HashSetImplementation_Library, HashSetImplementation);
 function HashSetImplementation_Library() {
   this._backingMap = new HashMapImplementation_Library$Library();
 }
 HashSetImplementation_Library.prototype.contains$1 = HashSetImplementation_Library.prototype.contains;
 // ********** Code for HashSetImplementation_Member **************
 $inherits(HashSetImplementation_Member, HashSetImplementation);
 function HashSetImplementation_Member() {
   this._backingMap = new HashMapImplementation_Member$Member();
 }
-// ********** Code for HashSetImplementation_dart_core_String **************
-$inherits(HashSetImplementation_dart_core_String, HashSetImplementation);
-function HashSetImplementation_dart_core_String() {
-  this._backingMap = new HashMapImplementation_dart_core_String$dart_core_String();
-}
-HashSetImplementation_dart_core_String.prototype.contains$1 = HashSetImplementation_dart_core_String.prototype.contains;
 // ********** Code for HashSetImplementation_Type **************
 $inherits(HashSetImplementation_Type, HashSetImplementation);
 function HashSetImplementation_Type() {
   this._backingMap = new HashMapImplementation_Type$Type();
 }
 HashSetImplementation_Type.prototype.contains$1 = HashSetImplementation_Type.prototype.contains;
 // ********** Code for HashSetIterator **************
 function HashSetIterator(set_) {
   this._entries = set_._backingMap._keys;
   this._nextValidIndex = (-1);
@@ skipping 407 matching lines @@
   var lastMatchEnd = (0);
   var $$list = from.allMatches(this);
   for (var $$i = $$list.iterator(); $$i.hasNext(); ) {
     var match = $$i.next();
     buffer.add(this.substring(lastMatchEnd, match.start()));
     buffer.add(to);
     lastMatchEnd = match.end$0();
   }
   buffer.add(this.substring(lastMatchEnd));
 }
+StringImplementation.prototype.split_ = function(pattern) {
+  if ((typeof(pattern) == 'string')) return this._split(pattern);
+  if (!!(pattern && pattern.is$RegExp())) return this._splitRegExp(pattern);
+  $throw("String.split(Pattern) unimplemented.");
+}
+StringImplementation.prototype._split = function(pattern) {
+  'use strict'; return this.split(pattern);
+}
+StringImplementation.prototype._splitRegExp = function(pattern) {
+  'use strict'; return this.split(pattern.re);
+}
 StringImplementation.prototype.hashCode = function() {
       'use strict';
       var hash = 0;
       for (var i = 0; i < this.length; i++) {
         hash = 0x1fffffff & (hash + this.charCodeAt(i));
         hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
         hash ^= hash >> 6;
       }
 
       hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
@@ skipping 242 matching lines @@
   return new Process(get$_process());
 }
 //  ********** Library file_system **************
 // ********** Code for top level **************
 function canonicalizePath(path) {
   return path.replaceAll("\\", "/");
 }
 function joinPaths(path1, path2) {
   path1 = canonicalizePath(path1);
   path2 = canonicalizePath(path2);
-  var pieces = path1.split("/");
-  var $$list = path2.split("/");
+  var pieces = path1.split_("/");
+  var $$list = path2.split_("/");
   for (var $$i = $$list.iterator(); $$i.hasNext(); ) {
     var piece = $$i.next();
     if ($eq(piece, "..") && pieces.get$length() > (0) && $ne(pieces.last(), ".") && $ne(pieces.last(), "..")) {
       pieces.removeLast();
     }
     else if ($ne(piece, "")) {
       if (pieces.get$length() > (0) && $eq(pieces.last(), ".")) {
         pieces.removeLast();
       }
       pieces.add(piece);
@@ skipping 971 matching lines @@
 }
 CodeWriter.prototype.comment = function(text) {
   if (this.writeComments) {
     this.writeln(text);
   }
 }
 CodeWriter.prototype.write = function(text) {
   if (text.length == (0)) return;
   if (this._pendingIndent) this._indent();
   if (text.indexOf("\n") != (-1)) {
-    var lines = text.split("\n");
+    var lines = text.split_("\n");
     for (var i = (0);
      i < lines.get$length() - (1); i++) {
       this.writeln(lines.$index(i));
     }
     this.write(lines.$index(lines.get$length() - (1)));
   }
   else {
     this._buf.add(text);
   }
 }
@@ skipping 9393 matching lines @@
   for (var i = (0);
    i < typeArgs.get$length(); i++) {
     var typeArg = typeArgs.$index(i);
     if ((typeArg instanceof ParameterType)) {
       typeArg = $globals.world.varType;
       typeArgs.$setindex(i, typeArg);
     }
     if (!typeArg.get$isVar()) allVar = false;
     var paramName = this.typeParameters.$index(i).name;
     typeMap.$setindex(paramName, typeArg);
-    names.add(typeArg.get$name());
+    names.add(typeArg.get$fullname());
     jsnames.add(typeArg.get$jsname());
   }
   if (allVar) return this;
   var jsname = ("" + this.get$jsname() + "_" + Strings.join(jsnames, "$"));
   var simpleName = ("" + this.name + "<" + Strings.join(names, ", ") + ">");
-  var ret = this._concreteTypes.$index(jsname);
+  var ret = this._concreteTypes.$index(simpleName);
   if ($eq(ret)) {
     ret = new DefinedType(simpleName, this.library, this.definition, this.isClass);
     ret.set$baseGenericType(this);
     ret.set$typeArgsInOrder(typeArgs);
     ret.set$_jsname(jsname);
-    this._concreteTypes.$setindex(jsname, ret);
+    this._concreteTypes.$setindex(simpleName, ret);
     ret.resolve();
   }
   return ret;
 }
 DefinedType.prototype.getCallStub = function(args) {
   var name = _getCallStubName("call", args);
   var stub = this.varStubs.$index(name);
   if ($eq(stub)) {
     stub = new VarFunctionStub(name, args);
     this.varStubs.$setindex(name, stub);
@@ skipping 1701 matching lines @@
   }
   else if (namedPri > existingPri) {
     this._renameJavascriptTopName(existing);
   }
   else {
     var msg = $add($add(("conflicting JS name \"" + name + "\" of same "), ("priority " + existingPri + ": (already defined in) ")), ("" + existing.get$span().get$locationText() + " with priority " + namedPri + ")"));
     if (named.get$isNative()) {
       $globals.world.info(msg, named.get$span(), existing.get$span());
     }
     else {
-      $globals.world.internalError(msg, named.get$span(), existing.get$span());
+      this._renameJavascriptTopName(existing);
     }
   }
 }
 World.prototype._renameJavascriptTopName = function(named) {
   named._jsname = ("" + named.get$library().get$jsname() + "_" + named.get$jsname());
   var existing = this._topNames.$index(named.get$jsname());
   if ($ne(existing) && $ne(existing, named)) {
     $globals.world.internalError($add(("name mangling failed for \"" + named.get$jsname() + "\" "), ("(\"" + named.get$jsname() + "\" defined also in " + existing.get$span().get$locationText() + ")")), named.get$span());
   }
   this._topNames.$setindex(named.get$jsname(), named);
 }
 World.prototype._addType = function(type) {
   if (!type.get$isTop()) this._addTopName(type);
 }
 World.prototype.toJsIdentifier = function(name) {
   if (name == null) return null;
   if (this._jsKeywords == null) {
-    this._jsKeywords = HashSetImplementation.HashSetImplementation$from$factory(["break", "case", "catch", "continue", "debugger", "default", "delete", "do", "else", "finally", "for", "function", "if", "in", "instanceof", "new", "return", "switch", "this", "throw", "try", "typeof", "var", "void", "while", "with", "class", "enum", "export", "extends", "import", "super", "implements", "interface", "let", "package", "private", "protected", "public", "static", "yield", "native"]);
+    this._jsKeywords = HashSetImplementation.HashSetImplementation$from$factory(["break", "case", "catch", "continue", "debugger", "default", "delete", "do", "else", "finally", "for", "function", "if", "in", "instanceof", "new", "return", "switch", "this", "throw", "try", "typeof", "var", "void", "while", "with", "class", "enum", "export", "extends", "import", "super", "implements", "interface", "let", "package", "private", "protected", "public", "static", "yield", "split", "native"]);
   }
   if (this._jsKeywords.contains(name)) {
     return $add(name, "_");
   }
   else {
     return name.replaceAll("$", "$$").replaceAll(":", "$");
   }
 }
 World.prototype.compileAndSave = function() {
   var success = this.compile();
@@ skipping 733 matching lines @@
 }
 var const$0000 = Object.create(_DeletedKeySentinel.prototype, {});
 var const$0001 = Object.create(NoMoreElementsException.prototype, {});
 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 $globals = {};
 $static_init();
 main();