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

Unified Diff: sdk/lib/_internal/compiler/implementation/dart_backend/backend_ast_emitter.dart

Issue 658103003: Support map and list literals in analyzer2dart. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Use LiteralMapEntry to ensure build order Created 6 years, 2 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/dart_backend/backend_ast_emitter.dart
diff --git a/sdk/lib/_internal/compiler/implementation/dart_backend/backend_ast_emitter.dart b/sdk/lib/_internal/compiler/implementation/dart_backend/backend_ast_emitter.dart
index 86632ad6dfb38a9488dab5b552677385f96d4527..7ceefa66b585b348a223d7065953f67102d0efb0 100644
--- a/sdk/lib/_internal/compiler/implementation/dart_backend/backend_ast_emitter.dart
+++ b/sdk/lib/_internal/compiler/implementation/dart_backend/backend_ast_emitter.dart
@@ -331,7 +331,7 @@ class ASTEmitter extends tree.Visitor<dynamic, Expression> {
// Synthesize an element for the variable
if (variable.element == null || name != variable.element.name) {
// TODO(johnniwinther): Replace by synthetic [Entity].
- variable.element = new modelx.LocalVariableElementX.synthetic(
+ variable.element = new _SyntheticLocalVariableElement(
name,
functionElement,
variableList);
@@ -514,12 +514,13 @@ class ASTEmitter extends tree.Visitor<dynamic, Expression> {
Expression visitLiteralMap(tree.LiteralMap exp) {
List<LiteralMapEntry> entries = new List<LiteralMapEntry>.generate(
- exp.values.length,
- (i) => new LiteralMapEntry(visitExpression(exp.keys[i]),
- visitExpression(exp.values[i])));
+ exp.entries.length,
+ (i) => new LiteralMapEntry(visitExpression(exp.entries[i].key),
+ visitExpression(exp.entries[i].value)));
List<TypeAnnotation> typeArguments = exp.type.treatAsRaw
? null
- : exp.type.typeArguments.map(createTypeAnnotation).toList(growable: false);
+ : exp.type.typeArguments.map(createTypeAnnotation)
+ .toList(growable: false);
return new LiteralMap(entries, typeArguments: typeArguments);
}
@@ -897,3 +898,22 @@ class UnshadowParameters extends tree.RecursiveVisitor {
}
}
+
+// TODO(johnniwinther): Remove this when the dart `backend_ast` does not need
+// [Element] for entities.
+class _SyntheticLocalVariableElement extends modelx.VariableElementX
+ implements LocalVariableElement {
+
+ _SyntheticLocalVariableElement(String name,
+ ExecutableElement enclosingElement,
+ modelx.VariableList variables)
+ : super(name, ElementKind.VARIABLE, enclosingElement, variables, null);
+
+ ExecutableElement get executableContext => enclosingElement;
+
+ ExecutableElement get memberContext => executableContext.memberContext;
+
+ bool get isLocal => true;
+
+ LibraryElement get implementationLibrary => enclosingElement.library;
+}

Powered by Google App Engine
This is Rietveld 408576698