eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 08:14:09 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

classlib: fix bug in Stream.takeWhile

Browse Source 
Fix #913
This commit is contained in:
Alexey Andreev 2024-04-26 21:30:13 +02:00
parent 188d189407
commit c066864c68
6 changed files with 100 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
classlib/src/main/java/org/teavm/classlib/java/util/stream/doubleimpl/TTakeWhileDoubleStream.java
View File

@ -17,30 +17,33 @@ package org.teavm.classlib.java.util.stream.doubleimpl;
import java.util.function.DoublePredicate; import java.util.function.DoublePredicate;
public class TTakeWhileDoubleStream extends TWrappingDoubleStreamImpl { public class TTakeWhileDoubleStream extends TSimpleDoubleStreamImpl {
private TSimpleDoubleStreamImpl sourceStream;
private DoublePredicate predicate; private DoublePredicate predicate;
/* set to `true` as soon as we see a value `v` in the source stream for which `predicate.test(v)` is false */ /* set to `true` as soon as we see a value `v` in the source stream for which `predicate.test(v)` is false */
private boolean isStopped; private boolean isStopped;
TTakeWhileDoubleStream(TSimpleDoubleStreamImpl innerStream, DoublePredicate predicate) { TTakeWhileDoubleStream(TSimpleDoubleStreamImpl sourceStream, DoublePredicate predicate) {
super(innerStream); this.sourceStream = sourceStream;
this.predicate = predicate; this.predicate = predicate;
} }
@Override @Override
protected DoublePredicate wrap(DoublePredicate consumer) { public boolean next(DoublePredicate consumer) {
return t -> { if (isStopped) {
if (isStopped) { return false;
return false; }
} var result = sourceStream.next(e -> {
if (!predicate.test(e)) {
if (predicate.test(t)) {
return consumer.test(t);
} else {
isStopped = true; isStopped = true;
return false; return false;
} }
}; return consumer.test(e);
});
if (!result) {
isStopped = true;
}
return result;
} }
} }

29
classlib/src/main/java/org/teavm/classlib/java/util/stream/impl/TTakeWhileStream.java
View File

@ -17,30 +17,33 @@ package org.teavm.classlib.java.util.stream.impl;
import java.util.function.Predicate; import java.util.function.Predicate;
public class TTakeWhileStream<T> extends TWrappingStreamImpl<T, T> { public class TTakeWhileStream<T> extends TSimpleStreamImpl<T> {
private TSimpleStreamImpl<T> sourceStream;
private Predicate<? super T> predicate; private Predicate<? super T> predicate;
/* set to `true` as soon as we see a value `v` in the source stream for which `predicate.test(v)` is false */ /* set to `true` as soon as we see a value `v` in the source stream for which `predicate.test(v)` is false */
private boolean isStopped; private boolean isStopped;
TTakeWhileStream(TSimpleStreamImpl<T> innerStream, Predicate<? super T> predicate) { TTakeWhileStream(TSimpleStreamImpl<T> sourceStream, Predicate<? super T> predicate) {
super(innerStream); this.sourceStream = sourceStream;
this.predicate = predicate; this.predicate = predicate;
} }
@Override @Override
protected Predicate<T> wrap(Predicate<? super T> consumer) { public boolean next(Predicate<? super T> consumer) {
return t -> { if (isStopped) {
if (isStopped) { return false;
return false; }
} var result = sourceStream.next(e -> {
if (!predicate.test(e)) {
if (predicate.test(t)) {
return consumer.test(t);
} else {
isStopped = true; isStopped = true;
return false; return false;
} }
}; return consumer.test(e);
});
if (!result) {
isStopped = true;
}
return result;
} }
} }

29
classlib/src/main/java/org/teavm/classlib/java/util/stream/intimpl/TTakeWhileIntStream.java
View File

@ -17,30 +17,33 @@ package org.teavm.classlib.java.util.stream.intimpl;
import java.util.function.IntPredicate; import java.util.function.IntPredicate;
public class TTakeWhileIntStream extends TWrappingIntStreamImpl { public class TTakeWhileIntStream extends TSimpleIntStreamImpl {
private TSimpleIntStreamImpl sourceStream;
private IntPredicate predicate; private IntPredicate predicate;
/* set to `true` as soon as we see a value `v` in the source stream for which `predicate.test(v)` is false */ /* set to `true` as soon as we see a value `v` in the source stream for which `predicate.test(v)` is false */
private boolean isStopped; private boolean isStopped;
TTakeWhileIntStream(TSimpleIntStreamImpl innerStream, IntPredicate predicate) { TTakeWhileIntStream(TSimpleIntStreamImpl sourceStream, IntPredicate predicate) {
super(innerStream); this.sourceStream = sourceStream;
this.predicate = predicate; this.predicate = predicate;
} }
@Override @Override
protected IntPredicate wrap(IntPredicate consumer) { public boolean next(IntPredicate consumer) {
return t -> { if (isStopped) {
if (isStopped) { return false;
return false; }
} var result = sourceStream.next(e -> {
if (!predicate.test(e)) {
if (predicate.test(t)) {
return consumer.test(t);
} else {
isStopped = true; isStopped = true;
return false; return false;
} }
}; return consumer.test(e);
});
if (!result) {
isStopped = true;
}
return result;
} }
} }

