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

Unified Diff: sdk/lib/_internal/compiler/implementation/elements/modelx.dart

Issue 11886097: Get the most basic mixin applications working. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Diff against right branch. Created 7 years, 11 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: sdk/lib/_internal/compiler/implementation/elements/modelx.dart
diff --git a/sdk/lib/_internal/compiler/implementation/elements/modelx.dart b/sdk/lib/_internal/compiler/implementation/elements/modelx.dart
index 38bb2bd0be537d19254cbfb009b663f9a4d29e6b..cf07abefa66176fbd7468d5370b54c8804f84c66 100644
--- a/sdk/lib/_internal/compiler/implementation/elements/modelx.dart
+++ b/sdk/lib/_internal/compiler/implementation/elements/modelx.dart
@@ -1370,10 +1370,14 @@ abstract class BaseClassElementX extends ElementX implements ClassElement {
InterfaceType computeType(compiler) {
if (thisType == null) {
if (origin == null) {
- ClassNode node = parseNode(compiler);
- Link<DartType> parameters =
- TypeDeclarationElementX.createTypeVariables(this,
- node.typeParameters);
+ Link<DartType> parameters = const Link<DartType>();
+ // TODO(kasperl): Figure out how to get the type parameters
+ // for a mixin application.
+ if (!isMixinApplication) {
+ ClassNode node = parseNode(compiler);
+ parameters = TypeDeclarationElementX.createTypeVariables(
+ this, node.typeParameters);
+ }
thisType = new InterfaceType(this, parameters);
if (parameters.isEmpty) {
rawType = thisType;
@@ -1401,6 +1405,22 @@ abstract class BaseClassElementX extends ElementX implements ClassElement {
Link<DartType> get typeVariables => thisType.typeArguments;
+ ClassElement ensureResolved(Compiler compiler) {
+ if (resolutionState == STATE_NOT_STARTED) {
+ compiler.resolver.resolveClass(this);
+ }
+ return this;
+ }
+
+ void addDefaultConstructorIfNeeded(Compiler compiler) {
+ if (hasConstructor) return;
+ FunctionElement constructor =
+ new SynthesizedConstructorElementX.forDefault(this, compiler);
+ setDefaultConstructor(constructor, compiler);
+ }
+
+ void setDefaultConstructor(FunctionElement constructor, Compiler compiler);
+
void addBackendMember(Element member) {
backendMembers = backendMembers.prepend(member);
}
@@ -1693,7 +1713,6 @@ abstract class BaseClassElementX extends ElementX implements ClassElement {
}
}
-
abstract class ClassElementX extends BaseClassElementX {
// Lazily applied patch of class members.
ClassElement patch = null;
@@ -1707,6 +1726,7 @@ abstract class ClassElementX extends BaseClassElementX {
ClassNode parseNode(Compiler compiler);
+ bool get isMixinApplication => false;
bool get isPatched => patch != null;
bool get isPatch => origin != null;
bool get hasLocalScopeMembers => !localScope.isEmpty;
@@ -1740,11 +1760,8 @@ abstract class ClassElementX extends BaseClassElementX {
return false;
}
- ClassElement ensureResolved(Compiler compiler) {
- if (resolutionState == STATE_NOT_STARTED) {
- compiler.resolver.resolveClass(this);
- }
- return this;
+ void setDefaultConstructor(FunctionElement constructor, Compiler compiler) {
+ addToScope(constructor, compiler);
}
Scope buildScope() => new ClassScope(enclosingElement.buildScope(), this);
@@ -1763,6 +1780,9 @@ abstract class ClassElementX extends BaseClassElementX {
class MixinApplicationElementX extends BaseClassElementX {
final MixinApplication cachedNode;
+ FunctionElement constructor;
+ ClassElement mixin;
+
// TODO(kasperl): The analyzer complains when I don't have these two
// fields. This is pretty weird. I cannot replace them with getters.
final ClassElement patch = null;
@@ -1772,27 +1792,21 @@ class MixinApplicationElementX extends BaseClassElementX {
this.cachedNode)
: super(name, enclosing, id, STATE_NOT_STARTED);
- bool get hasConstructor => false;
+ bool get isMixinApplication => true;
+ bool get hasConstructor => constructor != null;
bool get hasLocalScopeMembers => false;
Token position() => cachedNode.getBeginToken();
Node parseNode(DiagnosticListener listener) => cachedNode;
- ClassElement ensureResolved(Compiler compiler) {
- if (resolutionState == STATE_NOT_STARTED) {
- compiler.resolver.resolveMixinApplication(this);
- }
- return this;
- }
-
Element localLookup(SourceString name) {
- // TODO(kasperl): Unimplemented for now.
- return null;
+ if (this.name == name) return constructor;
+ if (mixin != null) return mixin.localLookup(name);
}
void forEachLocalMember(void f(Element member)) {
- // TODO(kasperl): Unimplemented for now.
+ if (mixin != null) mixin.forEachLocalMember(f);
}
void addMember(Element element, DiagnosticListener listener) {
@@ -1802,6 +1816,11 @@ class MixinApplicationElementX extends BaseClassElementX {
void addToScope(Element element, DiagnosticListener listener) {
throw new UnsupportedError("cannot add to scope of $this");
}
+
+ void setDefaultConstructor(FunctionElement constructor, Compiler compiler) {
+ assert(!hasConstructor);
+ this.constructor = constructor;
+ }
}
class LabelElementX extends ElementX implements LabelElement {

Powered by Google App Engine
This is Rietveld 408576698