summaryrefslogtreecommitdiff
path: root/libguile/vm-i-system.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-07-23 14:36:22 +0200
committerAndy Wingo <wingo@pobox.com>2009-07-23 17:15:17 +0200
commit57ab0671d71bd6e485784f46b6dea4708661082d (patch)
tree21e72626f2318cf4550e6722ad722699e2992cb2 /libguile/vm-i-system.c
parent20d47c3915c1b910e683d4b010b91c48047d6251 (diff)
downloadguile-57ab0671d71bd6e485784f46b6dea4708661082d.tar.gz
rename "closure-ref" to "free-ref"; s/vars/variables/ in some names
* libguile/programs.h: * libguile/programs.c: (SCM_PROGRAM_FREE_VARIABLES): Rename from SCM_PROGRAM_FREE_VARS. Callers changed. * libguile/programs.c (scm_make_program): Rename arg to "free_variables". (scm_program_free_variables): Rename from program-free-vars. * libguile/vm-engine.h: * libguile/vm-engine.c (VM_CHECK_FREE_VARIABLES): Rename from VM_CHECK_CLOSURE. (vm_engine, CACHE_PROGRAM): Rename closure and closure_count to free_vars and free_vars_vount. * libguile/vm-i-system.c (FREE_VARIABLE_REF): Rename from CLOSURE_REF. (free-ref, free-boxed-ref, free-boxed-set): Rename from closure-ref, closure-boxed-ref, closure-boxed-set. (make-closure): Renamed from make-closure2. * module/language/glil/compile-assembly.scm (glil->assembly): Hack to never write out the the old "make-closure" instruction. Will fix better later. Change to emit free-ref etc instead of closure-ref. * module/language/tree-il/compile-glil.scm (flatten): Emit make-closure instead of make-closure2, now that the old make-closure is gone. * module/system/vm/program.scm (system): Rename program-free-vars to program-free-variables. * test-suite/tests/tree-il.test ("lambda"): Update for make-closure.
Diffstat (limited to 'libguile/vm-i-system.c')
-rw-r--r--libguile/vm-i-system.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c
index a7e05c83b..e12217ecc 100644
--- a/libguile/vm-i-system.c
+++ b/libguile/vm-i-system.c
@@ -248,7 +248,7 @@ VM_DEFINE_INSTRUCTION (22, list_break, "list-break", 0, 0, 0)
#define VARIABLE_SET(v,o) SCM_VARIABLE_SET (v, o)
#define VARIABLE_BOUNDP(v) (VARIABLE_REF (v) != SCM_UNDEFINED)
-#define CLOSURE_REF(i) closure[i]
+#define FREE_VARIABLE_REF(i) free_vars[i]
/* ref */
@@ -1138,41 +1138,41 @@ VM_DEFINE_INSTRUCTION (59, local_boxed_set, "local-boxed-set", 1, 1, 0)
NEXT;
}
-VM_DEFINE_INSTRUCTION (60, closure_ref, "closure-ref", 1, 0, 1)
+VM_DEFINE_INSTRUCTION (60, free_ref, "free-ref", 1, 0, 1)
{
scm_t_uint8 idx = FETCH ();
- CHECK_CLOSURE (idx);
- PUSH (CLOSURE_REF (idx));
+ CHECK_FREE_VARIABLE (idx);
+ PUSH (FREE_VARIABLE_REF (idx));
NEXT;
}
-/* no closure-set -- if a var is assigned, it should be in a box */
+/* no free-set -- if a var is assigned, it should be in a box */
-VM_DEFINE_INSTRUCTION (61, closure_boxed_ref, "closure-boxed-ref", 1, 0, 1)
+VM_DEFINE_INSTRUCTION (61, free_boxed_ref, "free-boxed-ref", 1, 0, 1)
{
SCM v;
scm_t_uint8 idx = FETCH ();
- CHECK_CLOSURE (idx);
- v = CLOSURE_REF (idx);
+ CHECK_FREE_VARIABLE (idx);
+ v = FREE_VARIABLE_REF (idx);
ASSERT_BOUND_VARIABLE (v);
PUSH (VARIABLE_REF (v));
NEXT;
}
-VM_DEFINE_INSTRUCTION (62, closure_boxed_set, "closure-boxed-set", 1, 1, 0)
+VM_DEFINE_INSTRUCTION (62, free_boxed_set, "free-boxed-set", 1, 1, 0)
{
SCM v, val;
scm_t_uint8 idx = FETCH ();
POP (val);
- CHECK_CLOSURE (idx);
- v = CLOSURE_REF (idx);
+ CHECK_FREE_VARIABLE (idx);
+ v = FREE_VARIABLE_REF (idx);
ASSERT_BOUND_VARIABLE (v);
VARIABLE_SET (v, val);
NEXT;
}
-VM_DEFINE_INSTRUCTION (63, make_closure2, "make-closure2", 0, 2, 1)
+VM_DEFINE_INSTRUCTION (63, make_closure, "make-closure", 0, 2, 1)
{
SCM vect;
POP (vect);