Let's see if this passes.

haxetink · back2dos · Feb 10, 2021 · Feb 10, 2021 · Feb 10, 2021 · Feb 10, 2021
commit 15c575bfe20ad4e892fb9274b2963a7d3ee4b88a
diff --git a/.travis.yml b/.travis.yml
@@ -13,25 +13,24 @@ os:
   # - osx
 
 env:
-  - HAXE_VERSION=3.4.7
+  - HAXE_VERSION=stable
   - HAXE_VERSION=nightly
-  
+
 install:
   - npm i -g lix@15.3.13
   - lix install haxe $HAXE_VERSION
   - lix download
-  
+
 script:
   # - lix run travix interp # runtime stack overflow
   - lix run travix neko
   - lix run travix python
   - lix run travix node
   - lix run travix js
   # - lix run travix flash
-  - lix run travix java
-  - if [[ "$(haxe -version)" =~ ^4.* ]]; then lix run travix java -D jvm; fi
+  - lix run travix java -D jvm
   - lix run travix cpp
-  # - lix run travix cs # gencs stack overflow, to be investigated
+  - lix run travix cs -D erase-generics
   - lix run travix php
   - lix run travix lua
 

diff --git a/extraParams.hxml b/extraParams.hxml
diff --git a/haxe_libraries/hxcpp.hxml b/haxe_libraries/hxcpp.hxml
@@ -1,4 +1,4 @@
--D hxcpp=4.0.8
-# @install: lix --silent download "haxelib:/hxcpp#4.0.8" into hxcpp/4.0.8/haxelib
-# @run: haxelib run-dir hxcpp ${HAXE_LIBCACHE}/hxcpp/4.0.8/haxelib
--cp ${HAXE_LIBCACHE}/hxcpp/4.0.8/haxelib/
+# @install: lix --silent download "haxelib:/hxcpp#4.2.1" into hxcpp/4.2.1/haxelib
+# @run: haxelib run-dir hxcpp ${HAXE_LIBCACHE}/hxcpp/4.2.1/haxelib
+-cp ${HAXE_LIBCACHE}/hxcpp/4.2.1/haxelib/
+-D hxcpp=4.2.1
diff --git a/haxe_libraries/hxcs.hxml b/haxe_libraries/hxcs.hxml
@@ -0,0 +1,4 @@
+# @install: lix --silent download "haxelib:/hxcs#4.2.0" into hxcs/4.2.0/haxelib
+# @run: haxelib run-dir hxcs ${HAXE_LIBCACHE}/hxcs/4.2.0/haxelib
+-cp ${HAXE_LIBCACHE}/hxcs/4.2.0/haxelib/
+-D hxcs=4.2.0
diff --git a/haxe_libraries/hxjava.hxml b/haxe_libraries/hxjava.hxml
@@ -1,5 +1,5 @@
--D hxjava=3.2.0
-# @install: lix --silent download "haxelib:/hxjava#3.2.0" into hxjava/3.2.0/haxelib
-# @run: haxelib run-dir hxjava ${HAXE_LIBCACHE}/hxjava/3.2.0/haxelib
--cp ${HAXE_LIBCACHE}/hxjava/3.2.0/haxelib/
+# @install: lix --silent download "haxelib:/hxjava#4.2.0" into hxjava/4.2.0/haxelib
+# @run: haxelib run-dir hxjava ${HAXE_LIBCACHE}/hxjava/4.2.0/haxelib
+-cp ${HAXE_LIBCACHE}/hxjava/4.2.0/haxelib/
+-D hxjava=4.2.0
 -java-lib lib/hxjava-std.jar
diff --git a/haxe_libraries/tink_testrunner.hxml b/haxe_libraries/tink_testrunner.hxml
@@ -1,6 +1,6 @@
+# @install: lix --silent download "gh://github.com/haxetink/tink_testrunner#866de8b991be89b969825b0c0f5565d51f96a6f7" into tink_testrunner/0.8.0/github/866de8b991be89b969825b0c0f5565d51f96a6f7
 -lib ansi
 -lib tink_macro
 -lib tink_streams
--cp ${SCOPE_DIR}/../testrunner/src
--D tink_testrunner=0.8.0
---macro Sys.println("haxe_libraries/tink_testrunner.hxml:5: [Warning] Using dev version of library tink_testrunner")
+-cp ${HAXE_LIBCACHE}/tink_testrunner/0.8.0/github/866de8b991be89b969825b0c0f5565d51f96a6f7/src
+-D tink_testrunner=0.8.0
diff --git a/src/tink/streams/Stream.hx b/src/tink/streams/Stream.hx
@@ -37,7 +37,7 @@ abstract Stream<Item, Quality>(StreamObject<Item, Quality>) from StreamObject<It
       else
         new SelectStream(this, selector);
 
-  public function forEach<Result>(f:Consumer<Item, Result>):Future<IterationResult<Item, Result, Quality>>
+  public function forEach<Result>(f:(item:Item)->Future<Option<Result>>):Future<IterationResult<Item, Result, Quality>>
     return this.forEach(f);
 
   public function filter(f:Item->Return<Bool, Quality>):Stream<Item, Quality>
