Skip to content

Commit

Permalink
Implement readString (denoland/std#607)
Browse files Browse the repository at this point in the history
  • Loading branch information
dsseng authored and ry committed Sep 22, 2019
1 parent f545f1d commit 9739ba5
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
7 changes: 5 additions & 2 deletions io/bufio.ts
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,11 @@ export class BufReader implements Reader {
* delim.
* For simple uses, a Scanner may be more convenient.
*/
async readString(_delim: string): Promise<string | Deno.EOF> {
throw new Error("Not implemented");
async readString(delim: string): Promise<string | Deno.EOF> {
if (delim.length !== 1)
throw new Error("Delimiter should be a single character");
const buffer = await this.readSlice(delim.charCodeAt(0));
return new TextDecoder().decode(buffer || undefined);
}

/** `readLine()` is a low-level line-reading primitive. Most callers should
Expand Down
17 changes: 17 additions & 0 deletions io/bufio_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,23 @@ test(async function bufioBufferFull(): Promise<void> {
assertEquals(actual, "world!");
});

test(async function bufioReadString(): Promise<void> {
const string = "And now, hello, world!";
const buf = new BufReader(stringsReader(string), MIN_READ_BUFFER_SIZE);

const line = assertNotEOF(await buf.readString(","));
assertEquals(line, "And now,");
assertEquals(line.length, 8);

try {
await buf.readString("deno");

fail("should throw");
} catch (err) {
assert(err.message, "Delimiter should be a single character");
}
});

const testInput = encoder.encode(
"012\n345\n678\n9ab\ncde\nfgh\nijk\nlmn\nopq\nrst\nuvw\nxy"
);
Expand Down

0 comments on commit 9739ba5

Please sign in to comment.