Rename ClosureVariable, use separate IR forms for declaration and assignment.

pkg/compiler/lib/src/cps_ir/cps_ir_nodes_sexpr.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 dart2js.ir_nodes_sexpr;
 
 import '../constants/values.dart';
 import '../util/util.dart';
 import 'cps_ir_nodes.dart';
 
@@ skipping 16 matching lines @@
   }
 
   String access(Reference<Definition> r) {
     return decorator(r.definition, namer.getName(r.definition));
   }
 
   String visitParameter(Parameter node) {
     return namer.nameParameter(node);
   }
 
-  String visitClosureVariable(ClosureVariable node) {
-    return namer.nameClosureVariable(node);
+  String visitMutableVariable(MutableVariable node) {
+    return namer.nameMutableVariable(node);
   }
 
   /// Main entry point for creating a [String] from a [Node].  All recursive
   /// calls must go through this method.
   String visit(Node node) {
     String s = super.visit(node);
     return decorator(node, s);
   }
 
   String visitFunctionDefinition(FunctionDefinition node) {
@@ skipping 45 matching lines @@
         // Each subsequent line is indented additional spaces to align it
         // with the previous continuation.
         String indent = '$indentation${' ' * '(LetCont ('.length}';
         conts = '$conts\n$indent($name ($parameters)\n$body)';
       }
     }
     String body = indentBlock(() => visit(node.body));
     return '$indentation($LetCont ($conts)\n$body)';
   }
 
+  String visitLetMutable(LetMutable node) {
+    String name = visit(node.variable);
+    String value = access(node.value);
+    String body = indentBlock(() => visit(node.body));
+    return '$indentation(LetMutable ($name $value)\n$body)';
+  }
+
   String formatArguments(Invoke node) {
     int positionalArgumentCount = node.selector.positionalArgumentCount;
     List<String> args = new List<String>();
     args.addAll(
         node.arguments.getRange(0, positionalArgumentCount).map(access));
     for (int i = 0; i < node.selector.namedArgumentCount; ++i) {
       String name = node.selector.namedArguments[i];
       String arg = access(node.arguments[positionalArgumentCount + i]);
       args.add("($name: $arg)");
     }
@@ skipping 73 matching lines @@
     String function =
         indentBlock(() => indentBlock(() => visit(node.definition)));
     return '(CreateFunction\n$function)';
   }
 
   String visitContinuation(Continuation node) {
     // Continuations are visited directly in visitLetCont.
     return '(Unexpected Continuation)';
   }
 
-  String visitGetClosureVariable(GetClosureVariable node) {
-    namer.nameClosureVariableIfAbsent(node.variable.definition);
-    return '(GetClosureVariable ${access(node.variable)})';
+  String visitGetMutableVariable(GetMutableVariable node) {
+    return '(${node.runtimeType} ${access(node.variable)})';

[asgerf, 2015/02/03 10:27:31]

What karl said about runtimeType, unless we're certain that this can be tree
shaked in production(?).

[Kevin Millikin (Google), 2015/02/03 14:11:49]

I had thought that the entire file was unused, but I guess that turns out not to
be true.  I'll go back to explicit strings.

   }
 
-  String visitSetClosureVariable(SetClosureVariable node) {
-    namer.nameClosureVariableIfAbsent(node.variable.definition);
+  String visitSetMutableVariable(SetMutableVariable node) {
     String value = access(node.value);
     String body = indentBlock(() => visit(node.body));
-    return '$indentation(SetClosureVariable ${access(node.variable)} '
+    return '$indentation(${node.runtimeType} ${access(node.variable)} '
            '$value\n$body)';
   }
 
   String visitTypeOperator(TypeOperator node) {
     String receiver = access(node.receiver);
     String cont = access(node.continuation);
     String operator = node.isTypeTest ? 'is' : 'as';
     return '$indentation(TypeOperator $operator $receiver ${node.type} $cont)';
   }
 
   String visitLiteralList(LiteralList node) {
     String values = node.values.map(access).join(' ');
     return '(LiteralList ($values))';
   }
 
   String visitLiteralMap(LiteralMap node) {
     String keys = node.entries.map((e) => access(e.key)).join(' ');
     String values = node.entries.map((e) => access(e.value)).join(' ');
     return '(LiteralMap ($keys) ($values))';
   }
 
   String visitDeclareFunction(DeclareFunction node) {
+    String name = visit(node.variable);
     String function = indentBlock(() => visit(node.definition));
     String body = indentBlock(() => visit(node.body));
-    String name = namer.getName(node.variable.definition);
     return '$indentation(DeclareFunction $name =\n'
            '$function in\n'
            '$body)';
   }
 
   String visitIsTrue(IsTrue node) {
     String value = access(node.value);
     return '(IsTrue $value)';
   }
 
@@ skipping 99 matching lines @@
 class _Namer {
   final Map<Node, String> _names = <Node, String>{};
   int _valueCounter = 0;
   int _continuationCounter = 0;
 
   String nameParameter(Parameter parameter) {
     assert(!_names.containsKey(parameter));
     return _names[parameter] = parameter.hint.name;
   }
 
-  String nameClosureVariable(ClosureVariable variable) {
+  String nameMutableVariable(MutableVariable variable) {
     assert(!_names.containsKey(variable));
     return _names[variable] = variable.hint.name;
   }
 
-  String nameClosureVariableIfAbsent(ClosureVariable variable) {

[karlklose, 2015/02/03 09:56:16]

is this dead code now?

[Kevin Millikin (Google), 2015/02/03 14:11:49]

Yes.

-    if (!_names.containsKey(variable)) {
-      _names[variable] = variable.hint.name;
-    }
-  }
-
   String nameContinuation(Continuation node) {
     assert(!_names.containsKey(node));
     return _names[node] = 'k${_continuationCounter++}';
   }
 
   String nameValue(Primitive node) {
     assert(!_names.containsKey(node));
     return _names[node] = 'v${_valueCounter++}';
   }
 
   void setReturnContinuation(Continuation node) {
     assert(!_names.containsKey(node) || _names[node] == 'return');
     _names[node] = 'return';
   }
 
   String getName(Node node) {
     assert(_names.containsKey(node));
     return _names[node];
   }
 }