Substitute type variables as type arguments.

tests/lib/mirrors/equality_test.dart

 // Copyright (c) 2013, 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.
 
 // This tests uses the multi-test "ok" feature:
 // none: Trimmed behaviour. Passing on the VM.
 // 01: Trimmed version for dart2js.
 // 02: Full version passing in the VM.
 //
 // TODO(rmacnak,ahe): Remove multi-test when VM and dart2js are on par.
@@ skipping 14 matching lines @@
 }
 
 typedef bool Predicate(Object o);
 Predicate somePredicate;
 
 checkEquality(List<Map> equivalenceClasses) {
   for (var equivalenceClass in equivalenceClasses) {
     equivalenceClass.forEach((name, member) {
       equivalenceClass.forEach((otherName, otherMember) {
         // Reflexivity, symmetry and transitivity.
-        Expect.equals(member, 
+        Expect.equals(member,
                       otherMember,
                       "$name == $otherName");
         Expect.equals(member.hashCode,
                       otherMember.hashCode,
                       "$name.hashCode == $otherName.hashCode");
       });
       for (var otherEquivalenceClass in equivalenceClasses) {
         if (otherEquivalenceClass == equivalenceClass) continue;
         otherEquivalenceClass.forEach((otherName, otherMember) {
           Expect.notEquals(member,
@@ skipping 59 matching lines @@
 
     {'currentMirrorSystem().dynamicType' : currentMirrorSystem().dynamicType,
      'thisLibrary.declarations[#main].returnType' :
           (thisLibrary.declarations[#main] as MethodMirror).returnType},
 
     {'reflectClass(A)' : reflectClass(A),
      'thisLibrary.declarations[#A]' : thisLibrary.declarations[#A],
      'reflect(new A<int>()).type.originalDeclaration' :
           reflect(new A<int>()).type.originalDeclaration},
 
-    {'reflectClass(B).superclass' : reflectClass(B).superclass,  /// 02: ok
-     'reflect(new A<int>()).type' : reflect(new A<int>()).type}, /// 02: ok
+    {'reflectClass(B).superclass' : reflectClass(B).superclass,
+     'reflect(new A<int>()).type' : reflect(new A<int>()).type},
 
     {'reflectClass(B)' : reflectClass(B),
      'thisLibrary.declarations[#B]' : thisLibrary.declarations[#B],
      'reflect(new B()).type' : reflect(new B()).type},
 
-    {'reflectClass(BadEqualityHash).declarations[#==]'  /// 02: ok
-        : reflectClass(BadEqualityHash).declarations[#==],  /// 02: ok
-     'reflect(new BadEqualityHash()).type.declarations[#==]'  /// 02: ok
-        : reflect(new BadEqualityHash()).type.declarations[#==]},  /// 02: ok
+    {'reflectClass(BadEqualityHash).declarations[#==]'
+        : reflectClass(BadEqualityHash).declarations[#==],
+     'reflect(new BadEqualityHash()).type.declarations[#==]'
+        : reflect(new BadEqualityHash()).type.declarations[#==]},
 
-    {'reflectClass(BadEqualityHash).declarations[#==].parameters[0]'  /// 02: ok
-        : (reflectClass(BadEqualityHash).declarations[#==] as MethodMirror).parameters[0],  /// 02: ok
-     'reflect(new BadEqualityHash()).type.declarations[#==].parameters[0]'  /// 02: ok
-        : (reflect(new BadEqualityHash()).type.declarations[#==] as MethodMirror).parameters[0]},  /// 02: ok
+    {'reflectClass(BadEqualityHash).declarations[#==].parameters[0]'
+        : (reflectClass(BadEqualityHash).
+            declarations[#==] as MethodMirror).parameters[0],
+     'reflect(new BadEqualityHash()).type.declarations[#==].parameters[0]'
+        : (reflect(new BadEqualityHash()).type.
+            declarations[#==] as MethodMirror).parameters[0]},
 
-    {'reflectClass(BadEqualityHash).declarations[#count]'  /// 02: ok
-        : reflectClass(BadEqualityHash).declarations[#count],  /// 02: ok
-     'reflect(new BadEqualityHash()).type.declarations[#count]'  /// 02: ok
-        : reflect(new BadEqualityHash()).type.declarations[#count]},  /// 02: ok
+    {'reflectClass(BadEqualityHash).declarations[#count]'
+        : reflectClass(BadEqualityHash).declarations[#count],
+     'reflect(new BadEqualityHash()).type.declarations[#count]'
+        : reflect(new BadEqualityHash()).type.declarations[#count]},
 
     {'reflectType(Predicate)' : reflectType(Predicate),  /// 02: ok
      'thisLibrary.declarations[#somePredicate].type'  /// 02: ok
         : (thisLibrary.declarations[#somePredicate] as VariableMirror).type},  /// 02: ok
 
     {'reflectType(Predicate).referent' : (reflectType(Predicate) as TypedefMirror).referent,  /// 02: ok
      'thisLibrary.declarations[#somePredicate].type.referent'  /// 02: ok
         : ((thisLibrary.declarations[#somePredicate] as VariableMirror).type as TypedefMirror).referent},  /// 02: ok
 
-    {'reflectClass(A).typeVariables.single'  /// 02: ok
-        : reflectClass(A).typeVariables.single,  /// 02: ok
-     'reflect(new A<int>()).type.originalDeclaration.typeVariables.single'  /// 02: ok
-        : reflect(new A<int>()).type.originalDeclaration.typeVariables.single},  /// 02: ok
+    {'reflectClass(A).typeVariables.single'
+        : reflectClass(A).typeVariables.single,
+     'reflect(new A<int>()).type.originalDeclaration.typeVariables.single'
+        : reflect(new A<int>()).type.originalDeclaration.typeVariables.single},
 
     {'currentMirrorSystem()' : currentMirrorSystem()},
 
     {'currentMirrorSystem().isolate' : currentMirrorSystem().isolate},
 
     {'thisLibrary' : thisLibrary,
      'reflectClass(A).owner' : reflectClass(A).owner,
      'reflectClass(B).owner' : reflectClass(B).owner,
      'reflect(new A()).type.owner' : reflect(new A()).type.owner,
      'reflect(new B()).type.owner' : reflect(new B()).type.owner},
   ]);
-}
+}