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

Side by Side 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, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 class Unparser implements Visitor { 5 class Unparser implements Visitor {
6 StringBuffer sb; 6 StringBuffer sb;
7 final bool printDebugInfo; 7 final bool printDebugInfo;
8 8
9 Unparser([this.printDebugInfo = false]); 9 Unparser([this.printDebugInfo = false]);
10 10
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 sb.add('<'); 150 sb.add('<');
151 visit(node.type); 151 visit(node.type);
152 sb.add('>'); 152 sb.add('>');
153 } 153 }
154 sb.add(' '); 154 sb.add(' ');
155 visit(node.elements); 155 visit(node.elements);
156 } 156 }
157 157
158 visitModifiers(Modifiers node) => node.visitChildren(this); 158 visitModifiers(Modifiers node) => node.visitChildren(this);
159 159
160 /**
161 * Unparses given NodeList starting from specific node.
162 */
163 unparseNodeListFrom(NodeList node, Link<Node> from) {
164 String delimiter = (node.delimiter === null) ? " " : "${node.delimiter} ";
165 from.printOn(sb, delimiter);
166 }
167
160 visitNodeList(NodeList node) { 168 visitNodeList(NodeList node) {
161 if (node.beginToken !== null) add(node.beginToken.value); 169 if (node.beginToken !== null) add(node.beginToken.value);
162 if (node.nodes !== null) { 170 if (node.nodes !== null) {
163 String delimiter = (node.delimiter === null) ? " " : "${node.delimiter} "; 171 unparseNodeListFrom(node, node.nodes);
164 node.nodes.printOn(sb, delimiter);
165 } 172 }
166 if (node.endToken !== null) add(node.endToken.value); 173 if (node.endToken !== null) add(node.endToken.value);
167 } 174 }
168 175
169 visitOperator(Operator node) { 176 visitOperator(Operator node) {
170 visitIdentifier(node); 177 visitIdentifier(node);
171 } 178 }
172 179
173 visitReturn(Return node) { 180 visitReturn(Return node) {
174 add(node.beginToken.value); 181 add(node.beginToken.value);
175 if (node.hasExpression) { 182 if (node.hasExpression) {
176 sb.add(' '); 183 sb.add(' ');
177 visit(node.expression); 184 visit(node.expression);
178 } 185 }
179 if (node.endToken !== null) add(node.endToken.value); 186 if (node.endToken !== null) add(node.endToken.value);
180 } 187 }
181 188
182
183 unparseSendPart(Send node) { 189 unparseSendPart(Send node) {
184 if (node.isPrefix) { 190 if (node.isPrefix) {
185 visit(node.selector); 191 visit(node.selector);
186 } 192 }
187 if (node.receiver !== null) { 193 if (node.receiver !== null) {
188 visit(node.receiver); 194 visit(node.receiver);
189 if (node.selector is !Operator) sb.add('.'); 195 if (node.selector is !Operator) sb.add('.');
190 } 196 }
191 if (!node.isPrefix) { 197 if (!node.isPrefix && !node.isIndex) {
192 visit(node.selector); 198 visit(node.selector);
193 } 199 }
194 } 200 }
195 201
196 visitSend(Send node) { 202 visitSend(Send node) {
197 unparseSendPart(node); 203 unparseSendPart(node);
198 visit(node.argumentsNode); 204 visit(node.argumentsNode);
199 } 205 }
200 206
207 /**
208 * Special case for assignments like "list[0] = 1".
209 */
210 unparseIndexedSet(SendSet node) {
211 visit(node.receiver);
212 sb.add('[');
213 sb.add(node.arguments.head);
214 sb.add(']');
215 add(node.assignmentOperator.token.value);
216 unparseNodeListFrom(node.argumentsNode, node.argumentsNode.nodes.tail);
217 }
218
201 visitSendSet(SendSet node) { 219 visitSendSet(SendSet node) {
202 unparseSendPart(node); 220 if (node.isIndex) {
203 add(node.assignmentOperator.token.value); 221 unparseIndexedSet(node);
204 visit(node.argumentsNode); 222 } else {
223 unparseSendPart(node);
224 add(node.assignmentOperator.token.value);
225 visit(node.argumentsNode);
226 }
205 } 227 }
206 228
207 visitThrow(Throw node) { 229 visitThrow(Throw node) {
208 add(node.throwToken.value); 230 add(node.throwToken.value);
209 if (node.expression !== null) { 231 if (node.expression !== null) {
210 sb.add(' '); 232 sb.add(' ');
211 visit(node.expression); 233 visit(node.expression);
212 } 234 }
213 node.endToken.value.printOn(sb); 235 node.endToken.value.printOn(sb);
214 } 236 }
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 sb.add(' '); 425 sb.add(' ');
404 } 426 }
405 visit(node.name); 427 visit(node.name);
406 if (node.typeParameters !== null) { 428 if (node.typeParameters !== null) {
407 visit(node.typeParameters); 429 visit(node.typeParameters);
408 } 430 }
409 visit(node.formals); 431 visit(node.formals);
410 add(node.endToken.value); 432 add(node.endToken.value);
411 } 433 }
412 } 434 }
OLDNEW
« 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