Replace ResolvedNode by ConstantExpression.

pkg/compiler/lib/src/dart_backend/backend_ast_emitter.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 backend_ast_emitter;
 
 import 'tree_ir_nodes.dart' as tree;
 import 'backend_ast_nodes.dart';
 import '../constants/expressions.dart';
 import '../constants/values.dart';
@@ skipping 690 matching lines @@
     return new TypeAnnotation("dynamic")
         ..dartType = type;
   } else if (type is MalformedType) {
     return new TypeAnnotation(type.name)
         ..dartType = type;
   } else {
     throw "Unsupported type annotation: $type";
   }
 }
 
-class ConstantEmitter extends ConstantExpressionVisitor<Expression> {
+class ConstantEmitter extends ConstantExpressionVisitor<Null, Expression> {
   ASTEmitter parent;
   ConstantEmitter(this.parent);
 
   Expression handlePrimitiveConstant(PrimitiveConstantValue value) {
     // Num constants may be negative, while literals must be non-negative:
     // Literals are non-negative in the specification, and a negated literal
     // parses as a call to unary `-`. The AST unparser assumes literals are
     // non-negative and relies on this to avoid incorrectly generating `--`,
     // the predecrement operator.
     // Translate such constants into their positive value wrapped by
     // the unary minus operator.
     if (value.isNum) {
       NumConstantValue numConstant = value;
       if (numConstant.primitiveValue.isNegative) {
         return negatedLiteral(numConstant);
       }
     }
     return new Literal(value);
   }
 
   @override
-  Expression visitPrimitive(PrimitiveConstantExpression exp) {
+  Expression visitPrimitive(PrimitiveConstantExpression exp, [_]) {
     return handlePrimitiveConstant(exp.value);
   }
 
   /// Given a negative num constant, returns the corresponding positive
   /// literal wrapped by a unary minus operator.
-  Expression negatedLiteral(NumConstantValue constant) {
+  Expression negatedLiteral(NumConstantValue constant, [_]) {
     assert(constant.primitiveValue.isNegative);
     NumConstantValue positiveConstant;
     if (constant.isInt) {
       positiveConstant = new IntConstantValue(-constant.primitiveValue);
     } else if (constant.isDouble) {
       positiveConstant = new DoubleConstantValue(-constant.primitiveValue);
     } else {
       throw "Unexpected type of NumConstant: $constant";
     }
     return new UnaryOperator('-', new Literal(positiveConstant));
   }
 
   @override
-  Expression visitList(ListConstantExpression exp) {
+  Expression visitList(ListConstantExpression exp, [_]) {
     return new LiteralList(
         exp.values.map(visit).toList(growable: false),
         isConst: true,
         typeArgument: parent.emitOptionalType(exp.type.typeArguments.single));
   }
 
   @override
-  Expression visitMap(MapConstantExpression exp) {
+  Expression visitMap(MapConstantExpression exp, [_]) {
     List<LiteralMapEntry> entries = new List<LiteralMapEntry>.generate(
         exp.values.length,
         (i) => new LiteralMapEntry(visit(exp.keys[i]),
                                    visit(exp.values[i])));
     List<TypeAnnotation> typeArguments = exp.type.treatAsRaw
         ? null
         : exp.type.typeArguments.map(createTypeAnnotation).toList();
     return new LiteralMap(entries, isConst: true, typeArguments: typeArguments);
   }
 
   @override
-  Expression visitConstructor(ConstructedConstantExpresssion exp) {
+  Expression visitConstructed(ConstructedConstantExpresssion exp, [_]) {
     int positionalArgumentCount = exp.selector.positionalArgumentCount;
     List<Argument> args = new List<Argument>.generate(
         positionalArgumentCount,
         (i) => visit(exp.arguments[i]));
     for (int i = 0; i < exp.selector.namedArgumentCount; ++i) {
       args.add(new NamedArgument(exp.selector.namedArguments[i],
           visit(exp.arguments[positionalArgumentCount + i])));
     }
 
     FunctionElement constructor = exp.target;
     String name = constructor.name.isEmpty ? null : constructor.name;
     return new CallNew(createTypeAnnotation(exp.type),
                        args,
                        constructorName: name,
                        isConst: true)
                ..constructor = constructor
                ..dartType = exp.type;
   }
 
   @override
-  Expression visitConcatenate(ConcatenateConstantExpression exp) {
+  Expression visitConcatenate(ConcatenateConstantExpression exp, [_]) {
     return new StringConcat(exp.arguments.map(visit).toList(growable: false));
   }
 
   @override
-  Expression visitSymbol(SymbolConstantExpression exp) {
+  Expression visitSymbol(SymbolConstantExpression exp, [_]) {
     return new LiteralSymbol(exp.name);
   }
 
   @override
-  Expression visitType(TypeConstantExpression exp) {
+  Expression visitType(TypeConstantExpression exp, [_]) {
     DartType type = exp.type;
     return new LiteralType(type.name)
                ..type = type;
   }
 
   @override
-  Expression visitVariable(VariableConstantExpression exp) {
+  Expression visitVariable(VariableConstantExpression exp, [_]) {
     Element element = exp.element;
     if (element.kind != ElementKind.VARIABLE) {
       return new Identifier(element.name)..element = element;
     }
     String name = parent.getConstantName(element);
     return new Identifier(name)
                ..element = element;
   }
 
   @override
-  Expression visitFunction(FunctionConstantExpression exp) {
+  Expression visitFunction(FunctionConstantExpression exp, [_]) {
     return new Identifier(exp.element.name)
                ..element = exp.element;
   }
 
   @override
-  Expression visitBinary(BinaryConstantExpression exp) {
+  Expression visitBinary(BinaryConstantExpression exp, [_]) {
     return handlePrimitiveConstant(exp.value);
   }
 
   @override
-  Expression visitConditional(ConditionalConstantExpression exp) {
+  Expression visitConditional(ConditionalConstantExpression exp, [_]) {
     if (exp.condition.value.isTrue) {
       return exp.trueExp.accept(this);
     } else {
       return exp.falseExp.accept(this);
     }
   }
 
   @override
-  Expression visitUnary(UnaryConstantExpression exp) {
+  Expression visitUnary(UnaryConstantExpression exp, [_]) {
     return handlePrimitiveConstant(exp.value);
   }
 }
 
 /// Moves function parameters into a separate variable if one of its uses is
 /// shadowed by an inner function parameter.
 /// This artifact is necessary because function parameters cannot be renamed.
 class UnshadowParameters extends tree.RecursiveVisitor {
 
   /// Maps parameter names to their bindings.
@@ skipping 57 matching lines @@
       : super(name, ElementKind.VARIABLE, enclosingElement, variables, null);
 
   ExecutableElement get executableContext => enclosingElement;
 
   ExecutableElement get memberContext => executableContext.memberContext;
 
   bool get isLocal => true;
 
   LibraryElement get implementationLibrary => enclosingElement.library;
 }