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

Unified Diff: sdk/lib/_internal/compiler/implementation/cps_ir/cps_ir_nodes.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/cps_ir/cps_ir_nodes.dart
diff --git a/sdk/lib/_internal/compiler/implementation/cps_ir/cps_ir_nodes.dart b/sdk/lib/_internal/compiler/implementation/cps_ir/cps_ir_nodes.dart
index 5cf7f0459563b5753420aec785d7b92dcff4c882..5721678910abae3ba22017e5560b9c69fa8ae8d4 100644
--- a/sdk/lib/_internal/compiler/implementation/cps_ir/cps_ir_nodes.dart
+++ b/sdk/lib/_internal/compiler/implementation/cps_ir/cps_ir_nodes.dart
@@ -481,20 +481,26 @@ class LiteralList extends Primitive {
final GenericType type;
final List<Reference> values;
- LiteralList(this.type, List<Primitive> values)
+ LiteralList(this.type, Iterable<Primitive> values)
: this.values = _referenceList(values);
accept(Visitor visitor) => visitor.visitLiteralList(this);
}
+class LiteralMapEntry {
+ final Reference key;
+ final Reference value;
+
+ LiteralMapEntry(Primitive key, Primitive value)
+ : this.key = new Reference(key),
+ this.value = new Reference(value);
+}
+
class LiteralMap extends Primitive {
final GenericType type;
- final List<Reference> keys;
- final List<Reference> values;
+ final List<LiteralMapEntry> entries;
- LiteralMap(this.type, List<Primitive> keys, List<Primitive> values)
- : this.keys = _referenceList(keys),
- this.values = _referenceList(values);
+ LiteralMap(this.type, this.entries);
accept(Visitor visitor) => visitor.visitLiteralMap(this);
}
@@ -566,7 +572,7 @@ class FunctionDefinition extends Node implements InteriorNode {
bool get isAbstract => body == null;
}
-List<Reference> _referenceList(List<Definition> definitions) {
+List<Reference> _referenceList(Iterable<Definition> definitions) {
return definitions.map((e) => new Reference(e)).toList();
}
@@ -731,9 +737,9 @@ abstract class RecursiveVisitor extends Visitor {
processLiteralMap(LiteralMap node) {}
visitLiteralMap(LiteralMap node) {
processLiteralMap(node);
- for (int i = 0; i < node.keys.length; i++) {
- processReference(node.keys[i]);
- processReference(node.values[i]);
+ for (LiteralMapEntry entry in node.entries) {
+ processReference(entry.key);
+ processReference(entry.value);
}
}
@@ -886,9 +892,9 @@ class RegisterAllocator extends Visitor {
}
void visitLiteralMap(LiteralMap node) {
- for (int i = 0; i < node.keys.length; ++i) {
- visitReference(node.keys[i]);
- visitReference(node.values[i]);
+ for (LiteralMapEntry entry in node.entries) {
+ visitReference(entry.key);
+ visitReference(entry.value);
}
}

Powered by Google App Engine
This is Rietveld 408576698