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

Unified Diff: runtime/vm/parser.cc

Issue 19763007: Use library prefixes in scope of the mixin class when compiling a functions of (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 | « no previous file | tests/language/mixin_prefix_lib.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/parser.cc
===================================================================
--- runtime/vm/parser.cc (revision 25231)
+++ runtime/vm/parser.cc (working copy)
@@ -2798,7 +2798,14 @@
*(qual_ident->ident),
NULL)) {
LibraryPrefix& lib_prefix = LibraryPrefix::ZoneHandle();
- lib_prefix = current_class().LookupLibraryPrefix(*(qual_ident->ident));
+ if (current_class().mixin() == Type::null()) {
+ lib_prefix = current_class().LookupLibraryPrefix(*(qual_ident->ident));
+ } else {
+ // TODO(hausner): Should we resolve the prefix via the library scope
+ // rather than via the class?
+ Class& cls = Class::Handle(parsed_function()->function().origin());
+ lib_prefix = cls.LookupLibraryPrefix(*(qual_ident->ident));
+ }
if (!lib_prefix.IsNull()) {
// We have a library prefix qualified identifier, unless the prefix is
// shadowed by a type parameter in scope.
« no previous file with comments | « no previous file | tests/language/mixin_prefix_lib.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698