Remove references to ObjectNotClosureException and ClosureArgumentMismatchException

runtime/vm/code_generator.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/code_generator.h"
 
 #include "vm/assembler_macros.h"
 #include "vm/ast.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
@@ skipping 1172 matching lines @@
   }
   if (!result.IsSmi()) {
     const Class& cls = Class::Handle(result.clazz());
     ASSERT(!cls.IsNull());
     function = cls.signature_function();
     if (!function.IsNull()) {
       arguments.SetReturn(result);
       return;  // Return closure object.
     }
   }
-  Exceptions::ThrowByType(Exceptions::kObjectNotClosure, invoke_arguments);
+

[srdjan, 2012/10/31 17:52:51]

Please add a comment saying that the object is not a closure and that we are
throwing an exception.

[regis, 2012/10/31 18:04:37]

Added:
  // The result instance is not a closure, try to invoke method "call" before
  // throwing a NoSuchMethodError.

+  // TODO(regis): Factorize the following code.
+
+  // TODO(regis): Args should be passed.
+  const Array& function_args = Array::Handle();
+  const String& function_name = String::Handle(Symbols::Call());
+  GrowableArray<const Object*> dart_arguments;

[srdjan, 2012/10/31 17:52:51]

dart_arguments(4);

[regis, 2012/10/31 18:04:37]

Done (5).

+
+  // TODO(regis): Resolve and invoke "call" method, if existing.
+
+  const Object& null_object = Object::Handle(Object::null());

[srdjan, 2012/10/31 17:52:51]

Why not just Object::Handle();?

[regis, 2012/10/31 18:04:37]

Done.

+  dart_arguments.Add(&receiver);
+  dart_arguments.Add(&function_name);
+  dart_arguments.Add(&function_args);
+  dart_arguments.Add(&null_object);
+
+  // Report if a function with same name (but different arguments) has been

[srdjan, 2012/10/31 17:52:51]

Maybe adapt argument that we are not looking at any function, but specifically
at  function named 'call'.

[regis, 2012/10/31 18:04:37]

Done.

+  // found.
+  {
+    Class& instance_class = Class::Handle(receiver.clazz());
+    Function& function =
+        Function::Handle(instance_class.LookupDynamicFunction(function_name));
+    while (function.IsNull()) {
+      instance_class = instance_class.SuperClass();
+      if (instance_class.IsNull()) break;
+      function = instance_class.LookupDynamicFunction(function_name);
+    }
+    if (!function.IsNull()) {
+      const int total_num_parameters = function.NumParameters();
+      const Array& array = Array::Handle(Array::New(total_num_parameters - 1));
+      // Skip receiver.
+      for (int i = 1; i < total_num_parameters; i++) {
+        array.SetAt(i - 1, String::Handle(function.ParameterNameAt(i)));
+      }
+      dart_arguments.Add(&array);
+    }
+  }
+  Exceptions::ThrowByType(Exceptions::kNoSuchMethod, dart_arguments);
+  UNREACHABLE();
 }
 
 
 // Invoke Implicit Closure function.
 // Arg0: closure object.
 // Arg1: arguments descriptor (originally passed as dart instance invocation).
 // Arg2: arguments array (originally passed to dart instance invocation).
 DEFINE_RUNTIME_ENTRY(InvokeImplicitClosureFunction, 3) {
   ASSERT(arguments.Count() ==
          kInvokeImplicitClosureFunctionRuntimeEntry.argument_count());
@@ skipping 118 matching lines @@
   const Object& result = Object::Handle(
       DartEntry::InvokeDynamic(receiver,
                                function,
                                invoke_arguments,
                                kNoArgumentNames));
   CheckResultError(result);
   arguments.SetReturn(result);
 }
 
 
-// Report that an object is not a closure.
+// A non-closure object was invoked as a closure, so call the "call" method
+// on it.
 // Arg0: non-closure object.
 // Arg1: arguments array.
