diff options
author | Andy Wingo <wingo@pobox.com> | 2010-12-07 12:26:07 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-12-07 13:21:01 +0100 |
commit | d1079217947013dac495a95e433ad5da9f7aa80a (patch) | |
tree | d78ea60cd2c581c64d37ee3326733b255c836817 /libguile/vm-engine.c | |
parent | 1f845305c184814e253f0c4ac5a2aaac874b20a2 (diff) | |
download | guile-d1079217947013dac495a95e433ad5da9f7aa80a.tar.gz |
better unbound variable errors in the vm
* libguile/vm-i-system.c (variable-ref, toplevel-ref)
(long-toplevel-ref): Fixup callers.
* libguile/vm-engine.c (vm_error_unbound): Don't use vm-error for
unbound vars, use misc-error. Don't include VM: in the string. Take
the name directly in finish_args, not as a list.
Diffstat (limited to 'libguile/vm-engine.c')
-rw-r--r-- | libguile/vm-engine.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c index 5b38060d3..2e3a87644 100644 --- a/libguile/vm-engine.c +++ b/libguile/vm-engine.c @@ -139,9 +139,11 @@ VM_NAME (SCM vm, SCM program, SCM *argv, int nargs) goto vm_error; vm_error_unbound: - /* At this point FINISH_ARGS should be a one-element list containing - the name of the unbound variable. */ - err_msg = scm_from_locale_string ("VM: Unbound variable: ~s"); + /* FINISH_ARGS should be the name of the unbound variable. */ + SYNC_ALL (); + err_msg = scm_from_locale_string ("Unbound variable: ~s"); + scm_error_scm (scm_misc_error_key, program, err_msg, + scm_list_1 (finish_args), SCM_BOOL_F); goto vm_error; vm_error_apply_to_non_list: |