kiss-lang/kiss-vscode
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix nextToken() EOF error

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-04-05 19:47:25 -06:00
parent fbe4cac379
commit d00b2d02df
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kiss/src/kiss/Reader.hx
View File

@@ -140,12 +140,17 @@ class Reader {
public static final terminators = [")", "]", "}", '"', "/*", "\n", " "]; public static final terminators = [")", "]", "}", '"', "/*", "\n", " "];
public static function nextToken(stream:Stream, expect:String) { public static function nextToken(stream:Stream, expect:String) {
var tok = stream.expect(expect, () -> stream.takeUntilOneOf(terminators)); switch (stream.takeUntilOneOf(terminators)) {
if (tok.length == 0) { case Some(tok) if (tok.length > 0):
return tok;
case None if (stream.content.length > 0):
var tok = stream.content;
stream.dropChars(stream.content.length);
return tok;
default:
stream.error('Expected $expect'); stream.error('Expected $expect');
return null; return null;
} }
return tok;
} }
public static function assertRead(stream:Stream, k:KissState):ReaderExp { public static function assertRead(stream:Stream, k:KissState):ReaderExp {