Revert "Revert "dart2js: Add a type parameter to class Reference....""

tests/compiler/dart2js/backend_dart/sexpr_unstringifier.dart

Index: tests/compiler/dart2js/backend_dart/sexpr_unstringifier.dart
diff --git a/tests/compiler/dart2js/backend_dart/sexpr_unstringifier.dart b/tests/compiler/dart2js/backend_dart/sexpr_unstringifier.dart
index 5b7e1881747d0474daf9752e2982898dbe82254d..b414c7f084a40eb4092a2136f3caf046958b0468 100644
--- a/tests/compiler/dart2js/backend_dart/sexpr_unstringifier.dart
+++ b/tests/compiler/dart2js/backend_dart/sexpr_unstringifier.dart
@@ -234,16 +234,16 @@ class SExpressionUnstringifier {
     return null;
   }
 
-  /// def1 def2 ... defn cont )
+  /// prim1 prim2 ... primn cont)
   /// Note that cont is *not* included in the returned list and not consumed.
-  List<Definition> parseDefinitionList() {
-    List<Definition> defs = <Definition>[];
+  List<Primitive> parseArgumentList() {
+    List<Primitive> args = <Primitive>[];
     while (tokens.next != ")") {
-      Definition def = name2variable[tokens.read()];
-      assert(def != null);
-      defs.add(def);
+      Primitive prim = name2variable[tokens.read()];
+      assert(prim != null);
+      args.add(prim);
     }
-    return defs;
+    return args;
   }
 
   /// (prim1 prim2 ... primn)
@@ -321,7 +321,7 @@ class SExpressionUnstringifier {
   ConcatenateStrings parseConcatenateStrings() {
     tokens.consumeStart(CONCATENATE_STRINGS);
 
-    List<Definition> args = parseDefinitionList();
+    List<Primitive> args = parseArgumentList();
 
     Continuation cont = name2variable[tokens.read()];
     assert(cont != null);
@@ -360,7 +360,7 @@ class SExpressionUnstringifier {
     dart_types.DartType type = new DummyNamedType(split[0]);
     Element element = new DummyElement((split.length == 1) ? "" : split[1]);
 
-    List<Definition> args = parseDefinitionList();
+    List<Primitive> args = parseArgumentList();
 
     Continuation cont = name2variable[tokens.read()];
     assert(cont != null);
@@ -378,11 +378,11 @@ class SExpressionUnstringifier {
     Continuation cont = name2variable[tokens.read()];
     assert(cont != null);
 
-    List<Definition> args = <Definition>[];
+    List<Primitive> args = <Primitive>[];
     while (tokens.current != ")") {
-      Definition def = name2variable[tokens.read()];
-      assert(def != null);
-      args.add(def);
+      Primitive arg = name2variable[tokens.read()];
+      assert(arg != null);
+      args.add(arg);
     }
 
     tokens.consumeEnd();
@@ -398,7 +398,7 @@ class SExpressionUnstringifier {
 
     String methodName = tokens.read();
 
-    List<Definition> args = parseDefinitionList();
+    List<Primitive> args = parseArgumentList();
 
     Continuation cont = name2variable[tokens.read()];
     assert(cont != null);
@@ -414,7 +414,7 @@ class SExpressionUnstringifier {
 
     String methodName = tokens.read();
 
-    List<Definition> args = parseDefinitionList();
+    List<Primitive> args = parseArgumentList();
 
     Continuation cont = name2variable[tokens.read()];
     assert(cont != null);
@@ -432,7 +432,7 @@ class SExpressionUnstringifier {
 
     String methodName = tokens.read();
 
-    List<Definition> args = parseDefinitionList();
+    List<Primitive> args = parseArgumentList();
 
     Continuation cont = name2variable[tokens.read()];
     assert(cont != null);