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

fix wrong position in read error for unmatched (

Browse Source
This commit is contained in:
Nat Quayle Nelson
2022-06-08 01:59:47 +00:00
parent e051d312b0
commit 63dafc964e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,10 @@ class Reader {
public static function builtins() { public static function builtins() {
var readTable:ReadTable = []; var readTable:ReadTable = [];
readTable["("] = (stream, k) -> CallExp(assertRead(stream, k), readExpArray(stream, ")", k)); readTable["("] = (stream, k) -> {
var pos = stream.position();
CallExp(assertRead(stream, k), readExpArray(stream, ")", k, pos));
};
readTable["["] = (stream, k) -> ListExp(readExpArray(stream, "]", k)); readTable["["] = (stream, k) -> ListExp(readExpArray(stream, "]", k));
readTable["[::"] = (stream, k) -> ListEatingExp(readExpArray(stream, "]", k)); readTable["[::"] = (stream, k) -> ListEatingExp(readExpArray(stream, "]", k));
readTable["..."] = (stream, k) -> ListRestExp(nextToken(stream, "name for list-eating rest exp", true)); readTable["..."] = (stream, k) -> ListRestExp(nextToken(stream, "name for list-eating rest exp", true));
@@ -286,9 +289,10 @@ class Reader {
} }
} }
public static function readExpArray(stream:Stream, end:String, k:KissState):Array<ReaderExp> { public static function readExpArray(stream:Stream, end:String, k:KissState, startingPos=null):Array<ReaderExp> {
var array = []; var array = [];
var startingPos = stream.position(); if (startingPos == null)
startingPos = stream.position();
while (!stream.startsWith(end)) { while (!stream.startsWith(end)) {
stream.dropWhitespace(); stream.dropWhitespace();
if (!stream.startsWith(end)) { if (!stream.startsWith(end)) {