Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(575)

Side by Side Diff: runtime/lib/object.cc

Issue 12328019: - Improve the message for NoSuchMethodErrors that are (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « runtime/lib/lib_sources.gypi ('k') | runtime/lib/object_patch.dart » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/bootstrap_natives.h" 5 #include "vm/bootstrap_natives.h"
6 6
7 #include "vm/exceptions.h" 7 #include "vm/exceptions.h"
8 #include "vm/native_entry.h" 8 #include "vm/native_entry.h"
9 #include "vm/object.h" 9 #include "vm/object.h"
10 #include "vm/stack_frame.h" 10 #include "vm/stack_frame.h"
11 #include "vm/symbols.h" 11 #include "vm/symbols.h"
12 12
13 namespace dart { 13 namespace dart {
14 14
15 DEFINE_NATIVE_ENTRY(Object_toString, 1) { 15 DEFINE_NATIVE_ENTRY(Object_toString, 1) {
16 const Instance& instance = Instance::CheckedHandle(arguments->NativeArgAt(0)); 16 const Instance& instance = Instance::CheckedHandle(arguments->NativeArgAt(0));
17 const char* c_str = instance.ToCString(); 17 const char* c_str = instance.ToCString();
18 return String::New(c_str); 18 return String::New(c_str);
19 } 19 }
20 20
21 21
22 DEFINE_NATIVE_ENTRY(Object_noSuchMethod, 5) { 22 DEFINE_NATIVE_ENTRY(Object_noSuchMethod, 6) {
23 const Instance& instance = Instance::CheckedHandle(arguments->NativeArgAt(0)); 23 const Instance& instance = Instance::CheckedHandle(arguments->NativeArgAt(0));
24 GET_NON_NULL_NATIVE_ARGUMENT(Bool, is_method, arguments->NativeArgAt(1)); 24 GET_NON_NULL_NATIVE_ARGUMENT(Bool, is_method, arguments->NativeArgAt(1));
25 GET_NON_NULL_NATIVE_ARGUMENT(String, member_name, arguments->NativeArgAt(2)); 25 GET_NON_NULL_NATIVE_ARGUMENT(String, member_name, arguments->NativeArgAt(2));
26 GET_NON_NULL_NATIVE_ARGUMENT(Instance, func_args, arguments->NativeArgAt(3)); 26 GET_NON_NULL_NATIVE_ARGUMENT(Smi, invocation_type, arguments->NativeArgAt(3));
27 GET_NON_NULL_NATIVE_ARGUMENT(Instance, func_args, arguments->NativeArgAt(4));
27 GET_NON_NULL_NATIVE_ARGUMENT( 28 GET_NON_NULL_NATIVE_ARGUMENT(
28 Instance, func_named_args, arguments->NativeArgAt(4)); 29 Instance, func_named_args, arguments->NativeArgAt(5));
29 const Array& dart_arguments = Array::Handle(Array::New(5)); 30 const Array& dart_arguments = Array::Handle(Array::New(6));
30 dart_arguments.SetAt(0, instance); 31 dart_arguments.SetAt(0, instance);
31 dart_arguments.SetAt(1, member_name); 32 dart_arguments.SetAt(1, member_name);
32 dart_arguments.SetAt(2, func_args); 33 dart_arguments.SetAt(2, invocation_type);
33 dart_arguments.SetAt(3, func_named_args); 34 dart_arguments.SetAt(3, func_args);
35 dart_arguments.SetAt(4, func_named_args);
34 36
35 if (is_method.value()) { 37 if (is_method.value()) {
36 // Report if a function with same name (but different arguments) has been 38 // Report if a function with same name (but different arguments) has been
37 // found. 39 // found.
38 Class& instance_class = Class::Handle(instance.clazz()); 40 Class& instance_class = Class::Handle(instance.clazz());
39 Function& function = 41 Function& function =
40 Function::Handle(instance_class.LookupDynamicFunction(member_name)); 42 Function::Handle(instance_class.LookupDynamicFunction(member_name));
41 while (function.IsNull()) { 43 while (function.IsNull()) {
42 instance_class = instance_class.SuperClass(); 44 instance_class = instance_class.SuperClass();
43 if (instance_class.IsNull()) break; 45 if (instance_class.IsNull()) break;
44 function = instance_class.LookupDynamicFunction(member_name); 46 function = instance_class.LookupDynamicFunction(member_name);
45 } 47 }
46 if (!function.IsNull()) { 48 if (!function.IsNull()) {
47 const int total_num_parameters = function.NumParameters(); 49 const int total_num_parameters = function.NumParameters();
48 const Array& array = Array::Handle(Array::New(total_num_parameters - 1)); 50 const Array& array = Array::Handle(Array::New(total_num_parameters - 1));
49 // Skip receiver. 51 // Skip receiver.
50 for (int i = 1; i < total_num_parameters; i++) { 52 for (int i = 1; i < total_num_parameters; i++) {
51 array.SetAt(i - 1, String::Handle(function.ParameterNameAt(i))); 53 array.SetAt(i - 1, String::Handle(function.ParameterNameAt(i)));
52 } 54 }
53 dart_arguments.SetAt(4, array); 55 dart_arguments.SetAt(5, array);
54 } 56 }
55 } 57 }
56 Exceptions::ThrowByType(Exceptions::kNoSuchMethod, dart_arguments); 58 Exceptions::ThrowByType(Exceptions::kNoSuchMethod, dart_arguments);
57 return Object::null(); 59 return Object::null();
58 } 60 }
59 61
60 62
61 DEFINE_NATIVE_ENTRY(Object_runtimeType, 1) { 63 DEFINE_NATIVE_ENTRY(Object_runtimeType, 1) {
62 const Instance& instance = Instance::CheckedHandle(arguments->NativeArgAt(0)); 64 const Instance& instance = Instance::CheckedHandle(arguments->NativeArgAt(0));
63 const Type& type = Type::Handle(instance.GetType()); 65 const Type& type = Type::Handle(instance.GetType());
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 } 101 }
100 102
101 103
102 DEFINE_NATIVE_ENTRY(AbstractType_toString, 1) { 104 DEFINE_NATIVE_ENTRY(AbstractType_toString, 1) {
103 const AbstractType& type = 105 const AbstractType& type =
104 AbstractType::CheckedHandle(arguments->NativeArgAt(0)); 106 AbstractType::CheckedHandle(arguments->NativeArgAt(0));
105 return type.UserVisibleName(); 107 return type.UserVisibleName();
106 } 108 }
107 109
108 } // namespace dart 110 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/lib/lib_sources.gypi ('k') | runtime/lib/object_patch.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698