frog: improve errors with named param (bug 507)

frog/minfrog

 #!/usr/bin/env node
 //  ********** Library dart:core **************
 //  ********** Natives dart:core **************
 /**
  * Generates a dynamic call stub for a function.
  * Our goal is to create a stub method like this on-the-fly:
  *   function($0, $1, capture) { return this($0, $1, true, capture); }
  *
  * This stub then replaces the dynamic one on Function, with one that is
  * specialized for that particular function, taking into account its default
@@ skipping 4277 matching lines @@
     type.resolve$0();
   }
 }
 Library.prototype.visitSources = function() {
   var visitor = new _LibraryVisitor(this);
   visitor.addSource$1(this.baseSource);
 }
 Library.prototype.toString = function() {
   return this.baseSource.filename;
 }
+Library.prototype.hashCode = function() {
+  return this.baseSource.filename.hashCode();
+}
+Library.prototype.$eq = function(other) {
+  return (other instanceof Library) && $eq(other.get$baseSource().get$filename(), this.baseSource.filename);
+}
 Library.prototype.findTypeByName$1 = Library.prototype.findTypeByName;
+Library.prototype.hashCode$0 = Library.prototype.hashCode;
 Library.prototype.resolve$0 = Library.prototype.resolve;
 Library.prototype.toString$0 = Library.prototype.toString;
 Library.prototype.visitSources$0 = Library.prototype.visitSources;
 // ********** Code for _LibraryVisitor **************
 function _LibraryVisitor(library) {
   this.seenImport = false
   this.seenSource = false
   this.seenResource = false
   this.isTop = true
   this.library = library;
@@ skipping 356 matching lines @@
 Member.prototype.get$generatedFactoryName = function() {
   var prefix = ('' + this.declaringType.get$jsname() + '.' + this.get$constructorName() + '\$');
   if (this.name == '') {
     return ('' + prefix + 'factory');
   }
   else {
     return ('' + prefix + this.name + '\$factory');
   }
 }
 Member.prototype.hashCode = function() {
-  return (this.declaringType.hashCode() << 4) ^ this.name.hashCode();
+  var typeCode = this.declaringType == null ? 1 : this.declaringType.hashCode();
+  var nameCode = this.get$isConstructor() ? this.get$constructorName().hashCode() : this.name.hashCode();
+  return (typeCode << 4) ^ nameCode;
+}
+Member.prototype.$eq = function(other) {
+  return (other instanceof Member) && $eq(this.get$isConstructor(), other.get$isConstructor()) && $eq(this.declaringType, other.get$declaringType()) && (this.get$isConstructor() ? this.get$constructorName() == other.get$constructorName() : this.name == other.get$name());
 }
 Member.prototype._get$3 = Member.prototype._get;
 Member.prototype._get$3$isDynamic = Member.prototype._get;
 Member.prototype._get$4 = Member.prototype._get;
 Member.prototype._set$4 = Member.prototype._set;
 Member.prototype._set$4$isDynamic = Member.prototype._set;
 Member.prototype._set$5 = Member.prototype._set;
 Member.prototype.canInvoke$2 = Member.prototype.canInvoke;
 Member.prototype.computeValue$0 = Member.prototype.computeValue;
 Member.prototype.hashCode$0 = Member.prototype.hashCode;
@@ skipping 652 matching lines @@
      i < this.parameters.length; i++) {
       var arg = args.getValue(this.parameters.$index(i).get$name());
       if (arg != null && arg.needsConversion$1(this.parameters.$index(i).get$type())) {
         return true;
       }
     }
   }
   return false;
 }
 MethodMember._argCountMsg = function(actual, expected, atLeast) {
-  return 'wrong number of arguments, expected ' + ('' + (atLeast ? "at least " : "") + expected + ' but found ' + actual);
+  return 'wrong number of positional arguments, expected ' + ('' + (atLeast ? "at least " : "") + expected + ' but found ' + actual);
 }
-MethodMember.prototype._argError = function(context, node, target, args, msg) {
+MethodMember.prototype._argError = function(context, node, target, args, msg, span) {
   if (this.isStatic || this.get$isConstructor()) {
-    $globals.world.error(msg, node.span);
+    $globals.world.error(msg, span);
   }
   else {
-    $globals.world.warning(msg, node.span);
+    $globals.world.warning(msg, span);
   }
   return target.invokeNoSuchMethod(context, this.name, node, args);
 }
 MethodMember.prototype.genParameterValues = function() {
   var $$list = this.parameters;
   for (var $$i = 0;$$i < $$list.length; $$i++) {
     var p = $$list.$index($$i);
     p.genValue$2(this, this.generator);
   }
 }
@@ skipping 13 matching lines @@
   var argsCode = [];
   if (!target.isType && (this.get$isConstructor() || target.isSuper)) {
     argsCode.add$1('this');
   }
   var bareCount = args.get$bareCount();
   for (var i = 0;
    i < bareCount; i++) {
     var arg = args.values.$index(i);
     if (i >= this.parameters.length) {
       var msg = MethodMember._argCountMsg(args.get$length(), this.parameters.length, false);
-      return this._argError(context, node, target, args, msg);
+      return this._argError(context, node, target, args, msg, args.nodes.$index(i).get$span());
     }
     arg = arg.convertTo$4(context, this.parameters.$index(i).get$type(), node, isDynamic);
     if (this.isConst && arg.get$isConst()) {
       argsCode.add$1(arg.get$canonicalCode());
     }
     else {
       argsCode.add$1(arg.get$code());
     }
   }
+  var namedArgsUsed = 0;
   if (bareCount < this.parameters.length) {
     this.genParameterValues();
-    var namedArgsUsed = 0;
     for (var i = bareCount;
      i < this.parameters.length; i++) {
       var arg = args.getValue(this.parameters.$index(i).get$name());
       if (arg == null) {
         arg = this.parameters.$index(i).get$value();
       }
       else {
         arg = arg.convertTo$4(context, this.parameters.$index(i).get$type(), node, isDynamic);
         namedArgsUsed++;
       }
       if (arg == null || !this.parameters.$index(i).get$isOptional()) {
         var msg = MethodMember._argCountMsg(Math.min(i, args.get$length()), i + 1, true);
-        return this._argError(context, node, target, args, msg);
+        return this._argError(context, node, target, args, msg, args.nodes.$index(i).get$span());
       }
       else {
         argsCode.add$1(this.isConst && arg.get$isConst() ? arg.get$canonicalCode() : arg.get$code());
       }
     }
-    if (namedArgsUsed < args.get$nameCount()) {
-      var seen = new HashSetImplementation();
-      for (var i = bareCount;
-       i < args.get$length(); i++) {
-        var name = args.getName(i);
-        if (seen.contains$1(name)) {
-          return this._argError(context, node, target, args, ('duplicate argument "' + name + '"'));
-        }
-        seen.add$1(name);
-        var p = this.indexOfParameter(name);
-        if (p < 0) {
-          return this._argError(context, node, target, args, ('method does not have optional parameter "' + name + '"'));
-        }
-        else if (p < bareCount) {
-          return this._argError(context, node, target, args, ('argument "' + name + '" passed as positional and named'));
-        }
+    Arguments.removeTrailingNulls(argsCode);
+  }
+  if (namedArgsUsed < args.get$nameCount()) {
+    var seen = new HashSetImplementation();
+    for (var i = bareCount;
+     i < args.get$length(); i++) {
+      var name = args.getName(i);
+      if (seen.contains$1(name)) {
+        return this._argError(context, node, target, args, ('duplicate argument "' + name + '"'), args.nodes.$index(i).get$span());
       }
-      $globals.world.internalError(('wrong named arguments calling ' + this.name), node.span);
+      seen.add$1(name);
+      var p = this.indexOfParameter(name);
+      if (p < 0) {
+        return this._argError(context, node, target, args, ('method does not have optional parameter "' + name + '"'), args.nodes.$index(i).get$span());
+      }
+      else if (p < bareCount) {
+        return this._argError(context, node, target, args, ('argument "' + name + '" passed as positional and named'), args.nodes.$index(p).get$span());
+      }
     }
-    Arguments.removeTrailingNulls(argsCode);
+    $globals.world.internalError(('wrong named arguments calling ' + this.name), node.span);
   }
   var argsString = Strings.join(argsCode, ', ');
   if (this.get$isConstructor()) {
     return this._invokeConstructor(context, node, target, args, argsString);
   }
   if (target.isSuper) {
     return new Value(this.get$inferredResult(), ('' + this.declaringType.get$jsname() + '.prototype.' + this.get$jsname() + '.call(' + argsString + ')'), node.span, true);
   }
   if (this.get$isOperator()) {
     return this._invokeBuiltin(context, node, target, args, argsCode, isDynamic);
@@ skipping 5378 matching lines @@
     return true;
   }
   if (this.get$interfaces() != null && this.get$interfaces().some((function (i) {
     return i.isSubtypeOf$1(other);
   })
   )) {
     return true;
   }
   return false;
 }
+Type.prototype.hashCode = function() {
+  var libraryCode = this.get$library() == null ? 1 : this.get$library().hashCode();
+  var nameCode = this.name == null ? 1 : this.name.hashCode();
+  return (libraryCode << 4) ^ nameCode;
+}
+Type.prototype.$eq = function(other) {
+  return (other instanceof Type) && $eq(other.get$name(), this.name) && $eq(this.get$library(), other.get$library());
+}
 Type._isFunctionSubtypeOf = function(t, s) {
   if (!s.returnType.get$isVoid() && !s.returnType.isAssignable(t.returnType)) {
     return false;
   }
   var tp = t.parameters;
   var sp = s.parameters;
   if (tp.length < sp.length) return false;
   for (var i = 0;
    i < sp.length; i++) {
     if ($ne(tp.$index(i).get$isOptional(), sp.$index(i).get$isOptional())) return false;
     if (tp.$index(i).get$isOptional() && $ne(tp.$index(i).get$name(), sp.$index(i).get$name())) return false;
     if (!tp.$index(i).get$type().isAssignable$1(sp.$index(i).get$type())) return false;
   }
   if (tp.length > sp.length && !tp.$index(sp.length).get$isOptional()) return false;
   return true;
 }
 Type.prototype._checkExtends$0 = Type.prototype._checkExtends;
 Type.prototype.addDirectSubtype$1 = Type.prototype.addDirectSubtype;
 Type.prototype.ensureSubtypeOf$3 = Type.prototype.ensureSubtypeOf;
 Type.prototype.getConstructor$1 = Type.prototype.getConstructor;
 Type.prototype.getFactory$2 = Type.prototype.getFactory;
 Type.prototype.getMember$1 = Type.prototype.getMember;
 Type.prototype.getOrMakeConcreteType$1 = Type.prototype.getOrMakeConcreteType;
+Type.prototype.hashCode$0 = Type.prototype.hashCode;
 Type.prototype.isAssignable$1 = Type.prototype.isAssignable;
 Type.prototype.isSubtypeOf$1 = Type.prototype.isSubtypeOf;
 Type.prototype.markUsed$0 = Type.prototype.markUsed;
 Type.prototype.resolveTypeParams$1 = Type.prototype.resolveTypeParams;
 // ********** Code for ParameterType **************
 function ParameterType(name, typeParameter) {
   this.typeParameter = typeParameter;
   // Initializers done
   Type.call(this, name);
 }
@@ skipping 2285 matching lines @@
   $globals._MAGENTA_COLOR = '\u001b[35m';
   $globals._NO_COLOR = '\u001b[0m';
   $globals._RED_COLOR = '\u001b[31m';
 }
 var const$0 = new NoMoreElementsException()/*const NoMoreElementsException()*/;
 var const$2 = new EmptyQueueException()/*const EmptyQueueException()*/;
 var const$3 = new _DeletedKeySentinel()/*const _DeletedKeySentinel()*/;
 var $globals = {};
 $static_init();
 main();