Reifier hookup

test/dart_codegen/expect/async/stream.dart

Index: test/dart_codegen/expect/async/stream.dart
diff --git a/test/dart_codegen/expect/async/stream.dart b/test/dart_codegen/expect/async/stream.dart
index 014812ed67fe24c7d7bd25bbfe019f11b8d3c05e..443c2592826360d3ac54ce9d7a26d298cfba9bb9 100644
--- a/test/dart_codegen/expect/async/stream.dart
+++ b/test/dart_codegen/expect/async/stream.dart
@@ -17,9 +17,9 @@ part of dart.async;
   return new _GeneratedStreamImpl<T>(() => new _IterablePendingEvents<T>(data));
   }
  factory Stream.periodic(Duration period, [T computation(int computationCount)]) {
-  if (computation == null) computation = ((__x23) => DEVC$RT.cast(__x23, __t21, DEVC$RT.type((__t19<T> _) {
+  if (computation == null) computation = ((__x23) => DEVC$RT.cast(__x23, __CastType21, DEVC$RT.type((__CastType19<T> _) {
     }
-  ), "CompositeCast", """line 126, column 44 of dart:async/stream.dart: """, __x23 is __t19<T>, false))(((i) => null));
+  ), "CompositeCast", """line 126, column 44 of dart:async/stream.dart: """, __x23 is __CastType19<T>, false))(((i) => null));
    Timer timer;
    int computationCount = 0;
    StreamController<T> controller;
@@ -62,7 +62,7 @@ part of dart.async;
    return controller.stream;
   }
  factory Stream.eventTransformed(Stream source, EventSink mapSink(EventSink<T> sink)) {
-  return new _BoundSinkStream<dynamic, T>(source, DEVC$RT.cast(mapSink, DEVC$RT.type((__t24<T> _) {
+  return new _BoundSinkStream<dynamic, T>(source, DEVC$RT.cast(mapSink, DEVC$RT.type((__CastType24<T> _) {
     }
   ), DEVC$RT.type((_SinkMapper<dynamic, dynamic> _) {
     }
@@ -72,11 +72,11 @@ part of dart.async;
  Stream<T> asBroadcastStream({
   void onListen(StreamSubscription<T> subscription), void onCancel(StreamSubscription<T> subscription)}
 ) {
-  return new _AsBroadcastStream<T>(this, DEVC$RT.cast(onListen, DEVC$RT.type((__t28<T> _) {
+  return new _AsBroadcastStream<T>(this, DEVC$RT.cast(onListen, DEVC$RT.type((__CastType28<T> _) {
     }
-  ), __t26, "CompositeCast", """line 248, column 44 of dart:async/stream.dart: """, onListen is __t26, false), DEVC$RT.cast(onCancel, DEVC$RT.type((__t28<T> _) {
+  ), __CastType26, "CompositeCast", """line 248, column 44 of dart:async/stream.dart: """, onListen is __CastType26, false), DEVC$RT.cast(onCancel, DEVC$RT.type((__CastType28<T> _) {
     }
-  ), __t26, "CompositeCast", """line 248, column 54 of dart:async/stream.dart: """, onCancel is __t26, false));
+  ), __CastType26, "CompositeCast", """line 248, column 54 of dart:async/stream.dart: """, onCancel is __CastType26, false));
   }
  StreamSubscription<T> listen(void onData(T event), {
   Function onError, void onDone(), bool cancelOnError}
@@ -196,7 +196,7 @@ part of dart.async;
       _runUserCode(() => combine(value, element), (T newValue) {
         value = newValue;
         }
-      , ((__x33) => DEVC$RT.cast(__x33, dynamic, __t30, "CompositeCast", """line 501, column 24 of dart:async/stream.dart: """, __x33 is __t30, false))(_cancelAndErrorClosure(subscription, result)));
+      , ((__x33) => DEVC$RT.cast(__x33, dynamic, __CastType30, "CompositeCast", """line 501, column 24 of dart:async/stream.dart: """, __x33 is __CastType30, false))(_cancelAndErrorClosure(subscription, result)));
       }
      else {
       value = element;
@@ -227,7 +227,7 @@ part of dart.async;
     _runUserCode(() => combine(value, element), (newValue) {
       value = newValue;
       }
-    , ((__x34) => DEVC$RT.cast(__x34, dynamic, __t30, "CompositeCast", """line 534, column 11 of dart:async/stream.dart: """, __x34 is __t30, false))(_cancelAndErrorClosure(subscription, result)));
+    , ((__x34) => DEVC$RT.cast(__x34, dynamic, __CastType30, "CompositeCast", """line 534, column 11 of dart:async/stream.dart: """, __x34 is __CastType30, false))(_cancelAndErrorClosure(subscription, result)));
     }
   , onError: (e, st) {
     result._completeError(e, DEVC$RT.cast(st, dynamic, StackTrace, "DynamicCast", """line 538, column 34 of dart:async/stream.dart: """, st is StackTrace, true));
@@ -273,7 +273,7 @@ part of dart.async;
         _cancelAndValue(subscription, future, true);
         }
       }
-    , ((__x35) => DEVC$RT.cast(__x35, dynamic, __t30, "CompositeCast", """line 602, column 13 of dart:async/stream.dart: """, __x35 is __t30, false))(_cancelAndErrorClosure(subscription, future)));
+    , ((__x35) => DEVC$RT.cast(__x35, dynamic, __CastType30, "CompositeCast", """line 602, column 13 of dart:async/stream.dart: """, __x35 is __CastType30, false))(_cancelAndErrorClosure(subscription, future)));
     }
   , onError: future._completeError, onDone: () {
     future._complete(false);
@@ -287,7 +287,7 @@ part of dart.async;
    subscription = this.listen((T element) {
     _runUserCode(() => action(element), (_) {
       }
-    , ((__x36) => DEVC$RT.cast(__x36, dynamic, __t30, "CompositeCast", """line 628, column 13 of dart:async/stream.dart: """, __x36 is __t30, false))(_cancelAndErrorClosure(subscription, future)));
+    , ((__x36) => DEVC$RT.cast(__x36, dynamic, __CastType30, "CompositeCast", """line 628, column 13 of dart:async/stream.dart: """, __x36 is __CastType30, false))(_cancelAndErrorClosure(subscription, future)));
     }
   , onError: future._completeError, onDone: () {
     future._complete(null);
@@ -304,7 +304,7 @@ part of dart.async;
         _cancelAndValue(subscription, future, false);
         }
       }
-    , ((__x37) => DEVC$RT.cast(__x37, dynamic, __t30, "CompositeCast", """line 657, column 13 of dart:async/stream.dart: """, __x37 is __t30, false))(_cancelAndErrorClosure(subscription, future)));
+    , ((__x37) => DEVC$RT.cast(__x37, dynamic, __CastType30, "CompositeCast", """line 657, column 13 of dart:async/stream.dart: """, __x37 is __CastType30, false))(_cancelAndErrorClosure(subscription, future)));
     }
   , onError: future._completeError, onDone: () {
     future._complete(true);
@@ -321,7 +321,7 @@ part of dart.async;
         _cancelAndValue(subscription, future, true);
         }
       }
-    , ((__x38) => DEVC$RT.cast(__x38, dynamic, __t30, "CompositeCast", """line 694, column 13 of dart:async/stream.dart: """, __x38 is __t30, false))(_cancelAndErrorClosure(subscription, future)));
+    , ((__x38) => DEVC$RT.cast(__x38, dynamic, __CastType30, "CompositeCast", """line 694, column 13 of dart:async/stream.dart: """, __x38 is __CastType30, false))(_cancelAndErrorClosure(subscription, future)));
     }
   , onError: future._completeError, onDone: () {
     future._complete(false);
@@ -475,7 +475,7 @@ part of dart.async;
         _cancelAndValue(subscription, future, value);
         }
       }
