Clean up handling of types.

frog/tests/leg/src/TypeCheckerTest.dart

 // Copyright (c) 2011, 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("../../../../lib/compiler/implementation/leg.dart");
 #import("../../../../lib/compiler/implementation/elements/elements.dart");
 #import("../../../../lib/compiler/implementation/tree/tree.dart");
 #import('../../../../lib/compiler/implementation/scanner/scannerlib.dart');
 #import("../../../../lib/compiler/implementation/util/util.dart");
 #import("mock_compiler.dart");
@@ skipping 377 matching lines @@
 String returnWithType(String type, expression) {
   return "$type foo() { return $expression; }";
 }
 
 Node parseExpression(String text) =>
   parseBodyCode(text, (parser, token) => parser.parseExpression(token));
 
 void setup() {
   compiler = new MockCompiler();
   types = compiler.types;
-  intType = lookupType(Types.INT, compiler, types);
-  doubleType = lookupType(Types.DOUBLE, compiler, types);
-  boolType = lookupType(Types.BOOL, compiler, types);
-  stringType = lookupType(Types.STRING, compiler, types);
-  objectType = lookupType(Types.OBJECT, compiler, types);
+  intType = compiler.intClass.computeType(compiler);
+  doubleType = compiler.doubleClass.computeType(compiler);
+  boolType = compiler.boolClass.computeType(compiler);
+  stringType = compiler.stringClass.computeType(compiler);
+  objectType = compiler.objectClass.computeType(compiler);
 }
 
 Type analyzeType(String text) {
   var node = parseExpression(text);
   TypeCheckerVisitor visitor =
       new TypeCheckerVisitor(compiler, new TreeElementMapping(), types);
   return visitor.analyze(node);
 }
 
 analyzeTopLevel(String text, [expectedWarnings]) {
@@ skipping 44 matching lines @@
   parser.parseStatement(tokens);
   Node node = listener.popNode();
   TreeElements elements = compiler.resolveNodeStatement(node, classElement);
   TypeCheckerVisitor checker = new TypeCheckerVisitor(compiler, elements,
                                                                 types);
   compiler.clearWarnings();
   checker.currentClass = classElement;
   checker.analyze(node);
   compareWarningKinds(text, expectedWarnings, compiler.warnings);
 }