diff options
author | Andy Wingo <wingo@pobox.com> | 2009-07-23 14:36:22 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-07-23 17:15:17 +0200 |
commit | 57ab0671d71bd6e485784f46b6dea4708661082d (patch) | |
tree | 21e72626f2318cf4550e6722ad722699e2992cb2 /libguile/vm-engine.h | |
parent | 20d47c3915c1b910e683d4b010b91c48047d6251 (diff) | |
download | guile-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-engine.h')
-rw-r--r-- | libguile/vm-engine.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libguile/vm-engine.h b/libguile/vm-engine.h index b860bf151..15ebb539e 100644 --- a/libguile/vm-engine.h +++ b/libguile/vm-engine.h @@ -152,16 +152,16 @@ } \ } \ { \ - SCM c = SCM_PROGRAM_FREE_VARS (program); \ + SCM c = SCM_PROGRAM_FREE_VARIABLES (program); \ if (SCM_I_IS_VECTOR (c)) \ { \ - closure = SCM_I_VECTOR_WELTS (c); \ - closure_count = SCM_I_VECTOR_LENGTH (c); \ + free_vars = SCM_I_VECTOR_WELTS (c); \ + free_vars_count = SCM_I_VECTOR_LENGTH (c); \ } \ else \ { \ - closure = NULL; \ - closure_count = 0; \ + free_vars = NULL; \ + free_vars_count = 0; \ } \ } \ } @@ -189,11 +189,11 @@ #define CHECK_OBJECT(_num) #endif -#if VM_CHECK_CLOSURE -#define CHECK_CLOSURE(_num) \ - do { if (SCM_UNLIKELY ((_num) >= closure_count)) goto vm_error_closure; } while (0) +#if VM_CHECK_FREE_VARIABLES +#define CHECK_FREE_VARIABLE(_num) \ + do { if (SCM_UNLIKELY ((_num) >= free_vars_count)) goto vm_error_free_variable; } while (0) #else -#define CHECK_CLOSURE(_num) +#define CHECK_FREE_VARIABLE(_num) #endif |