+// TODO(regis): Rename this entry?
 DEFINE_RUNTIME_ENTRY(ReportObjectNotClosure, 2) {
   ASSERT(arguments.Count() ==
          kReportObjectNotClosureRuntimeEntry.argument_count());
-  const Instance& bad_closure = Instance::CheckedHandle(arguments.At(0));
-  if (bad_closure.IsNull()) {
-    GrowableArray<const Object*> args;
-    Exceptions::ThrowByType(Exceptions::kObjectNotClosure, args);
+  const Instance& instance = Instance::CheckedHandle(arguments.At(0));
+  const Array& function_args = Array::CheckedHandle(arguments.At(1));
+  const String& function_name = String::Handle(Symbols::Call());
+  GrowableArray<const Object*> dart_arguments;
+  if (instance.IsNull()) {
+    dart_arguments.Add(&function_name);
+    dart_arguments.Add(&function_args);
+    // TODO(regis): Change to Exceptions::kNoSuchMethod.

[srdjan, 2012/10/31 17:52:51]

Remove TODO

[regis, 2012/10/31 18:04:37]

Done.

+    Exceptions::ThrowByType(Exceptions::kNullPointer, dart_arguments);
+    UNREACHABLE();
   }
-  GrowableArray<const Object*> args;
-  Exceptions::ThrowByType(Exceptions::kObjectNotClosure, args);
+
+  // TODO(regis): Resolve and invoke "call" method, if existing.
+
+  const Object& null_object = Object::Handle(Object::null());
+  dart_arguments.Add(&instance);
+  dart_arguments.Add(&function_name);
+  dart_arguments.Add(&function_args);
+  dart_arguments.Add(&null_object);
+
+  // Report if a function with same name (but different arguments) has been
+  // found.

[srdjan, 2012/10/31 17:52:51]

ditto 'a function with ...' -> 'function named "call" .." or similar 

[regis, 2012/10/31 18:04:37]

Done.

+  Class& instance_class = Class::Handle(instance.clazz());
+  Function& function =
+      Function::Handle(instance_class.LookupDynamicFunction(function_name));
+  while (function.IsNull()) {
+    instance_class = instance_class.SuperClass();
+    if (instance_class.IsNull()) break;
+    function = instance_class.LookupDynamicFunction(function_name);
+  }
+  if (!function.IsNull()) {
+    const int total_num_parameters = function.NumParameters();
+    const Array& array = Array::Handle(Array::New(total_num_parameters - 1));
+    // Skip receiver.
+    for (int i = 1; i < total_num_parameters; i++) {
+      array.SetAt(i - 1, String::Handle(function.ParameterNameAt(i)));
+    }
+    dart_arguments.Add(&array);
+  }
+  Exceptions::ThrowByType(Exceptions::kNoSuchMethod, dart_arguments);
+  UNREACHABLE();
 }
 
 
+// A closure object was invoked with incompatible arguments.
+// TODO(regis): Deprecated. This case should be handled by a noSuchMethod call.
 DEFINE_RUNTIME_ENTRY(ClosureArgumentMismatch, 0) {
   ASSERT(arguments.Count() ==
          kClosureArgumentMismatchRuntimeEntry.argument_count());
-  GrowableArray<const Object*> args;
-  Exceptions::ThrowByType(Exceptions::kClosureArgumentMismatch, args);
+  const Instance& instance = Instance::Handle();  // Incorrect. OK for now.
+  const Array& function_args = Array::Handle();  // Incorrect. OK for now.
+  const String& function_name = String::Handle(Symbols::Call());
+  GrowableArray<const Object*> dart_arguments;
+
+  const Object& null_object = Object::Handle(Object::null());

[srdjan, 2012/10/31 17:52:51]

Why not Object::Handle(); ?

[regis, 2012/10/31 18:04:37]

Done.

+  dart_arguments.Add(&instance);
+  dart_arguments.Add(&function_name);
+  dart_arguments.Add(&function_args);
+  dart_arguments.Add(&null_object);
+  Exceptions::ThrowByType(Exceptions::kNoSuchMethod, dart_arguments);
+  UNREACHABLE();
 }
 
 
 DEFINE_RUNTIME_ENTRY(StackOverflow, 0) {
   ASSERT(arguments.Count() ==
          kStackOverflowRuntimeEntry.argument_count());
   uword stack_pos = reinterpret_cast<uword>(&arguments);
 
   // If an interrupt happens at the same time as a stack overflow, we
   // process the stack overflow first.
@@ skipping 460 matching lines @@
     intptr_t line, column;
     script.GetTokenLocation(token_pos, &line, &column);
     String& line_string = String::Handle(script.GetLine(line));
     OS::Print("  Function: %s\n", top_function.ToFullyQualifiedCString());
     OS::Print("  Line %"Pd": '%s'\n", line, line_string.ToCString());
   }
 }
 
 
 }  // namespace dart