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

Better errors when reading an array hits end of stream

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-11-17 17:28:18 -07:00
parent 9b81dfb6f7
commit 21bddc14e2
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -244,11 +244,17 @@ class Reader {
public static function readExpArray(stream:Stream, end:String, k:KissState):Array<ReaderExp> { public static function readExpArray(stream:Stream, end:String, k:KissState):Array<ReaderExp> {
var array = []; var array = [];
var startingPos = stream.position();
while (!stream.startsWith(end)) { while (!stream.startsWith(end)) {
stream.dropWhitespace(); stream.dropWhitespace();
if (!stream.startsWith(end)) { if (!stream.startsWith(end)) {
try { try {
array.push(assertRead(stream, k)); switch (read(stream, k)) {
case Some(exp):
array.push(exp);
case None:
throw new StreamError(startingPos, 'Ran out of expressions before $end was found.');
}
} catch (s:UnmatchedBracketSignal) { } catch (s:UnmatchedBracketSignal) {
if (s.type == end) if (s.type == end)
break; break;
@@ -308,6 +314,7 @@ class Reader {
} }
do { do {
// TODO here, give the position of the start of the literal if expect fails
var next = stream.expect('closing "', () -> stream.takeChars(1)); var next = stream.expect('closing "', () -> stream.takeChars(1));
switch (next) { switch (next) {
@@ -374,6 +381,8 @@ class Reader {
return null; return null;
} }
} while (true); } while (true);
// TODO here, give the position of the start of the literal if expect fails
return StrExp(stream.expect('closing $terminator', () -> stream.takeUntilAndDrop(terminator))); return StrExp(stream.expect('closing $terminator', () -> stream.takeUntilAndDrop(terminator)));
} }