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

Unified Diff: runtime/vm/debugger.cc

Issue 19662003: Refactor resolution code in the vm to properly handle ambiguity errors. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/dart_entry_test.cc ('k') | runtime/vm/exceptions.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/debugger.cc
===================================================================
--- runtime/vm/debugger.cc (revision 25321)
+++ runtime/vm/debugger.cc (working copy)
@@ -810,7 +810,9 @@
const Library& library,
const String& fname) {
ASSERT(!library.IsNull());
- const Object& object = Object::Handle(library.LookupObject(fname));
+ String& ambiguity_error_msg = String::Handle();
+ const Object& object = Object::Handle(
+ library.LookupObject(fname, &ambiguity_error_msg));
if (!object.IsNull() && object.IsFunction()) {
return Function::Cast(object).raw();
}
@@ -841,7 +843,9 @@
if (class_name.Length() == 0) {
return ResolveLibraryFunction(library, function_name);
}
- const Class& cls = Class::Handle(library.LookupClass(class_name));
+ String& ambiguity_error_msg = String::Handle();
+ const Class& cls = Class::Handle(
+ library.LookupClass(class_name, &ambiguity_error_msg));
Function& function = Function::Handle();
if (!cls.IsNull()) {
function = cls.LookupStaticFunction(function_name);
« no previous file with comments | « runtime/vm/dart_entry_test.cc ('k') | runtime/vm/exceptions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698