-    , ((__x39) => DEVC$RT.cast(__x39, dynamic, __t30, "CompositeCast", """line 1036, column 11 of dart:async/stream.dart: """, __x39 is __t30, false))(_cancelAndErrorClosure(subscription, future)));
+    , ((__x39) => DEVC$RT.cast(__x39, dynamic, __CastType30, "CompositeCast", """line 1036, column 11 of dart:async/stream.dart: """, __x39 is __CastType30, false))(_cancelAndErrorClosure(subscription, future)));
     }
   , onError: future._completeError, onDone: () {
     if (defaultValue != null) {
@@ -505,7 +505,7 @@ part of dart.async;
          result = value;
         }
       }
-    , ((__x40) => DEVC$RT.cast(__x40, dynamic, __t30, "CompositeCast", """line 1077, column 11 of dart:async/stream.dart: """, __x40 is __t30, false))(_cancelAndErrorClosure(subscription, future)));
+    , ((__x40) => DEVC$RT.cast(__x40, dynamic, __CastType30, "CompositeCast", """line 1077, column 11 of dart:async/stream.dart: """, __x40 is __CastType30, false))(_cancelAndErrorClosure(subscription, future)));
     }
   , onError: future._completeError, onDone: () {
     if (foundResult) {
@@ -544,7 +544,7 @@ part of dart.async;
          result = value;
         }
       }
