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

key-value for loops

Browse Source
This commit is contained in:
Nat Quayle Nelson
2020-12-07 18:38:22 -07:00
parent 0b8d1a00e1
commit b28a39250d
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/kiss/SpecialForms.hx
View File

@@ -183,15 +183,23 @@ class SpecialForms {
}; };
function forExpr(formName:String, wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) { function forExpr(formName:String, wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) {
wholeExp.checkNumArgs(3, null, '($formName [varName] [list] [body...])'); wholeExp.checkNumArgs(3, null, '($formName [varName or [varNames...] or =>keyName valueName] [list] [body...])');
var uniqueVarName = "_" + Uuid.v4().toShort(); var uniqueVarName = "_" + Uuid.v4().toShort();
var namesExp = args[0]; var namesExp = args[0];
var listExp = args[1]; var listExp = args[1];
var bodyExps = args.slice(2); var bodyExps = args.slice(2);
bodyExps.insert(0, CallExp(Symbol("deflocal").withPosOf(args[2]), [namesExp, Symbol(uniqueVarName).withPosOf(args[2])]).withPosOf(args[2]));
var loopVarExpr:Expr = switch (namesExp.def) {
case KeyValueExp(_, _): k.convert(namesExp);
default: {
bodyExps.insert(0,
CallExp(Symbol("deflocal").withPosOf(args[2]), [namesExp, Symbol(uniqueVarName).withPosOf(args[2])]).withPosOf(args[2]));
macro $i{uniqueVarName};
}
};
var body = CallExp(Symbol("begin").withPosOf(args[2]), bodyExps).withPosOf(args[2]); var body = CallExp(Symbol("begin").withPosOf(args[2]), bodyExps).withPosOf(args[2]);
return EFor(EBinop(OpIn, EConst(CIdent(uniqueVarName)).withMacroPosOf(wholeExp), k.convert(listExp)).withMacroPosOf(wholeExp), return EFor(EBinop(OpIn, loopVarExpr, k.convert(listExp)).withMacroPosOf(wholeExp), k.convert(body)).withMacroPosOf(wholeExp);
k.convert(body)).withMacroPosOf(wholeExp);
} }
map["doFor"] = forExpr.bind("doFor"); map["doFor"] = forExpr.bind("doFor");

4
src/test/cases/BasicTestCase.kiss
View File

@@ -346,4 +346,6 @@
=>"found" "me"]) =>"found" "me"])
(Assert.equals "you" (dict-get myMap "hey")) (Assert.equals "you" (dict-get myMap "hey"))
(Assert.equals "me" (dict-get myMap "found")) (Assert.equals "me" (dict-get myMap "found"))
) (doFor =>key value myMap
(Assert.isTrue (<= 0 (.indexOf ["hey" "found"] key)))
(Assert.isTrue (<= 0 (.indexOf ["you" "me"] value)))))