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

Unified Diff: runtime/vm/object.h

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
Index: runtime/vm/object.h
===================================================================
--- runtime/vm/object.h (revision 25114)
+++ runtime/vm/object.h (working copy)
@@ -2286,14 +2286,23 @@
void AddObject(const Object& obj, const String& name) const;
void ReplaceObject(const Object& obj, const String& name) const;
RawObject* LookupExport(const String& name) const;
- RawObject* LookupObject(const String& name) const;
- RawClass* LookupClass(const String& name) const;
- RawClass* LookupClassAllowPrivate(const String& name) const;
+ RawObject* LookupObject(const String& name,
+ String* ambiguity_error_msg) const;
+ RawObject* LookupObjectAllowPrivate(const String& name,
+ String* ambiguity_error_msg) const;
+ RawObject* LookupLocalObjectAllowPrivate(const String& name) const;
RawObject* LookupLocalObject(const String& name) const;
+ RawObject* LookupImportedObject(const String& name,
+ String* ambiguity_error_msg) const;
+ RawClass* LookupClass(const String& name, String* ambiguity_error_msg) const;
+ RawClass* LookupClassAllowPrivate(const String& name,
+ String* ambiguity_error_msg) const;
RawClass* LookupLocalClass(const String& name) const;
- RawField* LookupFieldAllowPrivate(const String& name) const;
+ RawField* LookupFieldAllowPrivate(const String& name,
+ String* ambiguity_error_msg) const;
RawField* LookupLocalField(const String& name) const;
- RawFunction* LookupFunctionAllowPrivate(const String& name) const;
+ RawFunction* LookupFunctionAllowPrivate(const String& name,
+ String* ambiguity_error_msg) const;
RawFunction* LookupLocalFunction(const String& name) const;
RawLibraryPrefix* LookupLocalLibraryPrefix(const String& name) const;
RawScript* LookupScript(const String& url) const;
« no previous file with comments | « runtime/vm/mirrors_api_impl.cc ('k') | runtime/vm/object.cc » ('j') | runtime/vm/object.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698