-    , ((__x41) => DEVC$RT.cast(__x41, dynamic, __t30, "CompositeCast", """line 1129, column 11 of dart:async/stream.dart: """, __x41 is __t30, false))(_cancelAndErrorClosure(subscription, future)));
+    , ((__x41) => DEVC$RT.cast(__x41, dynamic, __CastType30, "CompositeCast", """line 1129, column 11 of dart:async/stream.dart: """, __x41 is __CastType30, false))(_cancelAndErrorClosure(subscription, future)));
     }
   , onError: future._completeError, onDone: () {
     if (foundResult) {
@@ -588,13 +588,13 @@ part of dart.async;
    void onData(T event) {
     timer.cancel();
      controller.add(event);
-     timer = zone.createTimer(timeLimit, DEVC$RT.cast(timeout, Function, __t42, "CompositeCast", """line 1219, column 43 of dart:async/stream.dart: """, timeout is __t42, false));
+     timer = zone.createTimer(timeLimit, DEVC$RT.cast(timeout, Function, __CastType42, "CompositeCast", """line 1219, column 43 of dart:async/stream.dart: """, timeout is __CastType42, false));
     }
    void onError(error, StackTrace stackTrace) {
     timer.cancel();
      assert (controller is _StreamController || controller is _BroadcastStreamController); var eventSink = controller;
      eventSink._addError(error, stackTrace);
-     timer = zone.createTimer(timeLimit, DEVC$RT.cast(timeout, Function, __t42, "CompositeCast", """line 1227, column 43 of dart:async/stream.dart: """, timeout is __t42, false));
+     timer = zone.createTimer(timeLimit, DEVC$RT.cast(timeout, Function, __CastType42, "CompositeCast", """line 1227, column 43 of dart:async/stream.dart: """, timeout is __CastType42, false));
     }
    void onDone() {
     timer.cancel();
@@ -609,7 +609,7 @@ part of dart.async;
       ;
       }
      else {
-      onTimeout = ((__x45) => DEVC$RT.cast(__x45, ZoneUnaryCallback, __t43, "CompositeCast", """line 1245, column 21 of dart:async/stream.dart: """, __x45 is __t43, false))(zone.registerUnaryCallback(onTimeout));
+      onTimeout = ((__x45) => DEVC$RT.cast(__x45, ZoneUnaryCallback, __CastType43, "CompositeCast", """line 1245, column 21 of dart:async/stream.dart: """, __x45 is __CastType43, false))(zone.registerUnaryCallback(onTimeout));
        _ControllerEventSinkWrapper wrapper = new _ControllerEventSinkWrapper(null);
        timeout = () {
         wrapper._sink = controller;
@@ -619,7 +619,7 @@ part of dart.async;
       ;
       }
      subscription = this.listen(onData, onError: onError, onDone: onDone);
-     timer = zone.createTimer(timeLimit, DEVC$RT.cast(timeout, Function, __t42, "CompositeCast", """line 1256, column 43 of dart:async/stream.dart: """, timeout is __t42, false));
+     timer = zone.createTimer(timeLimit, DEVC$RT.cast(timeout, Function, __CastType42, "CompositeCast", """line 1256, column 43 of dart:async/stream.dart: """, timeout is __CastType42, false));
     }
    Future onCancel() {
     timer.cancel();
@@ -633,7 +633,7 @@ part of dart.async;
     }
   , () {
     subscription.resume();
-     timer = zone.createTimer(timeLimit, DEVC$RT.cast(timeout, Function, __t42, "CompositeCast", """line 1275, column 53 of dart:async/stream.dart: """, timeout is __t42, false));
+     timer = zone.createTimer(timeLimit, DEVC$RT.cast(timeout, Function, __CastType42, "CompositeCast", """line 1275, column 53 of dart:async/stream.dart: """, timeout is __CastType42, false));
     }
   , onCancel);
    return controller.stream;
@@ -693,11 +693,11 @@ _sink.addError(error, stackTrace);
 _sink.close();
 }
 }
- typedef T __t19<T>(int __u20);
- typedef dynamic __t21(dynamic __u22);
- typedef EventSink<dynamic> __t24<T>(EventSink<T> __u25);
- typedef void __t26(StreamSubscription<dynamic> __u27);
- typedef void __t28<T>(StreamSubscription<T> __u29);
- typedef dynamic __t30(dynamic __u31, StackTrace __u32);
- typedef void __t42();
- typedef void __t43(EventSink<dynamic> __u44);
+ typedef T __CastType19<T>(int __u20);
+ typedef dynamic __CastType21(dynamic __u22);
+ typedef EventSink<dynamic> __CastType24<T>(EventSink<T> __u25);
+ typedef void __CastType26(StreamSubscription<dynamic> __u27);
+ typedef void __CastType28<T>(StreamSubscription<T> __u29);
+ typedef dynamic __CastType30(dynamic __u31, StackTrace __u32);
+ typedef void __CastType42();
+ typedef void __CastType43(EventSink<dynamic> __u44);