Refactor ConstantSystem

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

 // Copyright (c) 2012, 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.constant_system;
 
-import '../compiler.dart' show Compiler;

[Siggi Cherem (dart-lang), 2017/02/09 20:20:29]

one less, woo hoo! :)

-import '../elements/resolution_types.dart';
+import '../common/backend_api.dart' show BackendClasses;
+import '../core_types.dart' show CommonElements;
+import '../elements/resolution_types.dart' show DartTypes;
+import '../elements/types.dart';
 import '../resolution/operators.dart';
 import '../tree/dartstring.dart' show DartString;
 import 'values.dart';
 
 abstract class Operation {
   String get name;
 }
 
 abstract class UnaryOperation extends Operation {
   /** Returns [:null:] if it was unable to fold the operation. */
@@ skipping 38 matching lines @@
   BinaryOperation get codeUnitAt;
   UnaryOperation get round;
 
   const ConstantSystem();
 
   ConstantValue createInt(int i);
   ConstantValue createDouble(double d);
   ConstantValue createString(DartString string);
   ConstantValue createBool(bool value);
   ConstantValue createNull();
-  ConstantValue createList(
-      ResolutionInterfaceType type, List<ConstantValue> values);
-  // TODO(johnniwinther): Remove the need for [compiler].
-  ConstantValue createMap(Compiler compiler, ResolutionInterfaceType type,
-      List<ConstantValue> keys, List<ConstantValue> values);
-  // TODO(johnniwinther): Remove the need for [compiler].
-  ConstantValue createType(Compiler compiler, ResolutionDartType type);
-  // TODO(johnniwinther): Remove the need for [compiler].
-  ConstantValue createSymbol(Compiler compiler, String text);
+  ConstantValue createList(InterfaceType type, List<ConstantValue> values);
+  ConstantValue createMap(
+      CommonElements commonElements,
+      BackendClasses backendClasses,
+      InterfaceType type,
+      List<ConstantValue> keys,
+      List<ConstantValue> values);
+  ConstantValue createType(CommonElements commonElements,
+      BackendClasses backendClasses, DartType type);
+  ConstantValue createSymbol(CommonElements commonElements,
+      BackendClasses backendClasses, String text);
 
   // We need to special case the subtype check for JavaScript constant
   // system because an int is a double at runtime.
-  bool isSubtype(DartTypes types, ResolutionDartType s, ResolutionDartType t);
+  bool isSubtype(DartTypes types, DartType s, DartType t);
 
   /** Returns true if the [constant] is an integer at runtime. */
   bool isInt(ConstantValue constant);
   /** Returns true if the [constant] is a double at runtime. */
   bool isDouble(ConstantValue constant);
   /** Returns true if the [constant] is a string at runtime. */
   bool isString(ConstantValue constant);
   /** Returns true if the [constant] is a boolean at runtime. */
   bool isBool(ConstantValue constant);
   /** Returns true if the [constant] is null at runtime. */
@@ skipping 50 matching lines @@
         return greaterEqual;
       case BinaryOperatorKind.EQ:
         return equal;
       case BinaryOperatorKind.IF_NULL:
         return ifNull;
       default:
         return null;
     }
   }
 }