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

throw errors for unterminated strings with better position link

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-11-17 17:42:02 -07:00
parent 4e856bc4a7
commit 4fb98bc845
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -314,8 +314,10 @@ class Reader {
} }
do { do {
// TODO here, give the position of the start of the literal if expect fails var next = switch (stream.takeChars(1)) {
var next = stream.expect('closing "', () -> stream.takeChars(1)); case Some(c): c;
default: throw new StreamError(pos, 'Unterminated string literal. Expected "');
}
switch (next) { switch (next) {
case '$': case '$':
@@ -382,8 +384,15 @@ class Reader {
} }
} while (true); } while (true);
var startingPos = stream.position();
// TODO here, give the position of the start of the literal if expect fails // TODO here, give the position of the start of the literal if expect fails
return StrExp(stream.expect('closing $terminator', () -> stream.takeUntilAndDrop(terminator)));
return switch (stream.takeUntilAndDrop(terminator)) {
case Some(str):
StrExp(str);
default:
throw new StreamError(startingPos, 'Unterminated string literal. Expected $terminator');
};
} }
public static function toString(exp:ReaderExpDef) { public static function toString(exp:ReaderExpDef) {