Inline resume

inkblot · jnape · commit 9c57a344393b · 2020-11-11T14:03:50.000-06:00
Add explicit type arguments to the first match in the lambda returned by resume so that resume can be inlined, renaming the `spine` lambda parameter to `tSpine` for disambiguation
diff --git a/src/main/java/com/jnape/palatable/lambda/monad/transformer/builtin/IterateT.java b/src/main/java/com/jnape/palatable/lambda/monad/transformer/builtin/IterateT.java
@@ -85,7 +85,13 @@ private IterateT(Pure<M> pureM,
     public <MMTA extends MonadRec<Maybe<Tuple2<A, IterateT<M, A>>>, M>> MMTA runIterateT() {
         MonadRec<ImmutableQueue<Choice2<Fn0<MonadRec<Maybe<Tuple2<A, IterateT<M, A>>>, M>>, MonadRec<A, M>>>, M>
                 mSpine = pureM.apply(spine);
-        return mSpine.trampolineM(resume(pureM)).coerce();
+        return mSpine.trampolineM(tSpine -> tSpine.head().<MonadRec<RecursiveResult<ImmutableQueue<Choice2<Fn0<MonadRec<Maybe<Tuple2<A, IterateT<M, A>>>, M>>, MonadRec<A, M>>>, Maybe<Tuple2<A, IterateT<M, A>>>>, M>>match(
+                ___ -> pureM.apply(terminate(nothing())),
+                thunkOrReal -> thunkOrReal.match(
+                        thunk -> thunk.apply().fmap(m -> m.match(
+                                ___ -> recurse(tSpine.tail()),
+                                t -> terminate(just(t.fmap(as -> new IterateT<>(pureM, as.spine.concat(tSpine.tail()))))))),
+                        real -> real.fmap(a -> terminate(just(tuple(a, new IterateT<>(pureM, tSpine.tail())))))))).coerce();
     }
 
     /**
@@ -289,19 +295,6 @@ public <B> IterateT<M, A> discardR(Applicative<B, IterateT<M, ?>> appB) {
         return MonadT.super.discardR(appB).coerce();
     }
 
-    private static <M extends MonadRec<?, M>, A>
-    Fn1<ImmutableQueue<Choice2<Fn0<MonadRec<Maybe<Tuple2<A, IterateT<M, A>>>, M>>, MonadRec<A, M>>>,
-            MonadRec<RecursiveResult<ImmutableQueue<Choice2<Fn0<MonadRec<Maybe<Tuple2<A, IterateT<M, A>>>, M>>, MonadRec<A, M>>>, Maybe<Tuple2<A, IterateT<M, A>>>>, M>>
-    resume(Pure<M> pureM) {
-        return spine -> spine.head().match(
-                ___ -> pureM.apply(terminate(nothing())),
-                thunkOrReal -> thunkOrReal.match(
-                        thunk -> thunk.apply().fmap(m -> m.match(
-                                ___ -> recurse(spine.tail()),
-                                t -> terminate(just(t.fmap(as -> new IterateT<>(pureM, as.spine.concat(spine.tail()))))))),
-                        real -> real.fmap(a -> terminate(just(tuple(a, new IterateT<>(pureM, spine.tail())))))));
-    }
-
     /**
      * Static factory method for creating an empty {@link IterateT}.
      *
