From 9a8cc8e7f736bda93706dc74e6ab8f07621dd341 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Thu, 2 Oct 2008 11:00:55 +0200 Subject: be more like the interpreter in signalling wrong-num-args * libguile/vm-engine.c: Call scm_wrong_num_args in the wrong-num-args case, to be more like the interpreter. * libguile/vm-engine.h (ASSERT): New macro. * libguile/vm-i-system.c (apply, goto/apply): Assert that nargs >= 2, because the compiler should always feed us correct instructions. (call/cc): If no values are returned to the continuation, signal no_values instead of wrong_num_args. --- libguile/vm-i-system.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'libguile/vm-i-system.c') diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c index db6d0a722..9a0e028a5 100644 --- a/libguile/vm-i-system.c +++ b/libguile/vm-i-system.c @@ -840,8 +840,7 @@ VM_DEFINE_INSTRUCTION (apply, "apply", 1, -1, 1) POP (ls); nargs = FETCH (); - if (nargs < 2) - goto vm_error_wrong_num_args; + ASSERT (nargs >= 2); len = scm_ilength (ls); if (len < 0) @@ -861,8 +860,7 @@ VM_DEFINE_INSTRUCTION (goto_apply, "goto/apply", 1, -1, 1) POP (ls); nargs = FETCH (); - if (nargs < 2) - goto vm_error_wrong_num_args; + ASSERT (nargs >= 2); len = scm_ilength (ls); if (len < 0) @@ -895,7 +893,7 @@ VM_DEFINE_INSTRUCTION (call_cc, "call/cc", 0, 1, 1) SCM values; values = scm_struct_ref (cont, SCM_INUM0); if (SCM_NULLP (values)) - goto vm_error_wrong_num_args; + goto vm_error_no_values; /* non-tail context does not accept multiple values? */ PUSH (SCM_CAR (values)); NEXT; -- cgit v1.2.3