summaryrefslogtreecommitdiff
path: root/libguile/vm-i-system.c
diff options
context:
space:
mode:
authorBrian Templeton <bpt@hcoop.net>2010-08-14 18:35:17 -0400
committerAndy Wingo <wingo@pobox.com>2010-12-07 13:21:01 +0100
commitef94624eaf549ca9c730d4650b9dfed2ee48521b (patch)
tree5cc8343605d2fa9e9aac28bd3328ab71cdb01e7b /libguile/vm-i-system.c
parentd1079217947013dac495a95e433ad5da9f7aa80a (diff)
downloadguile-ef94624eaf549ca9c730d4650b9dfed2ee48521b.tar.gz
unbound fluids
* libguile/fluids.c (scm_make_undefined_fluid, scm_fluid_unset_x) (scm_fluid_bound_p): New functions. (fluid_ref): New function; like scm_fluid_ref, but will not throw an error for unbound fluids. (scm_fluid_ref, swap_fluid): Use `fluid_ref'. * libguile/fluids.h (scm_make_undefined_fluid, scm_fluid_unset_x) (scm_fluid_bound_p): New prototypes. * libguile/vm-i-system.c (fluid_ref): If fluid is unbound, jump to `vm_error_unbound_fluid'. * libguile/vm-engine.c (VM_NAME)[vm_error_unbound_fluid]: New error message. * test-suite/tests/fluids.test ("unbound fluids")["fluid-ref of unbound fluid", "fluid-bound? of bound fluid", "fluid-bound? of unbound fluid", "unbound fluids can be set", "bound fluids can be unset"]: New tests.
Diffstat (limited to 'libguile/vm-i-system.c')
-rw-r--r--libguile/vm-i-system.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c
index e1aedd7cd..5b40c1b9d 100644
--- a/libguile/vm-i-system.c
+++ b/libguile/vm-i-system.c
@@ -1612,7 +1612,15 @@ VM_DEFINE_INSTRUCTION (91, fluid_ref, "fluid-ref", 0, 1, 1)
*sp = scm_fluid_ref (*sp);
}
else
- *sp = SCM_SIMPLE_VECTOR_REF (fluids, num);
+ {
+ SCM val = SCM_SIMPLE_VECTOR_REF (fluids, num);
+ if (SCM_UNLIKELY (val == SCM_UNDEFINED))
+ {
+ finish_args = *sp;
+ goto vm_error_unbound_fluid;
+ }
+ *sp = val;
+ }
NEXT;
}