Cycle automatically deforests

jnape · jnape · commit db7c1af03616 · 2018-02-19T17:21:18.000-06:00
diff --git a/src/main/java/com/jnape/palatable/lambda/functions/builtin/fn1/Cycle.java b/src/main/java/com/jnape/palatable/lambda/functions/builtin/fn1/Cycle.java
@@ -1,7 +1,7 @@
 package com.jnape.palatable.lambda.functions.builtin.fn1;
 
 import com.jnape.palatable.lambda.functions.Fn1;
-import com.jnape.palatable.lambda.iteration.CyclicIterator;
+import com.jnape.palatable.lambda.iteration.CyclicIterable;
 
 import static java.util.Arrays.asList;
 
@@ -20,7 +20,7 @@ private Cycle() {
 
     @Override
     public Iterable<A> apply(Iterable<A> as) {
-        return () -> new CyclicIterator<>(as.iterator());
+        return new CyclicIterable<>(as);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/com/jnape/palatable/lambda/iteration/CyclicIterable.java b/src/main/java/com/jnape/palatable/lambda/iteration/CyclicIterable.java
@@ -0,0 +1,19 @@
+package com.jnape.palatable.lambda.iteration;
+
+import java.util.Iterator;
+
+public final class CyclicIterable<A> implements Iterable<A> {
+    private final Iterable<A> as;
+
+    public CyclicIterable(Iterable<A> as) {
+        while (as instanceof CyclicIterable) {
+            as = ((CyclicIterable<A>) as).as;
+        }
+        this.as = as;
+    }
+
+    @Override
+    public Iterator<A> iterator() {
+        return new CyclicIterator<>(as.iterator());
+    }
+}
diff --git a/src/test/java/com/jnape/palatable/lambda/iteration/CyclicIterableTest.java b/src/test/java/com/jnape/palatable/lambda/iteration/CyclicIterableTest.java
@@ -0,0 +1,16 @@
+package com.jnape.palatable.lambda.iteration;
+
+import com.jnape.palatable.lambda.functions.Fn1;
+import com.jnape.palatable.traitor.annotations.TestTraits;
+import com.jnape.palatable.traitor.runners.Traits;
+import org.junit.runner.RunWith;
+import testsupport.traits.Deforesting;
+
+@RunWith(Traits.class)
+public class CyclicIterableTest {
+
+    @TestTraits({Deforesting.class})
+    public Fn1<Iterable<?>, Iterable<?>> testSubject() {
+        return CyclicIterable::new;
+    }
+}
diff --git a/src/test/java/com/jnape/palatable/lambda/iteration/DroppingIterableTest.java b/src/test/java/com/jnape/palatable/lambda/iteration/DroppingIterableTest.java
@@ -4,12 +4,12 @@
 import com.jnape.palatable.traitor.annotations.TestTraits;
 import com.jnape.palatable.traitor.runners.Traits;
 import org.junit.runner.RunWith;
-import testsupport.traits.NestingStackSafety;
+import testsupport.traits.Deforesting;
 
 @RunWith(Traits.class)
 public class DroppingIterableTest {
 
-    @TestTraits({NestingStackSafety.class})
+    @TestTraits({Deforesting.class})
     public Fn1<Iterable<?>, Iterable<?>> testSubject() {
         return x -> new DroppingIterable<>(1, x);
     }
diff --git a/src/test/java/com/jnape/palatable/lambda/iteration/SnocIterableTest.java b/src/test/java/com/jnape/palatable/lambda/iteration/SnocIterableTest.java
@@ -4,12 +4,12 @@
 import com.jnape.palatable.traitor.annotations.TestTraits;
 import com.jnape.palatable.traitor.runners.Traits;
 import org.junit.runner.RunWith;
-import testsupport.traits.NestingStackSafety;
+import testsupport.traits.Deforesting;
 
 @RunWith(Traits.class)
 public class SnocIterableTest {
 
-    @TestTraits({NestingStackSafety.class})
+    @TestTraits({Deforesting.class})
     public Fn1<Iterable<Object>, Iterable<Object>> testSubject() {
         return xs -> new SnocIterable<>(1, xs);
     }
diff --git a/src/test/java/testsupport/traits/Deforesting.java b/src/test/java/testsupport/traits/Deforesting.java
@@ -6,7 +6,7 @@
 import static com.jnape.palatable.lambda.functions.builtin.fn1.Repeat.repeat;
 import static com.jnape.palatable.lambda.functions.builtin.fn3.Times.times;
 
-public final class NestingStackSafety implements Trait<Fn1<Iterable<?>, Iterable<?>>> {
+public final class Deforesting implements Trait<Fn1<Iterable<?>, Iterable<?>>> {
 
     @Override
     public void test(Fn1<Iterable<?>, Iterable<?>> fn) {
