Skip to content

Commit 9e1784d

Browse files
jnapejnape
committed
Moving iterators under iteration package, adding DroppingIterable
- first serious step towards auto-deforesting, starting with Drop
1 parent b62b2a0 commit 9e1784d

File tree

71 files changed

+137
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+137
-79
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn1/Cycle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.jnape.palatable.lambda.functions.builtin.fn1;
22

33
import com.jnape.palatable.lambda.functions.Fn1;
4-
import com.jnape.palatable.lambda.iterators.CyclicIterator;
4+
import com.jnape.palatable.lambda.iteration.CyclicIterator;
55

66
import static java.util.Arrays.asList;
77

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn1/Flatten.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.jnape.palatable.lambda.functions.builtin.fn1;
22

33
import com.jnape.palatable.lambda.functions.Fn1;
4-
import com.jnape.palatable.lambda.iterators.FlatteningIterator;
4+
import com.jnape.palatable.lambda.iteration.FlatteningIterator;
55

66
/**
77
* Given a nested {@link Iterable} of {@link Iterable}s, return a lazily flattening {@link Iterable}

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn1/Init.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.jnape.palatable.lambda.functions.builtin.fn1;
22

33
import com.jnape.palatable.lambda.functions.Fn1;
4-
import com.jnape.palatable.lambda.iterators.InitIterator;
4+
import com.jnape.palatable.lambda.iteration.InitIterator;
55

66
/**
77
* Given an <code>{@link Iterable}&lt;A&gt;</code>, produce an

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn1/Repeat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.jnape.palatable.lambda.functions.builtin.fn1;
22

33
import com.jnape.palatable.lambda.functions.Fn1;
4-
import com.jnape.palatable.lambda.iterators.RepetitiousIterator;
4+
import com.jnape.palatable.lambda.iteration.RepetitiousIterator;
55

66
/**
77
* Given a value, return an infinite <code>Iterable</code> that repeatedly iterates that value.

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn1/Reverse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.jnape.palatable.lambda.functions.builtin.fn1;
22

33
import com.jnape.palatable.lambda.functions.Fn1;
4-
import com.jnape.palatable.lambda.iterators.ReversingIterator;
4+
import com.jnape.palatable.lambda.iteration.ReversingIterator;
55

66
/**
77
* Given an <code>Iterable</code>, return a reversed representation of that <code>Iterable</code>. Note that reversing

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn2/CartesianProduct.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.jnape.palatable.lambda.adt.hlist.Tuple2;
44
import com.jnape.palatable.lambda.functions.Fn1;
55
import com.jnape.palatable.lambda.functions.Fn2;
6-
import com.jnape.palatable.lambda.iterators.CombinatorialIterator;
6+
import com.jnape.palatable.lambda.iteration.CombinatorialIterator;
77

88
/**
99
* Lazily compute the cartesian product of an <code>Iterable&lt;A&gt;</code> and <code>Iterable&lt;B&gt;</code>,

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn2/Cons.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.jnape.palatable.lambda.functions.Fn1;
44
import com.jnape.palatable.lambda.functions.Fn2;
5-
import com.jnape.palatable.lambda.iterators.ConsingIterator;
5+
import com.jnape.palatable.lambda.iteration.ConsingIterator;
66

77
/**
88
* Prepend an element to an <code>Iterable</code>.

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn2/Drop.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.jnape.palatable.lambda.functions.Fn1;
44
import com.jnape.palatable.lambda.functions.Fn2;
5-
import com.jnape.palatable.lambda.iterators.DroppingIterator;
5+
import com.jnape.palatable.lambda.iteration.DroppingIterable;
66

77
/**
88
* Lazily skip the first <code>n</code> elements from an <code>Iterable</code> by returning an <code>Iterable</code>
@@ -22,7 +22,7 @@ private Drop() {
2222

2323
@Override
2424
public Iterable<A> apply(Integer n, Iterable<A> as) {
25-
return () -> new DroppingIterator<>(n, as.iterator());
25+
return new DroppingIterable<>(n, as);
2626
}
2727

2828
@SuppressWarnings("unchecked")

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn2/DropWhile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.jnape.palatable.lambda.functions.Fn1;
44
import com.jnape.palatable.lambda.functions.Fn2;
5-
import com.jnape.palatable.lambda.iterators.PredicatedDroppingIterator;
5+
import com.jnape.palatable.lambda.iteration.PredicatedDroppingIterator;
66

77
import java.util.function.Function;
88

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn2/Filter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.jnape.palatable.lambda.functions.Fn1;
44
import com.jnape.palatable.lambda.functions.Fn2;
5-
import com.jnape.palatable.lambda.iterators.FilteringIterator;
5+
import com.jnape.palatable.lambda.iteration.FilteringIterator;
66

77
import java.util.function.Function;
88

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn2/InGroupsOf.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.jnape.palatable.lambda.functions.Fn1;
44
import com.jnape.palatable.lambda.functions.Fn2;
5-
import com.jnape.palatable.lambda.iterators.GroupingIterator;
5+
import com.jnape.palatable.lambda.iteration.GroupingIterator;
66

77
/**
88
* Lazily group the <code>Iterable</code> by returning an <code>Iterable</code> of smaller <code>Iterable</code>s of

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn2/Map.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.jnape.palatable.lambda.functions.Fn1;
44
import com.jnape.palatable.lambda.functions.Fn2;
5-
import com.jnape.palatable.lambda.iterators.MappingIterator;
5+
import com.jnape.palatable.lambda.iteration.MappingIterator;
66

77
import java.util.function.Function;
88

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn2/PrependAll.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.jnape.palatable.lambda.functions.Fn1;
44
import com.jnape.palatable.lambda.functions.Fn2;
5-
import com.jnape.palatable.lambda.iterators.PrependingIterator;
5+
import com.jnape.palatable.lambda.iteration.PrependingIterator;
66

77
/**
88
* Lazily prepend each value with of the <code>Iterable</code> with the supplied separator value. An empty

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn2/Snoc.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.jnape.palatable.lambda.functions.Fn1;
44
import com.jnape.palatable.lambda.functions.Fn2;
5-
import com.jnape.palatable.lambda.iterators.SnocIterator;
5+
import com.jnape.palatable.lambda.iteration.SnocIterator;
66

77
/**
88
* Opposite of {@link Cons}: lazily append an element to the end of the given {@link Iterable}.

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn2/Take.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.jnape.palatable.lambda.functions.Fn1;
44
import com.jnape.palatable.lambda.functions.Fn2;
5-
import com.jnape.palatable.lambda.iterators.TakingIterator;
5+
import com.jnape.palatable.lambda.iteration.TakingIterator;
66

77
/**
88
* Lazily limit the <code>Iterable</code> to <code>n</code> elements by returning an <code>Iterable</code> that stops

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn2/TakeWhile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.jnape.palatable.lambda.functions.Fn1;
44
import com.jnape.palatable.lambda.functions.Fn2;
5-
import com.jnape.palatable.lambda.iterators.PredicatedTakingIterator;
5+
import com.jnape.palatable.lambda.iteration.PredicatedTakingIterator;
66

77
import java.util.function.Function;
88

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn2/Unfoldr.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.jnape.palatable.lambda.adt.hlist.Tuple2;
55
import com.jnape.palatable.lambda.functions.Fn1;
66
import com.jnape.palatable.lambda.functions.Fn2;
7-
import com.jnape.palatable.lambda.iterators.UnfoldingIterator;
7+
import com.jnape.palatable.lambda.iteration.UnfoldingIterator;
88

99
import java.util.function.Function;
1010

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn3/ScanLeft.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.jnape.palatable.lambda.functions.Fn1;
44
import com.jnape.palatable.lambda.functions.Fn2;
55
import com.jnape.palatable.lambda.functions.Fn3;
6-
import com.jnape.palatable.lambda.iterators.ScanningIterator;
6+
import com.jnape.palatable.lambda.iteration.ScanningIterator;
77

88
import java.util.function.BiFunction;
99

‎src/main/java/com/jnape/palatable/lambda/functions/builtin/fn3/ZipWith.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.jnape.palatable.lambda.functions.Fn1;
44
import com.jnape.palatable.lambda.functions.Fn2;
55
import com.jnape.palatable.lambda.functions.Fn3;
6-
import com.jnape.palatable.lambda.iterators.ZippingIterator;
6+
import com.jnape.palatable.lambda.iteration.ZippingIterator;
77

88
import java.util.function.BiFunction;
99

‎src/main/java/com/jnape/palatable/lambda/iterators/CombinatorialIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/CombinatorialIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import com.jnape.palatable.lambda.adt.hlist.Tuple2;
44

‎src/main/java/com/jnape/palatable/lambda/iterators/ConcatenatingIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/ConcatenatingIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.Iterator;
44
import java.util.NoSuchElementException;

‎src/main/java/com/jnape/palatable/lambda/iterators/ConsingIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/ConsingIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.Iterator;
44
import java.util.NoSuchElementException;

‎src/main/java/com/jnape/palatable/lambda/iterators/CyclicIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/CyclicIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.ArrayList;
44
import java.util.Iterator;

‎src/main/java/com/jnape/palatable/lambda/iteration/DroppingIterable.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.jnape.palatable.lambda.iteration;
2+
3+
import java.util.Iterator;
4+
5+
public class DroppingIterable<A> implements Iterable<A> {
6+
private final int n;
7+
private final Iterable<A> as;
8+
9+
public DroppingIterable(int n, Iterable<A> as) {
10+
while (as instanceof DroppingIterable) {
11+
DroppingIterable<A> nested = (DroppingIterable<A>) as;
12+
as = nested.as;
13+
n += nested.n;
14+
}
15+
this.as = as;
16+
this.n = n;
17+
}
18+
19+
@Override
20+
public Iterator<A> iterator() {
21+
return new DroppingIterator<>(n, as.iterator());
22+
}
23+
}

‎src/main/java/com/jnape/palatable/lambda/iterators/DroppingIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/DroppingIterator.java

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.Iterator;
44
import java.util.NoSuchElementException;
55

66
public class DroppingIterator<A> extends ImmutableIterator<A> {
7-
private Integer n;
8-
private Iterator<A> asIterator;
9-
private boolean dropped;
7+
private final Integer n;
8+
private final Iterator<A> asIterator;
9+
private boolean dropped;
1010

1111
public DroppingIterator(Integer n, Iterator<A> asIterator) {
1212
this.n = n;
@@ -17,9 +17,7 @@ public DroppingIterator(Integer n, Iterator<A> asIterator) {
1717
@Override
1818
public boolean hasNext() {
1919
if (!dropped) {
20-
deforest();
2120
drop();
22-
dropped = true;
2321
}
2422
return asIterator.hasNext();
2523
}
@@ -32,16 +30,10 @@ public A next() {
3230
return asIterator.next();
3331
}
3432

35-
private void deforest() {
36-
while (asIterator instanceof DroppingIterator) {
37-
n += ((DroppingIterator) this.asIterator).n;
38-
asIterator = ((DroppingIterator<A>) this.asIterator).asIterator;
39-
}
40-
}
41-
4233
private void drop() {
4334
int i = 0;
4435
while (i++ < n && asIterator.hasNext())
4536
asIterator.next();
37+
dropped = true;
4638
}
4739
}

‎src/main/java/com/jnape/palatable/lambda/iterators/FilteringIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/FilteringIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.Iterator;
44
import java.util.NoSuchElementException;

‎src/main/java/com/jnape/palatable/lambda/iterators/FlatteningIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/FlatteningIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.Iterator;
44
import java.util.NoSuchElementException;

‎src/main/java/com/jnape/palatable/lambda/iterators/GroupingIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/GroupingIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.ArrayList;
44
import java.util.Iterator;

‎src/main/java/com/jnape/palatable/lambda/iterators/ImmutableIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/ImmutableIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.Iterator;
44

‎src/main/java/com/jnape/palatable/lambda/iterators/InfiniteIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/InfiniteIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
public abstract class InfiniteIterator<A> extends ImmutableIterator<A> {
44
@Override

‎src/main/java/com/jnape/palatable/lambda/iterators/InitIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/InitIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.Iterator;
44
import java.util.NoSuchElementException;

‎src/main/java/com/jnape/palatable/lambda/iterators/MappingIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/MappingIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.Iterator;
44
import java.util.function.Function;

‎src/main/java/com/jnape/palatable/lambda/iterators/PredicatedDroppingIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/PredicatedDroppingIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.Iterator;
44
import java.util.NoSuchElementException;

‎src/main/java/com/jnape/palatable/lambda/iterators/PredicatedTakingIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/PredicatedTakingIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.Iterator;
44
import java.util.NoSuchElementException;

‎src/main/java/com/jnape/palatable/lambda/iterators/PrependingIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/PrependingIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.Iterator;
44
import java.util.NoSuchElementException;

‎src/main/java/com/jnape/palatable/lambda/iterators/RepetitiousIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/RepetitiousIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
public class RepetitiousIterator<A> extends InfiniteIterator<A> {
44

‎src/main/java/com/jnape/palatable/lambda/iterators/ReversingIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/ReversingIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.ArrayList;
44
import java.util.Iterator;

‎src/main/java/com/jnape/palatable/lambda/iterators/RewindableIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/RewindableIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.Iterator;
44
import java.util.NoSuchElementException;

‎src/main/java/com/jnape/palatable/lambda/iterators/ScanningIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/ScanningIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.Iterator;
44
import java.util.NoSuchElementException;

‎src/main/java/com/jnape/palatable/lambda/iterators/SnocIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/SnocIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.Collections;
44
import java.util.Iterator;

‎src/main/java/com/jnape/palatable/lambda/iterators/TakingIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/TakingIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.Iterator;
44
import java.util.NoSuchElementException;

‎src/main/java/com/jnape/palatable/lambda/iterators/UnfoldingIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/UnfoldingIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import com.jnape.palatable.lambda.adt.Maybe;
44
import com.jnape.palatable.lambda.adt.hlist.Tuple2;

‎src/main/java/com/jnape/palatable/lambda/iterators/ZippingIterator.java renamed to ‎src/main/java/com/jnape/palatable/lambda/iteration/ZippingIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jnape.palatable.lambda.iterators;
1+
package com.jnape.palatable.lambda.iteration;
22

33
import java.util.Iterator;
44
import java.util.function.BiFunction;

‎src/main/java/com/jnape/palatable/lambda/monoid/builtin/Concat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.jnape.palatable.lambda.monoid.builtin;
22

33
import com.jnape.palatable.lambda.functions.Fn1;
4-
import com.jnape.palatable.lambda.iterators.ConcatenatingIterator;
4+
import com.jnape.palatable.lambda.iteration.ConcatenatingIterator;
55
import com.jnape.palatable.lambda.monoid.Monoid;
66

77
import java.util.Collections;

0 commit comments

Comments
 (0)