Push decision over evaluation time into result static methods

1 files changed, 2 insertions, 3 deletions

diff --git a/src/main/java/org/zwobble/mammoth/internal/results/InternalResult.java b/src/main/java/org/zwobble/mammoth/internal/results/InternalResult.java
index 650446f..445d684 100644
--- a/src/main/java/org/zwobble/mammoth/internal/results/InternalResult.java
+++ b/src/main/java/org/zwobble/mammoth/internal/results/InternalResult.java
@@ -14,11 +14,10 @@ import static org.zwobble.mammoth.internal.util.MammothIterables.lazyConcat;
 import static org.zwobble.mammoth.internal.util.MammothIterables.lazyFlatMap;
 import static org.zwobble.mammoth.internal.util.MammothLists.eagerMap;
 import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothLists.toList;
 
 public class InternalResult<T> {
-    public static <T> InternalResult<List<T>> flatten(Iterable<InternalResult<T>> results) {
-        results = toList(results);
+    public static <T, R> InternalResult<List<R>> flatMap(Iterable<T> iterable, Function<T, InternalResult<R>> function) {
+        List<InternalResult<R>> results = eagerMap(iterable, function);
         return new InternalResult<>(
             eagerMap(results, result -> result.value),
             lazyFlatMap(results, result -> result.warnings));