Change resolving of instance methods to check early for name mismatch.

runtime/vm/object.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 4075 matching lines @@
     // marked as non-static, but they do not have a receiver.
     // Closures are handled above.
     ASSERT((kind() != RawFunction::kClosureFunction) &&
            (kind() != RawFunction::kSignatureFunction));
     return 1;  // Receiver.
   }
   return 0;  // No implicit parameters.
 }
 
 
-bool Function::AreValidArgumentCounts(int num_arguments,
-                                      int num_named_arguments,
+bool Function::AreValidArgumentCounts(intptr_t num_arguments,
+                                      intptr_t num_named_arguments,
                                       String* error_message) const {
   if (num_named_arguments > NumOptionalNamedParameters()) {
     if (error_message != NULL) {
       const intptr_t kMessageBufferSize = 64;
       char message_buffer[kMessageBufferSize];
       OS::SNPrint(message_buffer,
                   kMessageBufferSize,
-                  "%d named passed, at most %"Pd" expected",
+                  "%"Pd" named passed, at most %"Pd" expected",
                   num_named_arguments,
                   NumOptionalNamedParameters());
       *error_message = String::New(message_buffer);
     }
     return false;  // Too many named arguments.
   }
   const int num_pos_args = num_arguments - num_named_arguments;
   const int num_opt_pos_params = NumOptionalPositionalParameters();
   const int num_pos_params = num_fixed_parameters() + num_opt_pos_params;
   if (num_pos_args > num_pos_params) {
@@ skipping 27 matching lines @@
                   num_opt_pos_params > 0 ? "at least " : "",
                   num_fixed_parameters() - num_hidden_params);
       *error_message = String::New(message_buffer);
     }
     return false;  // Too few fixed and/or positional arguments.
   }
   return true;
 }
 
 
-bool Function::AreValidArguments(int num_arguments,
+bool Function::AreValidArguments(intptr_t num_arguments,
                                  const Array& argument_names,
                                  String* error_message) const {
-  const int num_named_arguments =
+  const intptr_t num_named_arguments =
       argument_names.IsNull() ? 0 : argument_names.Length();
   if (!AreValidArgumentCounts(num_arguments,
                               num_named_arguments,
                               error_message)) {
     return false;
   }
   // Verify that all argument names are valid parameter names.
   Isolate* isolate = Isolate::Current();
   String& argument_name = String::Handle(isolate);
   String& parameter_name = String::Handle(isolate);
-  for (int i = 0; i < num_named_arguments; i++) {
+  for (intptr_t i = 0; i < num_named_arguments; i++) {
     argument_name ^= argument_names.At(i);
     ASSERT(argument_name.IsSymbol());
     bool found = false;
-    const int num_positional_args = num_arguments - num_named_arguments;
-    const int num_parameters = NumParameters();
-    for (int j = num_positional_args; !found && (j < num_parameters); j++) {
+    const intptr_t num_positional_args = num_arguments - num_named_arguments;
+    const intptr_t num_parameters = NumParameters();
+    for (intptr_t j = num_positional_args;
+         !found && (j < num_parameters);
+         j++) {
       parameter_name = ParameterNameAt(j);
       ASSERT(argument_name.IsSymbol());
       if (argument_name.Equals(parameter_name)) {
+        found = true;
+      }
+    }
+    if (!found) {
+      if (error_message != NULL) {
+        const intptr_t kMessageBufferSize = 64;
+        char message_buffer[kMessageBufferSize];
+        OS::SNPrint(message_buffer,
+                    kMessageBufferSize,
+                    "no optional formal parameter named '%s'",
+                    argument_name.ToCString());
+        *error_message = String::New(message_buffer);
+      }
+      return false;
+    }
+  }
+  return true;
+}
+
+
+bool Function::AreValidArguments(const ArgumentsDescriptor& args_desc,
+                                 String* error_message) const {
+  const intptr_t num_arguments = args_desc.Count();
+  const intptr_t num_named_arguments = args_desc.NamedCount();
+
+  if (!AreValidArgumentCounts(num_arguments,
+                              num_named_arguments,
+                              error_message)) {
+    return false;
+  }
+  // Verify that all argument names are valid parameter names.
+  Isolate* isolate = Isolate::Current();
+  String& argument_name = String::Handle(isolate);
+  String& parameter_name = String::Handle(isolate);
+  for (intptr_t i = 0; i < num_named_arguments; i++) {
+    argument_name ^= args_desc.NameAt(i);
+    ASSERT(argument_name.IsSymbol());
+    bool found = false;
+    const intptr_t num_positional_args = num_arguments - num_named_arguments;
+    const int num_parameters = NumParameters();
+    for (intptr_t j = num_positional_args;
+         !found && (j < num_parameters);
+         j++) {
+      parameter_name = ParameterNameAt(j);
+      ASSERT(argument_name.IsSymbol());
+      if (argument_name.Equals(parameter_name)) {
         found = true;
       }
     }
     if (!found) {
       if (error_message != NULL) {
         const intptr_t kMessageBufferSize = 64;
         char message_buffer[kMessageBufferSize];
         OS::SNPrint(message_buffer,
                     kMessageBufferSize,
                     "no optional formal parameter named '%s'",
@@ skipping 9972 matching lines @@
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   stream->OpenObject();
   stream->CloseObject();
 }
 
 
 }  // namespace dart