mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

Import unbound variable reports in the VM.

Browse source 
* libguile/vm-engine.c (VM_NAME)[vm_error_unbound]: Add comment.

* libguile/vm-i-system.c (variable_ref): Attempt provide the name of X
  in FINISH_ARGS.
This commit is contained in:
Ludovic Courtès 2010-07-26 16:36:24 +02:00
parent fefd60ba4b
commit 1af772303b
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libguile/vm-engine.c
View file

@ -140,6 +140,8 @@ 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
the name of the unbound variable. */
err_msg = scm_from_locale_string ("VM: Unbound variable: ~s"); err_msg = scm_from_locale_string ("VM: Unbound variable: ~s");
goto vm_error; goto vm_error;

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

@ -307,10 +307,13 @@ VM_DEFINE_INSTRUCTION (26, variable_ref, "variable-ref", 0, 1, 1)
{ {
SCM x = *sp; SCM x = *sp;
if (!VARIABLE_BOUNDP (x)) if (SCM_UNLIKELY (!VARIABLE_BOUNDP (x)))
{ {
finish_args = scm_list_1 (x); SCM var_name;
/* Was: finish_args = SCM_LIST1 (SCM_CAR (x)); */
/* Attempt to provide the variable name in the error message. */
var_name = scm_module_reverse_lookup (scm_current_module (), x);
finish_args = scm_list_1 (scm_is_true (var_name) ? var_name : x);
goto vm_error_unbound; goto vm_error_unbound;
} }
else else