Assignment expressions in tree IR.

pkg/compiler/lib/src/tree_ir/tree_ir_tracer.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library tree_ir_tracer;
 
 import 'dart:async' show EventSink;
 import '../tracer.dart';
 import 'tree_ir_nodes.dart';
 
@@ skipping 58 matching lines @@
   }
 
   visitLabeledStatement(LabeledStatement node) {
     Block target = new Block(node.label);
     breakTargets[node.label] = target;
     visitStatement(node.body);
     _addBlock(target);
     visitStatement(node.next);
   }
 
-  visitAssign(Assign node) {
-    _addStatement(node);
-    visitStatement(node.next);
-  }
-
   visitReturn(Return node) {
     _addStatement(node);
   }
 
   visitBreak(Break node) {
     _addStatement(node);
     blocks.last.addEdgeTo(breakTargets[node.target]);
   }
 
   visitContinue(Continue node) {
@@ skipping 72 matching lines @@
   visitExpressionStatement(ExpressionStatement node) {
     _addStatement(node);
     visitStatement(node.next);
   }
 
   visitFunctionDeclaration(FunctionDeclaration node) {
     _addStatement(node);
     visitStatement(node.next);
   }
 
-  visitSetField(SetField node) {
+  visitVariableDeclaration(VariableDeclaration node) {
     _addStatement(node);
     visitStatement(node.next);
   }
-
 }
 
 class TreeTracer extends TracerUtil with StatementVisitor {
   String get passName => null;
 
   final EventSink<String> output;
 
   TreeTracer(this.output);
 
   List<Variable> parameters;
@@ skipping 68 matching lines @@
       name = 'x${statementCounter++}';
     }
     addIndent();
     add("$bci $uses $name $contents <|@\n");
   }
 
   visitLabeledStatement(LabeledStatement node) {
     // These do not get added to a block's list of statements.
   }
 
-  visitAssign(Assign node) {
-    String name = names.varName(node.variable);
-    String rhs = expr(node.value);
-    Variable v = node.variable;
-    String extra = "(r=${v.readCount}, w=${v.writeCount})";
-    printStatement(null, "assign $name = $rhs $extra");
-  }
-
   visitReturn(Return node) {
     printStatement(null, "return ${expr(node.value)}");
   }
 
   visitBreak(Break node) {
     printStatement(null, "break ${collector.breakTargets[node.target].name}");
   }
 
   visitContinue(Continue node) {
     printStatement(null,
@@ skipping 27 matching lines @@
   }
 
   visitExpressionStatement(ExpressionStatement node) {
     printStatement(null, expr(node.expression));
   }
 
   visitFunctionDeclaration(FunctionDeclaration node) {
     printStatement(null, 'function ${node.definition.element.name}');
   }
 
+  visitVariableDeclaration(VariableDeclaration node) {
+    String variable = names.varName(node.variable);
+    String value = expr(node.value);
+    printStatement(null, 'declare $variable = $value');
+  }
+
   visitSetField(SetField node) {
     String object = expr(node.object);
     String field = node.field.name;
     String value = expr(node.value);
     if (SubexpressionVisitor.usesInfixNotation(node.object)) {
       object = '($object)';
     }
     printStatement(null, '$object.$field = $value');
   }
 
   String expr(Expression e) {
     return e.accept(new SubexpressionVisitor(names));
   }
 }
 
 class SubexpressionVisitor extends ExpressionVisitor<String> {
   Names names;
 
   SubexpressionVisitor(this.names);
 
   String visitVariableUse(VariableUse node) {
     return names.varName(node.variable);
   }
 
+  String visitAssign(Assign node) {
+    String variable = names.varName(node.variable);
+    String value = visitExpression(node.value);
+    return '$variable = $value';
+  }
+
   String formatArguments(Invoke node) {
     List<String> args = new List<String>();
     int positionalArgumentCount = node.selector.positionalArgumentCount;
     for (int i = 0; i < positionalArgumentCount; ++i) {
       args.add(node.arguments[i].accept(this));
     }
     for (int i = 0; i < node.selector.namedArgumentCount; ++i) {
       String name = node.selector.namedArguments[i];
       String arg = node.arguments[positionalArgumentCount + i].accept(this);
       args.add("$name: $arg");
@@ skipping 61 matching lines @@
 
   String visitThis(This node) {
     return "this";
   }
 
   String visitReifyTypeVar(ReifyTypeVar node) {
     return "typevar [${node.typeVariable.name}]";
   }
 
   static bool usesInfixNotation(Expression node) {
-    return node is Conditional || node is LogicalOperator;
+    return node is Conditional ||
+           node is LogicalOperator ||
+           node is Assign ||
+           node is SetField;
   }
 
   String visitConditional(Conditional node) {
     String condition = visitExpression(node.condition);
     String thenExpr = visitExpression(node.thenExpression);
     String elseExpr = visitExpression(node.elseExpression);
     return "$condition ? $thenExpr : $elseExpr";
   }
 
   String visitLogicalOperator(LogicalOperator node) {
@@ skipping 36 matching lines @@
 
   String visitGetField(GetField node) {
     String object = visitExpression(node.object);
     String field = node.field.name;
     if (usesInfixNotation(node.object)) {
       object = '($object)';
     }
     return '$object.$field';
   }
 
+  String visitSetField(SetField node) {
+    String object = visitExpression(node.object);
+    String field = node.field.name;
+    if (usesInfixNotation(node.object)) {
+      object = '($object)';
+    }
+    String value = visitExpression(node.value);
+    return '$object.$field = $value';
+  }
+
   String visitCreateBox(CreateBox node) {
     return 'CreateBox';
   }
 
   String visitCreateInstance(CreateInstance node) {
     String className = node.classElement.name;
     String arguments = node.arguments.map(visitExpression).join(', ');
     return 'CreateInstance $className($arguments)';
   }
 
@@ skipping 32 matching lines @@
       String prefix = v.element == null ? 'v' : '${v.element.name}_';
       while (name == null || _usedNames.contains(name)) {
         name = "$prefix${_counter++}";
       }
       _names[v] = name;
       _usedNames.add(name);
     }
     return name;
   }
 }