Skip to content

Commit

Permalink
classlib: implement BufferedReader.lines
Browse files Browse the repository at this point in the history
  • Loading branch information
konsoletyper committed Apr 29, 2024
1 parent 0dd1089 commit 3f74817
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@
package org.teavm.classlib.java.io;

import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.function.Predicate;
import org.teavm.classlib.java.lang.TIllegalArgumentException;
import org.teavm.classlib.java.lang.TMath;
import org.teavm.classlib.java.lang.TStringBuilder;
import org.teavm.classlib.java.util.TArrays;
import org.teavm.classlib.java.util.stream.TStream;
import org.teavm.classlib.java.util.stream.impl.TSimpleStreamImpl;

public class TBufferedReader extends TReader {
private TReader innerReader;
Expand Down Expand Up @@ -111,6 +115,33 @@ public String readLine() throws IOException {
return line.toString();
}

public TStream<String> lines() {
return new TSimpleStreamImpl<>() {
private boolean done;

@Override
public boolean next(Predicate<? super String> consumer) {
if (!done) {
while (true) {
try {
var line = readLine();
if (line == null) {
break;
}
if (!consumer.test(line)) {
return true;
}
} catch (IOException e) {
throw new UncheckedIOException(e);
}
}
done = true;
}
return false;
}
};
}

@Override
public long skip(long n) throws IOException {
requireOpened();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* Copyright 2024 Alexey Andreev.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.teavm.classlib.java.util.stream.impl;

import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.function.Predicate;
import org.teavm.classlib.java.io.TBufferedReader;

public class TBufferedReaderLinesStream extends TSimpleStreamImpl<String> {
private TBufferedReader reader;
private boolean done;

public TBufferedReaderLinesStream(TBufferedReader reader) {
this.reader = reader;
}

@Override
public boolean next(Predicate<? super String> consumer) {
if (!done) {
while (true) {
try {
var line = reader.readLine();
if (line == null) {
break;
}
if (!consumer.test(line)) {
return true;
}
} catch (IOException e) {
throw new UncheckedIOException(e);
}
}
done = true;
}
return false;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package org.teavm.classlib.java.io;

import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import java.io.BufferedReader;
Expand Down Expand Up @@ -95,4 +96,15 @@ public void leavesMark() throws IOException {
assertEquals(51, buffer[1]);
assertEquals(199, buffer[149]);
}

@Test
public void lines() {
var reader = new BufferedReader(new StringReader("a\nb\n\n"));
var lines = reader.lines().toArray(String[]::new);
assertArrayEquals(new String[] { "a", "b", "" }, lines);

reader = new BufferedReader(new StringReader("a\nb\n\n"));
lines = reader.lines().filter(s -> !s.isEmpty()).map(s -> "*" + s).toArray(String[]::new);
assertArrayEquals(new String[] { "*a", "*b" }, lines);
}
}

0 comments on commit 3f74817

Please sign in to comment.