dart2dart: Support for inner functions in new IR.

sdk/lib/_internal/compiler/implementation/dart_backend/tree_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 dart_backend.tracer;
 
 import 'dart:async' show EventSink;
 import '../tracer.dart';
 import 'dart_tree.dart';
 
@@ skipping 117 matching lines @@
     visitStatement(node.next);
 
     ifTargets[node.body] = bodyBlock;
     ifTargets[node.next] = nextBlock;
   }
 
   visitExpressionStatement(ExpressionStatement node) {
     _addStatement(node);
     visitStatement(node.next);
   }
+
+  visitFunctionDeclaration(FunctionDeclaration node) {
+    _addStatement(node);
+    visitStatement(node.next);
+  }
 }
 
 class TreeTracer extends TracerUtil with StatementVisitor {
   final EventSink<String> output;
 
   TreeTracer(this.output);
 
   Names names;
   BlockCollector collector;
   int statementCounter;
@@ skipping 95 matching lines @@
     String nextTarget = collector.ifTargets[node.next].name;
     printStatement(null, "while ${expr(node.condition)}");
     printStatement(null, "do $bodyTarget");
     printStatement(null, "then $nextTarget" );
   }
 
   visitExpressionStatement(ExpressionStatement node) {
     printStatement(null, expr(node.expression));
   }
 
+  visitFunctionDeclaration(FunctionDeclaration node) {
+    printStatement(null, 'function ${node.definition.element.name}');
+  }
+
   String expr(Expression e) {
     return e.accept(new SubexpressionVisitor(names));
   }
 }
 
 class SubexpressionVisitor extends ExpressionVisitor<String> {
   Names names;
 
   SubexpressionVisitor(this.names);
 
@@ skipping 68 matching lines @@
 
   String visitConstant(Constant node) {
     return "${node.value}";
   }
 
   String visitThis(This node) {
     return "this";
   }
 
   String visitReifyTypeVar(ReifyTypeVar node) {
-    return "typevar [${node.element.name}]";
+    return "typevar [${node.typeVariable.name}]";
   }
 
   bool usesInfixNotation(Expression node) {
     return node is Conditional || node is LogicalOperator;
   }
 
   String visitConditional(Conditional node) {
     String condition = visitExpression(node.condition);
     String thenExpr = visitExpression(node.thenExpression);
     String elseExpr = visitExpression(node.elseExpression);
@@ skipping 19 matching lines @@
   }
 
   String visitNot(Not node) {
     String operand = visitExpression(node.operand);
     if (usesInfixNotation(node.operand)) {
       operand = '($operand)';
     }
     return '!$operand';
   }
 
+  String visitFunctionExpression(FunctionExpression node) {
+    return "function ${node.definition.element.name}";
+  }
+
 }
 
 /**
  * Invents (and remembers) names for Variables that do not have an associated
  * identifier.
  *
  * In case a variable is named v0, v1, etc, it may be assigned a different
  * name to avoid clashing with a previously synthesized variable name.
  */
 class Names {
   final Map<Variable, String> _names = {};
   final Set<String> _usedNames = new Set();
   int _counter = 0;
 
   String varName(Variable v) {
     String name = _names[v];
     if (name == null) {
       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;
   }
 }