Extract CallStructure from Selector.

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

Index: pkg/compiler/lib/src/constants/expressions.dart
diff --git a/pkg/compiler/lib/src/constants/expressions.dart b/pkg/compiler/lib/src/constants/expressions.dart
index 7d89c7f602bb2993719af31a6f934e74f9b92ad8..c24b66dc1785038c99f3548685b6c9ed596e9163 100644
--- a/pkg/compiler/lib/src/constants/expressions.dart
+++ b/pkg/compiler/lib/src/constants/expressions.dart
@@ -10,7 +10,7 @@ import '../elements/elements.dart' show
     Element,
     FunctionElement,
     VariableElement;
-import '../universe/universe.dart' show Selector;
+import '../universe/universe.dart' show CallStructure;
 import 'values.dart';
 
 /// An expression that is a compile-time constant.
@@ -101,14 +101,15 @@ class ConstructedConstantExpression extends ConstantExpression {
   final ConstantValue value;
   final InterfaceType type;
   final FunctionElement target;
-  final Selector selector;
+  final CallStructure callStructure;
   final List<ConstantExpression> arguments;
 
-  ConstructedConstantExpression(this.value,
-                      this.type,
-                      this.target,
-                      this.selector,
-                      this.arguments) {
+  ConstructedConstantExpression(
+      this.value,
+      this.type,
+      this.target,
+      this.callStructure,
+      this.arguments) {
     assert(type.element == target.enclosingClass);
   }
 
@@ -378,7 +379,7 @@ class ConstExpPrinter extends ConstantExpressionVisitor {
     sb.write('(');
     bool needsComma = false;
 
-    int namedOffset = exp.selector.positionalArgumentCount;
+    int namedOffset = exp.callStructure.positionalArgumentCount;
     for (int index = 0; index < namedOffset; index++) {
       if (needsComma) {
         sb.write(', ');
@@ -386,11 +387,11 @@ class ConstExpPrinter extends ConstantExpressionVisitor {
       visit(exp.arguments[index]);
       needsComma = true;
     }
-    for (int index = 0; index < exp.selector.namedArgumentCount; index++) {
+    for (int index = 0; index < exp.callStructure.namedArgumentCount; index++) {
       if (needsComma) {
         sb.write(', ');
       }
-      sb.write(exp.selector.namedArguments[index]);
+      sb.write(exp.callStructure.namedArguments[index]);
       sb.write(': ');
       visit(exp.arguments[namedOffset + index]);
       needsComma = true;