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

tests/compiler/dart2js/backend_dart/sexpr_unstringifier.dart

 // Copyright (c) 2014, 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.
 
 // SExpressionUnstringifier implements the inverse operation to
 // [SExpressionStringifier].
 
 library sexpr_unstringifier;
 
 import 'package:compiler/src/constants/expressions.dart'
@@ skipping 216 matching lines @@
         return parseSetClosureVariable();
       case TYPE_OPERATOR:
         return parseTypeOperator();
       default:
         assert(false);
     }
 
     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)
   List<Primitive> parsePrimitiveList() {
     tokens.consumeStart();
     List<Primitive> prims = <Primitive>[];
     while (tokens.current != ")") {
       Primitive prim = name2variable[tokens.read()];
       assert(prim != null);
       prims.add(prim);
@@ skipping 57 matching lines @@
     assert(trueCont != null && falseCont != null);
 
     tokens.consumeEnd();
     return new Branch(cond, trueCont, falseCont);
   }
 
   /// (ConcatenateStrings args cont)
   ConcatenateStrings parseConcatenateStrings() {
     tokens.consumeStart(CONCATENATE_STRINGS);
 
-    List<Definition> args = parseDefinitionList();
+    List<Primitive> args = parseArgumentList();
 
     Continuation cont = name2variable[tokens.read()];
     assert(cont != null);
 
     tokens.consumeEnd();
     return new ConcatenateStrings(cont, args);
   }
 
   /// (DeclareFunction name = function in body)
   DeclareFunction parseDeclareFunction() {
@@ skipping 18 matching lines @@
   InvokeConstructor parseInvokeConstructor() {
     tokens.consumeStart(INVOKE_CONSTRUCTOR);
 
     String constructorName = tokens.read();
     List<String> split = constructorName.split(".");
     assert(split.length < 3);
 
     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);
 
     tokens.consumeEnd();
     Selector selector = dummySelector(constructorName, args.length);
     return new InvokeConstructor(type, element, selector, cont, args);
   }
 
   /// (InvokeContinuation name args)
   InvokeContinuation parseInvokeContinuation(bool recursive) {
     tokens.consumeStart(recursive
         ? INVOKE_CONTINUATION_RECURSIVE : INVOKE_CONTINUATION);
 
     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();
     return new InvokeContinuation(cont, args, recursive: recursive);
   }
 
   /// (InvokeMethod receiver method args cont)
   InvokeMethod parseInvokeMethod() {
     tokens.consumeStart(INVOKE_METHOD);
 
     Definition receiver = name2variable[tokens.read()];
     assert(receiver != null);
 
     String methodName = tokens.read();
 
-    List<Definition> args = parseDefinitionList();
+    List<Primitive> args = parseArgumentList();
 
     Continuation cont = name2variable[tokens.read()];
     assert(cont != null);
 
     tokens.consumeEnd();
     Selector selector = dummySelector(methodName, args.length);
     return new InvokeMethod(receiver, selector, cont, args);
   }
 
   /// (InvokeStatic method args cont)
   InvokeStatic parseInvokeStatic() {
     tokens.consumeStart(INVOKE_STATIC);
 
     String methodName = tokens.read();
 
-    List<Definition> args = parseDefinitionList();
+    List<Primitive> args = parseArgumentList();
 
     Continuation cont = name2variable[tokens.read()];
     assert(cont != null);
 
     Entity entity = new DummyEntity(methodName);
     Selector selector = dummySelector(methodName, args.length);
 
     tokens.consumeEnd();
     return new InvokeStatic(entity, selector, cont, args);
   }
 
   /// (InvokeSuperMethod method args cont)
   InvokeSuperMethod parseInvokeSuperMethod() {
     tokens.consumeStart(INVOKE_SUPER_METHOD);
 
     String methodName = tokens.read();
 
-    List<Definition> args = parseDefinitionList();
+    List<Primitive> args = parseArgumentList();
 
     Continuation cont = name2variable[tokens.read()];
     assert(cont != null);
 
     tokens.consumeEnd();
     Selector selector = dummySelector(methodName, args.length);
     return new InvokeSuperMethod(selector, cont, args);
   }
 
   /// (LetCont (cont args) (cont_body)) body
@@ skipping 232 matching lines @@
     return new ReifyTypeVar(type);
   }
 
   /// (This)
   This parseThis() {
     tokens.consumeStart(THIS);
     tokens.consumeEnd();
     return new This();
   }
 }