Clean up handling of types.

frog/tests/leg/src/ResolverTest.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("../../../../lib/compiler/implementation/leg.dart");
 #import("../../../../lib/compiler/implementation/elements/elements.dart");
 #import("../../../../lib/compiler/implementation/tree/tree.dart");
 #import("../../../../lib/compiler/implementation/util/util.dart");
 #import("mock_compiler.dart");
 #import("parser_helper.dart");
@@ skipping 41 matching lines @@
   testLocalsOne();
   testLocalsTwo();
   testLocalsThree();
   testLocalsFour();
   testLocalsFive();
   testParametersOne();
   testFor();
   testTypeAnnotation();
   testSuperclass();
   // testVarSuperclass(); // The parser crashes with 'class Foo extends var'.
-  // testOneInterface(); // The parser does not handle interfaces.
-  // testTwoInterfaces(); // The parser does not handle interfaces.
+  // testOneInterface(); // Generates unexpected error message.
+  // testTwoInterfaces(); // Generates unexpected error message.
   testFunctionExpression();
   testNewExpression();
   testTopLevelFields();
   testClassHierarchy();
   testInitializers();
   testThis();
   testSuperCalls();
   testTypeVariables();
 }
 
 testTypeVariables() {
-  testTypeResolving(visitor, text, name, expectedElements) {
+  matchResolvedTypes(visitor, text, name, expectedElements) {
     VariableDefinitions definition = parseStatement(text);
     visitor.visit(definition.type);
     InterfaceType type = visitor.mapping.getType(definition.type);
     Expect.equals(definition.type.typeArguments.length(),
                   length(type.arguments));
     int index = 0;
     Link<Type> arguments = type.arguments;
     while (!arguments.isEmpty()) {
+      Expect.equals(true, index < expectedElements.length);
       Expect.equals(expectedElements[index], arguments.head.element);
       index++;
       arguments = arguments.tail;
     }
+    Expect.equals(index, expectedElements.length);
   }
 
   MockCompiler compiler = new MockCompiler();
   ResolverVisitor visitor = compiler.resolverVisitor();
   compiler.parseScript('class Foo<T, U> {}');
-  visitor.visit(parseStatement('Foo foo;'));
   ClassElement foo = compiler.mainApp.find(buildSourceString('Foo'));
-  testTypeResolving(visitor, 'Foo<int, String> x;', 'Foo',
-                    [compiler.intClass, compiler.stringClass]);
-  testTypeResolving(visitor, 'Foo<Foo, Foo> x;', 'Foo',
-                    [foo, foo]);
+  matchResolvedTypes(visitor, 'Foo<int, String> x;', 'Foo',
+                     [compiler.intClass, compiler.stringClass]);
+  matchResolvedTypes(visitor, 'Foo<Foo, Foo> x;', 'Foo',
+                     [foo, foo]);
 
   compiler = new MockCompiler();
   compiler.parseScript('class Foo<T, U> {}');
   compiler.resolveStatement('Foo<notype, int> x;');
   Expect.equals(1, compiler.warnings.length);
   Expect.equals(MessageKind.CANNOT_RESOLVE_TYPE,
                 compiler.warnings[0].message.kind);
   Expect.equals(0, compiler.errors.length);
 
   compiler = new MockCompiler();
@@ skipping 553 matching lines @@
   script = """class A {
                 int i;
                 A(i);
               }
               class B extends A {
                 B() : super(0), super(1);
               }""";
   resolveConstructor(script, "B b = new B();", "B", "B", 2,
                      [], [MessageKind.DUPLICATE_SUPER_INITIALIZER]);
 
-  script = "class Object { Object() : super(); }";
+  script = "";
+  final String CORELIB_WITH_INVALID_OBJECT =
+      '''print(var obj) {}
+         class int {}
+         class double {}
+         class bool {}
+         class String {}
+         class num {}
+         class Function {}
+         class List {}
+         class Closure {}
+         class Null {}
+         class Dynamic {}
+         class Object { Object() : super(); }''';
   resolveConstructor(script, "Object o = new Object();", "Object", "Object", 1,
                      [], [MessageKind.SUPER_INITIALIZER_IN_OBJECT],
-                     corelib: "");
+                     corelib: CORELIB_WITH_INVALID_OBJECT);
 }
 
 map(ResolverVisitor visitor) {
   TreeElementMapping elements = visitor.mapping;
   return elements.map;
 }
 
 length(Link link) => link.isEmpty() ? 0 : length(link.tail) + 1;
 
 at(Link link, int index) => (index == 0) ? link.head : at(link.tail, index - 1);
 
 List<String> asSortedStrings(Link link) {
   List<String> result = <String>[];
   for (; !link.isEmpty(); link = link.tail) result.add(link.head.toString());
   result.sort((s1, s2) => s1.compareTo(s2));
   return result;
 }