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

more expBuilder simplification

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-07-12 20:42:14 -06:00
parent 33b4399c3b
commit ab2bacaea9
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -469,6 +469,7 @@ class Macros {
macros[name] = (wholeExp:ReaderExp, innerExps:Array<ReaderExp>, k:KissState) -> { macros[name] = (wholeExp:ReaderExp, innerExps:Array<ReaderExp>, k:KissState) -> {
wholeExp.checkNumArgs(minArgs, maxArgs, macroCallForm); wholeExp.checkNumArgs(minArgs, maxArgs, macroCallForm);
var b = wholeExp.expBuilder();
var innerArgNames = argNames.copy(); var innerArgNames = argNames.copy();
var args:Map<String, Dynamic> = []; var args:Map<String, Dynamic> = [];
@@ -487,7 +488,7 @@ class Macros {
} }
// Return the macro expansion: // Return the macro expansion:
return Helpers.runAtCompileTime(CallExp(Symbol("begin").withPosOf(wholeExp), exps.slice(2)).withPosOf(wholeExp), k, args); return Helpers.runAtCompileTime(b.callSymbol("begin", exps.slice(2)), k, args);
}; };
null; null;
@@ -833,16 +834,16 @@ class Macros {
}; };
} }
// TODO use expBuilder()
static function variadicMacro(func:String):MacroFunction { static function variadicMacro(func:String):MacroFunction {
return (wholeExp:ReaderExp, exps:Array<ReaderExp>, k) -> { return (wholeExp:ReaderExp, exps:Array<ReaderExp>, k) -> {
CallExp(Symbol(func).withPosOf(wholeExp), [ var b = wholeExp.expBuilder();
ListExp([ b.callSymbol(func, [
b.list([
for (exp in exps) { for (exp in exps) {
CallExp(Symbol("kiss.Operand.fromDynamic").withPosOf(wholeExp), [exp]).withPosOf(wholeExp); b.callSymbol("kiss.Operand.fromDynamic", [exp]);
} }
]).withPosOf(wholeExp) ])
]).withPosOf(wholeExp); ]);
}; };
} }
} }