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

Unified Diff: pkg/compiler/lib/src/elements/modelx.dart

Issue 1873823002: Update elements, nodes and visitors for serialization. (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Rebased Created 4 years, 8 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 | « pkg/compiler/lib/src/elements/elements.dart ('k') | pkg/compiler/lib/src/elements/visitor.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/elements/modelx.dart
diff --git a/pkg/compiler/lib/src/elements/modelx.dart b/pkg/compiler/lib/src/elements/modelx.dart
index e786889268c02645cbc5ef3097f5e698ae6f914e..fe64aec668ac6495265542ec7491aa686b54b3e3 100644
--- a/pkg/compiler/lib/src/elements/modelx.dart
+++ b/pkg/compiler/lib/src/elements/modelx.dart
@@ -1546,10 +1546,6 @@ abstract class VariableElementX extends ElementX
// cases, for example, for function typed parameters.
Token get position => token;
- accept(ElementVisitor visitor, arg) {
- return visitor.visitVariableElement(this, arg);
- }
-
DeclarationSite get declarationSite => variables;
}
@@ -1566,6 +1562,10 @@ class LocalVariableElementX extends VariableElementX
MemberElement get memberContext => executableContext.memberContext;
bool get isLocal => true;
+
+ accept(ElementVisitor visitor, arg) {
+ return visitor.visitLocalVariableElement(this, arg);
+ }
}
class FieldElementX extends VariableElementX
@@ -2753,6 +2753,9 @@ class EnumConstructorElementX extends ConstructorElementX {
@override
FunctionExpression parseNode(Parsing parsing) => node;
+
+ @override
+ SourceSpan get sourcePosition => enclosingClass.sourcePosition;
}
class EnumMethodElementX extends MethodElementX {
@@ -2767,6 +2770,9 @@ class EnumMethodElementX extends MethodElementX {
@override
FunctionExpression parseNode(Parsing parsing) => node;
+
+ @override
+ SourceSpan get sourcePosition => enclosingClass.sourcePosition;
}
class EnumFormalElementX extends InitializingFormalElementX {
@@ -2778,6 +2784,9 @@ class EnumFormalElementX extends InitializingFormalElementX {
: super(constructor, variables, identifier, null, fieldElement) {
typeCache = fieldElement.type;
}
+
+ @override
+ SourceSpan get sourcePosition => enclosingClass.sourcePosition;
}
class EnumFieldElementX extends FieldElementX {
@@ -2789,6 +2798,30 @@ class EnumFieldElementX extends FieldElementX {
null, variableList.modifiers, new NodeList.singleton(definition));
initializerCache = initializer;
}
+
+ @override
+ SourceSpan get sourcePosition => enclosingClass.sourcePosition;
+}
+
+class EnumConstantElementX extends EnumFieldElementX
+ implements EnumConstantElement {
+ final int index;
+
+ EnumConstantElementX(
+ Identifier name,
+ EnumClassElementX enumClass,
+ VariableList variableList,
+ Node definition,
+ Expression initializer,
+ this.index)
+ : super(name, enumClass, variableList, definition, initializer);
+
+ @override
+ SourceSpan get sourcePosition {
+ return new SourceSpan(
+ enclosingClass.sourcePosition.uri,
+ position.charOffset, position.charEnd);
+ }
}
abstract class MixinApplicationElementX extends BaseClassElementX
@@ -3088,7 +3121,9 @@ abstract class AstElementMixin implements AstElement {
/// itself.
AstElement get definingElement;
- bool get hasResolvedAst => definingElement.hasTreeElements;
+ bool get hasResolvedAst {
+ return definingElement.hasNode && definingElement.hasTreeElements;
+ }
ResolvedAst get resolvedAst {
return new ResolvedAst(
« no previous file with comments | « pkg/compiler/lib/src/elements/elements.dart ('k') | pkg/compiler/lib/src/elements/visitor.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698