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

Arg num checks for and/or/not

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-01-04 09:03:44 -07:00
parent 95fa5e5a12
commit eff6a5e62e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,6 +108,7 @@ class Macros {
// (or... ) uses (cond... ) under the hood // (or... ) uses (cond... ) under the hood
macros["or"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k) -> { macros["or"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k) -> {
wholeExp.checkNumArgs(2, null, "(or [v1] [v2] [values...])");
var uniqueVarName = "_" + Uuid.v4().toShort(); var uniqueVarName = "_" + Uuid.v4().toShort();
var uniqueVarSymbol = Symbol(uniqueVarName).withPos(args[0].pos); var uniqueVarSymbol = Symbol(uniqueVarName).withPos(args[0].pos);
@@ -126,6 +127,7 @@ class Macros {
// (and... uses (cond... ) and (not ...) under the hood) // (and... uses (cond... ) and (not ...) under the hood)
macros["and"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k) -> { macros["and"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k) -> {
wholeExp.checkNumArgs(2, null, "(and [v1] [v2] [values...])");
var uniqueVarName = "_" + Uuid.v4().toShort(); var uniqueVarName = "_" + Uuid.v4().toShort();
var uniqueVarSymbol = Symbol(uniqueVarName).withPosOf(wholeExp); var uniqueVarSymbol = Symbol(uniqueVarName).withPosOf(wholeExp);

3
kiss/src/kiss/SpecialForms.hx
View File

@@ -326,8 +326,7 @@ class SpecialForms {
}; };
map["not"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> { map["not"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
if (args.length != 1) wholeExp.checkNumArgs(1, 1, '(not [value])');
throw CompileError.fromExp(wholeExp, '(not... ) only takes one argument, not $args');
var condition = k.convert(args[0]); var condition = k.convert(args[0]);
var truthyExp = macro Prelude.truthy($condition); var truthyExp = macro Prelude.truthy($condition);
macro !$truthyExp; macro !$truthyExp;