From 81844497e621997c527ceedd722854966bd098e0 Mon Sep 17 00:00:00 2001 From: Teddy Date: Sun, 11 Aug 2013 13:05:51 +0800 Subject: fixed `next` pointer and `ext_repr` issues --- eval.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'eval.cpp') diff --git a/eval.cpp b/eval.cpp index 0b9150e..6376ba9 100644 --- a/eval.cpp +++ b/eval.cpp @@ -102,7 +102,7 @@ void push(Pair * &pc, FrameObj ** &top_ptr, Environment *envt) { throw NormalError(SYN_ERR_EMPTY_COMB); *top_ptr++ = new RetAddr(pc); // Push the return address - if (!is_list(TO_PAIR(pc->car))) + if (!make_exec(TO_PAIR(pc->car))) throw TokenError(pc->car->ext_repr(), RUN_ERR_WRONG_NUM_OF_ARGS); // static_cast because of is_simple_obj() is false pc = static_cast(pc->car); // Go deeper to enter the call @@ -121,7 +121,6 @@ EvalObj *Evaluator::run_expr(Pair *prog) { { if (top_ptr == eval_stack + EVAL_STACK_SIZE) throw TokenError("Evaluation", RUN_ERR_STACK_OVERFLOW); -// for (; pc && pc->skip; pc = pc->next); if (pc) push(pc, top_ptr, envt); else -- cgit v1.2.3