From b6a279fafe43f502ab5647a705b8880f8961b404 Mon Sep 17 00:00:00 2001 From: Teddy Date: Wed, 7 Aug 2013 16:37:43 +0800 Subject: fixed a severe bug in `define` --- model.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'model.cpp') diff --git a/model.cpp b/model.cpp index 67db5fe..89849ca 100644 --- a/model.cpp +++ b/model.cpp @@ -145,19 +145,19 @@ Cons *ProcObj::call(ArgList *args, Environment * &genvt, // Create local env and recall the closure Environment *_envt = new Environment(envt); // static_cast because the para_list is already checked - Cons *ptr, *ppar; + Cons *ppar; EvalObj *nptr; - for (ptr = TO_CONS(args->cdr), ppar = para_list; + for (ppar = para_list; ppar != empty_list; ppar = TO_CONS(ppar->cdr)) { - _envt->add_binding(static_cast(ppar->car), ptr->car); - if ((nptr = ptr->cdr)->is_cons_obj()) - ptr = TO_CONS(nptr); + if ((nptr = args->cdr)->is_cons_obj()) + args = TO_CONS(nptr); else break; + _envt->add_binding(static_cast(ppar->car), args->car); } - if (ptr->cdr != empty_list || ppar->cdr != empty_list) + if (args->cdr != empty_list || ppar != empty_list) throw TokenError("", RUN_ERR_WRONG_NUM_OF_ARGS); genvt = _envt; -- cgit v1.2.3