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

Fix typed expression being space-separated-only

Browse Source
This commit is contained in:
Nat Quayle Nelson
2023-03-02 06:02:38 -07:00
parent c5ebdb3293
commit b1acee7254
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,7 @@ class Reader {
RawHaxeBlock(stream.expect("closing }#", () -> stream.takeUntilAndDrop("}#"))); RawHaxeBlock(stream.expect("closing }#", () -> stream.takeUntilAndDrop("}#")));
}; };
readTable[":"] = (stream:Stream, k) -> TypedExp(stream.expect("a type path", () -> stream.takeUntilAndDrop(" ")), assertRead(stream, k)); readTable[":"] = (stream:Stream, k) -> TypedExp(stream.expect("a type path", () -> stream.takeUntilOneOf(whitespace)), assertRead(stream, k));
readTable["&"] = (stream:Stream, k) -> MetaExp(nextToken(stream, "a meta symbol like mut, optional, rest"), assertRead(stream, k)); readTable["&"] = (stream:Stream, k) -> MetaExp(nextToken(stream, "a meta symbol like mut, optional, rest"), assertRead(stream, k));
@@ -228,7 +228,8 @@ class Reader {
return readTable; return readTable;
} }
public static final terminators = [")", "]", "}", '"', "/*", "\n", " "]; public static final whitespace = [" ", "\t", "\n"];
public static final terminators = [")", "]", "}", '"', "/*"].concat(whitespace);
public static function nextToken(stream:Stream, expect:String, allowEmptyString = false) { public static function nextToken(stream:Stream, expect:String, allowEmptyString = false) {
switch (stream.takeUntilOneOf(terminators, true)) { switch (stream.takeUntilOneOf(terminators, true)) {