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

fix new bug in reader macros without &builder

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-11-29 17:06:17 -07:00
parent 67f56aa68d
commit 5706dcaa6b
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kiss/src/kiss/Macros.hx
View File

@@ -560,8 +560,10 @@ class Macros {
}
var startingPos = stream.position();
var body = CallExp(Symbol("begin").withPos(startingPos), exps.slice(2)).withPos(startingPos);
var evalArgs:Map<String,Dynamic> = [streamArgName => stream];
if (builderArgName != null) evalArgs[builderArgName] = body.expBuilder();
try {
Helpers.runAtCompileTime(body, k, [streamArgName => stream, builderArgName => body.expBuilder()]).def;
Helpers.runAtCompileTime(body, k, evalArgs).def;
} catch (err) {
var expForError = Symbol(s).withPos(startingPos);
CompileError.warnFromExp(wholeExp, 'Error from this reader macro');

6
projects/aoc/src/UtilMacros.kiss
View File

@@ -1,12 +1,12 @@
(defmacro year [num &body body]
(defMacro year [num &body body]
`(#when ,(symbol (+ "year" (symbolNameValue num)))
(print (+ "year " (Std.string ,num)))
,@body))
(defmacro day [num &body body]
(defMacro day [num &body body]
`(#when ,(symbol (+ "day" (symbolNameValue num)))
(print (+ "day " (Std.string ,num)))
,@body))
(defmacro dayTodo [num]
(defMacro dayTodo [num]
`(day ,num (print "TODO")))

7
projects/aoc/src/year2020/EvasionDSL.kiss
View File

@@ -29,10 +29,9 @@
(3 (N num))
(otherwise (throw (+ "Bad facing" facing)))))
(defReaderMacro "" [stream]
(defReaderMacro "" [stream &builder b]
(stream.dropWhitespace)
(if (stream.isEmpty)
null
`(,(ReaderExp.Symbol
(stream.expect "a ship command" (lambda [] (stream.takeChars 1))))
,(ReaderExp.Symbol (stream.expect "a number argument" (lambda [] (stream.takeUntilAndDrop #|"\n"|#)))))))
`(,(b.symbol (stream.expect "a ship command" ->(stream.takeChars 1)))
,(b.symbol (stream.expect "a number argument" ->(stream.takeUntilAndDrop #|"\n"|#))))))