@@ -91,7 +91,7 @@ private class FlattenStream<Item, Quality> implements StreamObject<Item, Quality
   public function new(source)
     this.source = source;
 
-  public function forEach<Result>(f:Consumer<Item, Result>):Future<IterationResult<Item, Result, Quality>>
+  public function forEach<Result>(f:(item:Item)->Future<Option<Result>>):Future<IterationResult<Item, Result, Quality>>
     return
       source.forEach(child -> child.forEach(f).map(r -> switch r {
         case Done: None;
@@ -116,7 +116,7 @@ private class PromiseStream<Item> implements StreamObject<Item, Error> {
   public function new(stream)
     this.stream = stream;
 
-  public function forEach<Result>(f:Consumer<Item, Result>):Future<IterationResult<Item, Result, Error>>
+  public function forEach<Result>(f:(item:Item)->Future<Option<Result>>):Future<IterationResult<Item, Result, Error>>
     return stream.next(s -> s.forEach(f)).map(o -> switch o {
       case Success(data):
         data;
@@ -130,7 +130,7 @@ private class SingleItem<Item, Quality> implements StreamObject<Item, Quality> {
   public function new(item)
     this.item = item;
 
-  public function forEach<Result>(f:Consumer<Item, Result>)
+  public function forEach<Result>(f:(item:Item)->Future<Option<Result>>)
     return new Future<IterationResult<Item, Result, Quality>>(
       trigger -> Helper.trySync(
         f(item),
@@ -152,23 +152,21 @@ enum IterationResult<Item, Result, Quality> {
 }
 
 interface StreamObject<Item, Quality> {
-  function forEach<Result>(f:Consumer<Item, Result>):Future<IterationResult<Item, Result, Quality>>;
+  function forEach<Result>(f:(item:Item)->Future<Option<Result>>):Future<IterationResult<Item, Result, Quality>>;
 }
 
 private enum LinkKind<Item, Quality, Tail> {
   Fin(error:Null<Quality>);
   Cons(head:Item, tail:Tail);
 }
 
-typedef Consumer<Item, Result> = (item:Item)->Future<Option<Result>>;
-
 private class Empty<Item, Quality> implements StreamObject<Item, Quality> {
 
   static final INST:StreamObject<Dynamic, Dynamic> = new Empty();
 
   function new() {}
 
-  public function forEach<Result>(f:Consumer<Item, Result>):Future<IterationResult<Item, Result, Quality>>
+  public function forEach<Result>(f:(item:Item)->Future<Option<Result>>):Future<IterationResult<Item, Result, Quality>>
     return Done;
 }
 
@@ -179,7 +177,7 @@ private class Compound<Item, Quality> implements StreamObject<Item, Quality> {
     this.parts = parts;
   }
 
-  public function forEach<Result>(f:Consumer<Item, Result>) {
+  public function forEach<Result>(f:(item:Item)->Future<Option<Result>>) {
     var index = 0,
         cur = Future.sync(Done);
     return new Future<IterationResult<Item, Result, Quality>>(trigger -> {
@@ -227,7 +225,7 @@ private class SelectStream<In, Out, Quality> implements StreamObject<Out, Qualit
   function continued(source):Stream<Out, Quality>
     return new SelectStream(source, selector);
 
-  public function forEach<Result>(f:Consumer<Out, Result>):Future<IterationResult<Out, Result, Quality>>
+  public function forEach<Result>(f:(item:Out)->Future<Option<Result>>):Future<IterationResult<Out, Result, Quality>>
     return
       source.forEach(
         item -> {
@@ -286,7 +284,7 @@ private class Grouped<Item, Quality> implements StreamObject<Item, Quality> {
   public function new(source)
     this.source = source;
 
-  public function forEach<Result>(f:Consumer<Item, Result>):Future<IterationResult<Item, Result, Quality>>
+  public function forEach<Result>(f:(item:Item)->Future<Option<Result>>):Future<IterationResult<Item, Result, Quality>>
     return
       source.forEach(
         group -> switch group {
@@ -355,7 +353,7 @@ private class AsyncLinkStream<Item, Quality> implements StreamObject<Item, Quali
   public function new(link)
     this.link = link;
 
-  public function forEach<Result>(f:Consumer<Item, Result>) {
+  public function forEach<Result>(f:(item:Item)->Future<Option<Result>>) {
     var pos = link;
     return new Future<IterationResult<Item, Result, Quality>>(trigger -> {
       final wait = new CallbackLinkRef();
@@ -409,7 +407,7 @@ private class SyncLinkStream<Item, Quality> implements StreamObject<Item, Qualit
   public function new(link)
     this.link = link;
 
-  public function forEach<Result>(f:Consumer<Item, Result>) {
+  public function forEach<Result>(f:(item:Item)->Future<Option<Result>>) {
     var pos = link;
     return new Future<IterationResult<Item, Result, Quality>>(trigger -> {
       final wait = new CallbackLinkRef();

diff --git a/tests.hxml b/tests.hxml
@@ -1,4 +1,3 @@
 -cp ./tests/
 -main RunTests
--lib tink_unittest
--D no-deprecation-warnings
+-lib tink_unittest