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

Unified Diff: lib/compiler/implementation/tree/unparser.dart

Issue 10448008: fix for index operation unparses (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: address comments Created 8 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/compiler/implementation/tree/unparser.dart
diff --git a/lib/compiler/implementation/tree/unparser.dart b/lib/compiler/implementation/tree/unparser.dart
index 05b24260254451bb67f314f740ba13b5e4956b95..fa19630a860ee9e590921410978c94d96d0c65a7 100644
--- a/lib/compiler/implementation/tree/unparser.dart
+++ b/lib/compiler/implementation/tree/unparser.dart
@@ -157,11 +157,18 @@ class Unparser implements Visitor {
visitModifiers(Modifiers node) => node.visitChildren(this);
+ /**
+ * Unparses given NodeList starting from specific node.
+ */
+ unparseNodeListFrom(NodeList node, Link<Node> from) {
+ String delimiter = (node.delimiter === null) ? " " : "${node.delimiter} ";
+ from.printOn(sb, delimiter);
+ }
+
visitNodeList(NodeList node) {
if (node.beginToken !== null) add(node.beginToken.value);
if (node.nodes !== null) {
- String delimiter = (node.delimiter === null) ? " " : "${node.delimiter} ";
- node.nodes.printOn(sb, delimiter);
+ unparseNodeListFrom(node, node.nodes);
}
if (node.endToken !== null) add(node.endToken.value);
}
@@ -179,7 +186,6 @@ class Unparser implements Visitor {
if (node.endToken !== null) add(node.endToken.value);
}
-
unparseSendPart(Send node) {
if (node.isPrefix) {
visit(node.selector);
@@ -188,7 +194,7 @@ class Unparser implements Visitor {
visit(node.receiver);
if (node.selector is !Operator) sb.add('.');
}
- if (!node.isPrefix) {
+ if (!node.isPrefix && !node.isIndex) {
visit(node.selector);
}
}
@@ -198,10 +204,26 @@ class Unparser implements Visitor {
visit(node.argumentsNode);
}
- visitSendSet(SendSet node) {
- unparseSendPart(node);
+ /**
+ * Special case for assignments like "list[0] = 1".
+ */
+ unparseIndexedSet(SendSet node) {
+ visit(node.receiver);
+ sb.add('[');
+ sb.add(node.arguments.head);
+ sb.add(']');
add(node.assignmentOperator.token.value);
- visit(node.argumentsNode);
+ unparseNodeListFrom(node.argumentsNode, node.argumentsNode.nodes.tail);
+ }
+
+ visitSendSet(SendSet node) {
+ if (node.isIndex) {
+ unparseIndexedSet(node);
+ } else {
+ unparseSendPart(node);
+ add(node.assignmentOperator.token.value);
+ visit(node.argumentsNode);
+ }
}
visitThrow(Throw node) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698