sjs/lake
1
0
Fork 0
mirror of https://github.com/samsonjs/lake.git synced 2026-04-27 14:57:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

consolidate arg checks in apply

Browse source
This commit is contained in:
Sami Samhuri 2011-04-24 12:14:31 -07:00
parent 4bfb171676
commit e325a30b7b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/eval.c
View file

@ -346,10 +346,14 @@ LakeVal *apply(LakeCtx *ctx, LakeVal *fnVal, LakeList *args)
/* Check # of params */ /* Check # of params */
size_t nparams = LIST_N(fn->params); size_t nparams = LIST_N(fn->params);
if (nparams != LIST_N(args) && !fn->varargs) { if (!fn->varargs && LIST_N(args) != nparams) {
ERR("expected %zu params but got %zu", nparams, LIST_N(args)); ERR("expected %zu params but got %zu", nparams, LIST_N(args));
return NULL; return NULL;
} }
else if (fn->varargs && LIST_N(args) < nparams) {
ERR("expected at least %zu params but got %zu", nparams, LIST_N(args));
return NULL;
}
Env *env = env_make(fn->closure); Env *env = env_make(fn->closure);
@ -361,10 +365,6 @@ LakeVal *apply(LakeCtx *ctx, LakeVal *fnVal, LakeList *args)
/* bind varargs */ /* bind varargs */
if (fn->varargs) { if (fn->varargs) {
if (LIST_N(args) < nparams) {
ERR("expected at least %zu params but got %zu", nparams, LIST_N(args));
return NULL;
}
LakeList *remainingArgs = list_make_with_capacity(LIST_N(args) - nparams); LakeList *remainingArgs = list_make_with_capacity(LIST_N(args) - nparams);
for (; i < LIST_N(args); ++i) { for (; i < LIST_N(args); ++i) {
list_append(remainingArgs, LIST_VAL(args, i)); list_append(remainingArgs, LIST_VAL(args, i));