27
classlib/src/main/java/org/teavm/classlib/java/util/stream/longimpl/TTakeWhileLongStream.java
View File

@ -17,30 +17,33 @@ package org.teavm.classlib.java.util.stream.longimpl;
import java.util.function.LongPredicate; import java.util.function.LongPredicate;
public class TTakeWhileLongStream extends TWrappingLongStreamImpl { public class TTakeWhileLongStream extends TSimpleLongStreamImpl {
private TSimpleLongStreamImpl sourceStream;
private LongPredicate predicate; private LongPredicate predicate;
/* set to `true` as soon as we see a value `v` in the source stream for which `predicate.test(v)` is false */ /* set to `true` as soon as we see a value `v` in the source stream for which `predicate.test(v)` is false */
private boolean isStopped; private boolean isStopped;
TTakeWhileLongStream(TSimpleLongStreamImpl innerStream, LongPredicate predicate) { TTakeWhileLongStream(TSimpleLongStreamImpl innerStream, LongPredicate predicate) {
super(innerStream); this.sourceStream = innerStream;
this.predicate = predicate; this.predicate = predicate;
} }
@Override @Override
protected LongPredicate wrap(LongPredicate consumer) { public boolean next(LongPredicate consumer) {
return t -> { if (isStopped) {
if (isStopped) { return false;
return false; }
} var result = sourceStream.next(e -> {
if (!predicate.test(e)) {
if (predicate.test(t)) {
return consumer.test(t);
} else {
isStopped = true; isStopped = true;
return false; return false;
} }
}; return consumer.test(e);
});
if (!result) {
isStopped = true;
}
return result;
} }
} }

18
tests/src/test/java/org/teavm/classlib/java/util/stream/IntStreamTest.java
View File

@ -27,6 +27,7 @@ import static org.teavm.classlib.java.util.stream.Helper.testLongStream;
import java.util.IntSummaryStatistics; import java.util.IntSummaryStatistics;
import java.util.PrimitiveIterator; import java.util.PrimitiveIterator;
import java.util.Spliterator; import java.util.Spliterator;
import java.util.function.IntSupplier;
import java.util.stream.IntStream; import java.util.stream.IntStream;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -112,6 +113,23 @@ public class IntStreamTest {
public void takeWhileWorks() { public void takeWhileWorks() {
assertArrayEquals(new int[] { 1, 2, 3 }, assertArrayEquals(new int[] { 1, 2, 3 },
IntStream.of(1, 2, 3, 4, 0, 5, 6).takeWhile(n -> n < 4).toArray()); IntStream.of(1, 2, 3, 4, 0, 5, 6).takeWhile(n -> n < 4).toArray());
class ForeverIncreasingSupplier implements IntSupplier {
int value = 1;
@Override
public int getAsInt() {
return value++;
}
}
testIntStream(
() -> IntStream.concat(
IntStream.generate(new ForeverIncreasingSupplier()).takeWhile(n -> n < 4),
IntStream.generate(new ForeverIncreasingSupplier()).takeWhile(n -> n < 3)
),
1, 2, 3, 1, 2
);
} }
@Test @Test

19
tests/src/test/java/org/teavm/classlib/java/util/stream/StreamTest.java
View File

@ -33,6 +33,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Spliterator; import java.util.Spliterator;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.DoubleStream; import java.util.stream.DoubleStream;
import java.util.stream.IntStream; import java.util.stream.IntStream;
import java.util.stream.LongStream; import java.util.stream.LongStream;
@ -394,6 +395,23 @@ public class StreamTest {
var sb = new StringBuilder(); var sb = new StringBuilder();
Stream.of(1, 2, 3, 4, 0, 5, 6).takeWhile(n -> n < 4).forEach(sb::append); Stream.of(1, 2, 3, 4, 0, 5, 6).takeWhile(n -> n < 4).forEach(sb::append);
assertEquals("123", sb.toString()); assertEquals("123", sb.toString());
class ForeverIncreasingSupplier implements Supplier<Integer> {
int value = 1;
@Override
public Integer get() {
return value++;
}
}
testIntegerStream(
() -> Stream.concat(
Stream.generate(new ForeverIncreasingSupplier()).takeWhile(n -> n < 4),
Stream.generate(new ForeverIncreasingSupplier()).takeWhile(n -> n < 3)
),
1, 2, 3, 1, 2
);
} }
@Test @Test
@ -488,4 +506,5 @@ public class StreamTest {
List<String> repetitions = Stream.iterate("", s -> s.length() < 5, s -> s + "a").toList(); List<String> repetitions = Stream.iterate("", s -> s.length() < 5, s -> s + "a").toList();
assertEquals(List.of("", "a", "aa", "aaa", "aaaa"), repetitions); assertEquals(List.of("", "a", "aa", "aaa", "aaaa"), repetitions);
} }
} }