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

fix defNew optional binding list

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-08-01 16:33:39 -06:00
parent 44f1d712c9
commit 3fcc4f0503
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -661,12 +661,16 @@ class Macros {
macros["defnew"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> { macros["defnew"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
wholeExp.checkNumArgs(1, null, "(defNew [[args...]] [[optional property bindings...]] [optional body...]"); wholeExp.checkNumArgs(1, null, "(defNew [[args...]] [[optional property bindings...]] [optional body...]");
var args = exps[0]; var args = exps.shift();
var bindingList = if (exps.length > 1) { var bindingList = [];
exps[1].bindingList("defNew", true);
} else { if (exps.length != 0) {
[]; switch (exps[0].def) {
}; case ListExp(_):
bindingList = exps.shift().bindingList("defNew", true);
default:
}
}
var bindingPairs = Prelude.groups(bindingList, 2); var bindingPairs = Prelude.groups(bindingList, 2);
var propertyDefs = [for (bindingPair in bindingPairs) { var propertyDefs = [for (bindingPair in bindingPairs) {
@@ -706,7 +710,7 @@ class Macros {
b.call(b.symbol("method"), [ b.call(b.symbol("method"), [
b.symbol("new"), b.symbol("new"),
b.list(argList) b.list(argList)
].concat(propertySetExps).concat(exps.slice(2))) ].concat(propertySetExps).concat(exps))
])); ]));
}; };
renameAndDeprecate("defnew", "defNew"); renameAndDeprecate("defnew", "defNew");