Revert "Split TypedSelector into Selector and TypeMask."

tests/compiler/dart2js/patch_test.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.
 
 import 'dart:async';
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
 import "package:compiler/src/dart2jslib.dart";
 import "package:compiler/src/elements/elements.dart";
 import "package:compiler/src/tree/tree.dart";
-import "package:compiler/src/types/types.dart";
 import "mock_compiler.dart";
 import "mock_libraries.dart";
 import 'package:compiler/src/elements/modelx.dart';
 
 Future<Compiler> applyPatch(String script, String patch,
                             {bool analyzeAll: false,
                              bool analyzeOnly: false,
                              bool runCompiler: false,
                              String main: "",
                              String patchVersion}) {
@@ skipping 840 matching lines @@
            checkHasBody: true, expectIsRegular: true);
 
     ensure(compiler, "clear", cls.lookupLocalMember,
            checkHasBody: true, expectIsPatched: true);
 
     compiler.phase = Compiler.PHASE_DONE_RESOLVING;
 
     // Check that a method just in the patch class is a target for a
     // typed selector.
     Selector selector = new Selector.call('method', compiler.coreLibrary, 0);
-    TypeMask typeMask = new TypeMask.exact(cls, world);
+    TypedSelector typedSelector = new TypedSelector.exact(cls, selector, world);
     FunctionElement method = cls.implementation.lookupLocalMember('method');
-    method.computeType(compiler);
+    method.computeSignature(compiler);
     Expect.isTrue(selector.applies(method, world));
-    Expect.isTrue(typeMask.canHit(method, selector, world));
+    Expect.isTrue(typedSelector.applies(method, world));
 
     // Check that the declaration method in the declaration class is a target
     // for a typed selector.
     selector = new Selector.call('clear', compiler.coreLibrary, 0);
-    typeMask = new TypeMask.exact(cls, world);
+    typedSelector = new TypedSelector.exact(cls, selector, world);
     method = cls.lookupLocalMember('clear');
-    method.computeType(compiler);
+    method.computeSignature(compiler);
     Expect.isTrue(selector.applies(method, world));
-    Expect.isTrue(typeMask.canHit(method, selector, world));
+    Expect.isTrue(typedSelector.applies(method, world));
 
     // Check that the declaration method in the declaration class is a target
     // for a typed selector on a subclass.
     cls = ensure(compiler, "B", compiler.coreLibrary.find);
     cls.ensureResolved(compiler);
-    typeMask = new TypeMask.exact(cls, world);
+    typedSelector = new TypedSelector.exact(cls, selector, world);
     Expect.isTrue(selector.applies(method, world));
-    Expect.isTrue(typeMask.canHit(method, selector, world));
+    Expect.isTrue(typedSelector.applies(method, world));
   }));
 }
 
 void testAnalyzeAllInjectedMembers() {
   void expect(String patchText, [expectedWarnings]) {
     if (expectedWarnings == null) expectedWarnings = [];
     if (expectedWarnings is! List) {
       expectedWarnings = <MessageKind>[expectedWarnings];
     }
 
@@ skipping 43 matching lines @@
       B.patchTarget() : super();
       factory B.reflectBack() = B.originTarget;
     }
     """;
 
   asyncTest(() => applyPatch(origin, patch, analyzeAll: true,
                  analyzeOnly: true, runCompiler: true).then((compiler) {
     ClassElement clsA = compiler.coreLibrary.find("A");
     ClassElement clsB = compiler.coreLibrary.find("B");
 
-    ConstructorElement forward = clsA.lookupConstructor("forward");
+    Selector forwardCall = new Selector.callConstructor("forward",
+        compiler.coreLibrary);
+    ConstructorElement forward = clsA.lookupConstructor(forwardCall);
     ConstructorElement target = forward.effectiveTarget;
     Expect.isTrue(target.isPatch);
     Expect.equals("patchTarget", target.name);
 
-    ConstructorElement forwardTwo = clsA.lookupConstructor("forwardTwo");
+    Selector forwardTwoCall = new Selector.callConstructor("forwardTwo",
+        compiler.coreLibrary);
+    ConstructorElement forwardTwo = clsA.lookupConstructor(forwardTwoCall);
     target = forwardTwo.effectiveTarget;
     Expect.isFalse(forwardTwo.isErroneous);
     Expect.isFalse(target.isPatch);
     Expect.equals("originTarget", target.name);
   }));
 }
 
 void testTypecheckPatchedMembers() {
   String originText = "external void method();";
   String patchText = """
@@ skipping 42 matching lines @@
   testPatchNoSetter();
   testPatchNonFunction();
 
   testPatchAndSelector();
 
   testEffectiveTarget(); /// bug: ok
 
   testAnalyzeAllInjectedMembers();
   testTypecheckPatchedMembers();
 }