Handle more constants in Constantifier

pkg/compiler/lib/src/constants/constructors.dart

 // Copyright (c) 2015, 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.constants.constructors;
 
 import '../elements/entities.dart' show FieldEntity;
 import '../elements/types.dart';
 import '../universe/call_structure.dart' show CallStructure;
 import '../util/util.dart';
 import 'evaluation.dart';
 import 'expressions.dart';
 
 enum ConstantConstructorKind {
   GENERATIVE,
   REDIRECTING_GENERATIVE,
   REDIRECTING_FACTORY,
 }
 
 /// Definition of a constant constructor.
 abstract class ConstantConstructor {
   ConstantConstructorKind get kind;
 
   /// Computes the type of the instance created in a const constructor
   /// invocation with type [newType].
   InterfaceType computeInstanceType(
-      Environment environment, InterfaceType newType);
+      EvaluationEnvironment environment, InterfaceType newType);
 
   /// Computes the constant expressions of the fields of the created instance
   /// in a const constructor invocation with [arguments].
   Map<FieldEntity, ConstantExpression> computeInstanceFields(
-      Environment environment,
+      EvaluationEnvironment environment,
       List<ConstantExpression> arguments,
       CallStructure callStructure);
 
   accept(ConstantConstructorVisitor visitor, arg);
 }
 
 abstract class ConstantConstructorVisitor<R, A> {
   const ConstantConstructorVisitor();
 
   R visit(ConstantConstructor constantConstructor, A context) {
@@ skipping 13 matching lines @@
   final Map<dynamic /*int|String*/, ConstantExpression> defaultValues;
   final Map<FieldEntity, ConstantExpression> fieldMap;
   final ConstructedConstantExpression superConstructorInvocation;
 
   GenerativeConstantConstructor(this.type, this.defaultValues, this.fieldMap,
       this.superConstructorInvocation);
 
   ConstantConstructorKind get kind => ConstantConstructorKind.GENERATIVE;
 
   InterfaceType computeInstanceType(
-      Environment environment, InterfaceType newType) {
+      EvaluationEnvironment environment, InterfaceType newType) {
     return environment.substByContext(type, newType);
   }
 
   Map<FieldEntity, ConstantExpression> computeInstanceFields(
-      Environment environment,
+      EvaluationEnvironment environment,
       List<ConstantExpression> arguments,
       CallStructure callStructure) {
     NormalizedArguments args =
         new NormalizedArguments(defaultValues, callStructure, arguments);
     Map<FieldEntity, ConstantExpression> appliedFieldMap =
         applyFields(environment, args, superConstructorInvocation);
     fieldMap.forEach((FieldEntity field, ConstantExpression constant) {
       appliedFieldMap[field] = constant.apply(args);
     });
     return appliedFieldMap;
@@ skipping 42 matching lines @@
         return false;
       }
     }
     return true;
   }
 
   /// Creates the field-to-constant map from applying [args] to
   /// [constructorInvocation]. If [constructorInvocation] is `null`, an empty
   /// map is created.
   static Map<FieldEntity, ConstantExpression> applyFields(
-      Environment environment,
+      EvaluationEnvironment environment,
       NormalizedArguments args,
       ConstructedConstantExpression constructorInvocation) {
     Map<FieldEntity, ConstantExpression> appliedFieldMap =
         <FieldEntity, ConstantExpression>{};
     if (constructorInvocation != null) {
       Map<FieldEntity, ConstantExpression> fieldMap =
           constructorInvocation.computeInstanceFields(environment);
       fieldMap.forEach((FieldEntity field, ConstantExpression constant) {
         appliedFieldMap[field] = constant.apply(args);
       });
     }
     return appliedFieldMap;
   }
 }
 
 /// A redirecting generative constant constructor.
 class RedirectingGenerativeConstantConstructor implements ConstantConstructor {
   final Map<dynamic /*int|String*/, ConstantExpression> defaultValues;
   final ConstructedConstantExpression thisConstructorInvocation;
 
   RedirectingGenerativeConstantConstructor(
       this.defaultValues, this.thisConstructorInvocation);
 
   ConstantConstructorKind get kind {
     return ConstantConstructorKind.REDIRECTING_GENERATIVE;
   }
 
   InterfaceType computeInstanceType(
-      Environment environment, InterfaceType newType) {
+      EvaluationEnvironment environment, InterfaceType newType) {
     return environment.substByContext(
         thisConstructorInvocation.computeInstanceType(environment), newType);
   }
 
   Map<FieldEntity, ConstantExpression> computeInstanceFields(
-      Environment environment,
+      EvaluationEnvironment environment,
       List<ConstantExpression> arguments,
       CallStructure callStructure) {
     NormalizedArguments args =
         new NormalizedArguments(defaultValues, callStructure, arguments);
     Map<FieldEntity, ConstantExpression> appliedFieldMap =
         GenerativeConstantConstructor.applyFields(
             environment, args, thisConstructorInvocation);
     return appliedFieldMap;
   }
 
@@ skipping 30 matching lines @@
 class RedirectingFactoryConstantConstructor implements ConstantConstructor {
   final ConstructedConstantExpression targetConstructorInvocation;
 
   RedirectingFactoryConstantConstructor(this.targetConstructorInvocation);
 
   ConstantConstructorKind get kind {
     return ConstantConstructorKind.REDIRECTING_FACTORY;
   }
 
   InterfaceType computeInstanceType(
-      Environment environment, InterfaceType newType) {
+      EvaluationEnvironment environment, InterfaceType newType) {
     return environment.substByContext(
         targetConstructorInvocation.computeInstanceType(environment), newType);
   }
 
   Map<FieldEntity, ConstantExpression> computeInstanceFields(
-      Environment environment,
+      EvaluationEnvironment environment,
       List<ConstantExpression> arguments,
       CallStructure callStructure) {
     ConstantConstructor constantConstructor =
         environment.getConstructorConstant(targetConstructorInvocation.target);
     return constantConstructor.computeInstanceFields(
         environment, arguments, callStructure);
   }
 
   accept(ConstantConstructorVisitor visitor, arg) {
     return visitor.visitRedirectingFactory(this, arg);
@@ skipping 10 matching lines @@
   }
 
   String toString() {
     StringBuffer sb = new StringBuffer();
     sb.write("{");
     sb.write("'constructor': ${targetConstructorInvocation.toDartText()}");
     sb.write("}");
     return sb.toString();
   }
 }