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

Unified Diff: sdk/lib/_internal/compiler/implementation/resolution/members.dart

Issue 57983002: Add mixin support to source mirrors. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Updated cf. comments. Created 7 years, 1 month 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: sdk/lib/_internal/compiler/implementation/resolution/members.dart
diff --git a/sdk/lib/_internal/compiler/implementation/resolution/members.dart b/sdk/lib/_internal/compiler/implementation/resolution/members.dart
index 40703cfe02158e0989f25ae89980d587b4e975be..699f026c7ef0a03c9af77361b5bf00dff1a98a4d 100644
--- a/sdk/lib/_internal/compiler/implementation/resolution/members.dart
+++ b/sdk/lib/_internal/compiler/implementation/resolution/members.dart
@@ -3949,10 +3949,8 @@ class ClassResolverVisitor extends TypeDefinitionVisitor {
return;
}
- assert(mixinApplication.mixin == null);
- Element mixin = resolveMixinFor(mixinApplication, mixinType);
-
- mixinApplication.mixin = mixin;
+ assert(mixinApplication.mixinType == null);
+ mixinApplication.mixinType = resolveMixinFor(mixinApplication, mixinType);
// Create forwarding constructors for constructor defined in the superclass
// because they are now hidden by the mixin application.
@@ -3966,8 +3964,8 @@ class ClassResolverVisitor extends TypeDefinitionVisitor {
calculateAllSupertypes(mixinApplication);
}
- ClassElement resolveMixinFor(MixinApplicationElement mixinApplication,
- DartType mixinType) {
+ InterfaceType resolveMixinFor(MixinApplicationElement mixinApplication,
+ DartType mixinType) {
ClassElement mixin = mixinType.element;
mixin.ensureResolved(compiler);
@@ -3989,7 +3987,7 @@ class ClassResolverVisitor extends TypeDefinitionVisitor {
current = currentMixinApplication.mixin;
}
compiler.world.registerMixinUse(mixinApplication, mixin);
- return mixin;
+ return mixinType;
}
DartType resolveType(TypeAnnotation node) {
« no previous file with comments | « sdk/lib/_internal/compiler/implementation/mirrors/mirrors_util.dart ('k') | tests/compiler/dart2js/mirror_system_helper.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698