mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-17 01:00:20 +02:00
Code Activity

better unbound variable errors in the vm

Browse source 
* 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.
This commit is contained in:
Andy Wingo 2010-12-07 12:26:07 +01:00
parent 1f845305c1
commit d107921794
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libguile/vm-engine.c
View file

@ -139,9 +139,11 @@ VM_NAME (SCM vm, SCM program, SCM *argv, int nargs)
goto vm_error; goto vm_error;
vm_error_unbound: vm_error_unbound:
/* At this point FINISH_ARGS should be a one-element list containing /* FINISH_ARGS should be the name of the unbound variable. */
the name of the unbound variable. */ SYNC_ALL ();
err_msg = scm_from_locale_string ("VM: Unbound variable: ~s"); 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; goto vm_error;
vm_error_apply_to_non_list: vm_error_apply_to_non_list:

6
libguile/vm-i-system.c
View file

@ -306,7 +306,7 @@ VM_DEFINE_INSTRUCTION (25, variable_ref, "variable-ref", 0, 1, 1)
/* Attempt to provide the variable name in the error message. */ /* Attempt to provide the variable name in the error message. */
var_name = scm_module_reverse_lookup (scm_current_module (), x); var_name = scm_module_reverse_lookup (scm_current_module (), x);
finish_args = scm_list_1 (scm_is_true (var_name) ? var_name : x); finish_args = scm_is_true (var_name) ? var_name : x;
goto vm_error_unbound; goto vm_error_unbound;
} }
else else
@ -340,7 +340,7 @@ VM_DEFINE_INSTRUCTION (27, toplevel_ref, "toplevel-ref", 1, 0, 1)
resolved = resolve_variable (what, scm_program_module (program)); resolved = resolve_variable (what, scm_program_module (program));
if (!VARIABLE_BOUNDP (resolved)) if (!VARIABLE_BOUNDP (resolved))
{ {
finish_args = scm_list_1 (what); finish_args = what;
goto vm_error_unbound; goto vm_error_unbound;
} }
what = resolved; what = resolved;
@ -366,7 +366,7 @@ VM_DEFINE_INSTRUCTION (28, long_toplevel_ref, "long-toplevel-ref", 2, 0, 1)
resolved = resolve_variable (what, scm_program_module (program)); resolved = resolve_variable (what, scm_program_module (program));
if (!VARIABLE_BOUNDP (resolved)) if (!VARIABLE_BOUNDP (resolved))
{ {
finish_args = scm_list_1 (what); finish_args = what;
goto vm_error_unbound; goto vm_error_unbound;
} }
what = resolved; what = resolved;