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/programs.c | |
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/programs.c')
-rw-r--r-- | libguile/programs.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libguile/programs.c b/libguile/programs.c index 9e74f98e3..5c43ac525 100644 --- a/libguile/programs.c +++ b/libguile/programs.c @@ -36,7 +36,7 @@ scm_t_bits scm_tc16_program; static SCM write_program = SCM_BOOL_F; SCM_DEFINE (scm_make_program, "make-program", 1, 2, 0, - (SCM objcode, SCM objtable, SCM free_vars), + (SCM objcode, SCM objtable, SCM free_variables), "") #define FUNC_NAME s_scm_make_program { @@ -45,12 +45,12 @@ SCM_DEFINE (scm_make_program, "make-program", 1, 2, 0, objtable = SCM_BOOL_F; else if (scm_is_true (objtable)) SCM_VALIDATE_VECTOR (2, objtable); - if (SCM_UNLIKELY (SCM_UNBNDP (free_vars))) - free_vars = SCM_BOOL_F; - else if (free_vars != SCM_BOOL_F) - SCM_VALIDATE_VECTOR (3, free_vars); + if (SCM_UNLIKELY (SCM_UNBNDP (free_variables))) + free_variables = SCM_BOOL_F; + else if (free_variables != SCM_BOOL_F) + SCM_VALIDATE_VECTOR (3, free_variables); - SCM_RETURN_NEWSMOB3 (scm_tc16_program, objcode, objtable, free_vars); + SCM_RETURN_NEWSMOB3 (scm_tc16_program, objcode, objtable, free_variables); } #undef FUNC_NAME @@ -59,8 +59,8 @@ program_mark (SCM obj) { if (scm_is_true (SCM_PROGRAM_OBJTABLE (obj))) scm_gc_mark (SCM_PROGRAM_OBJTABLE (obj)); - if (scm_is_true (SCM_PROGRAM_FREE_VARS (obj))) - scm_gc_mark (SCM_PROGRAM_FREE_VARS (obj)); + if (scm_is_true (SCM_PROGRAM_FREE_VARIABLES (obj))) + scm_gc_mark (SCM_PROGRAM_FREE_VARIABLES (obj)); return SCM_PROGRAM_OBJCODE (obj); } @@ -293,13 +293,13 @@ scm_c_program_source (SCM program, size_t ip) return source; /* (addr . (filename . (line . column))) */ } -SCM_DEFINE (scm_program_free_vars, "program-free-vars", 1, 0, 0, +SCM_DEFINE (scm_program_free_variables, "program-free-variables", 1, 0, 0, (SCM program), "") -#define FUNC_NAME s_scm_program_free_vars +#define FUNC_NAME s_scm_program_free_variables { SCM_VALIDATE_PROGRAM (1, program); - return SCM_PROGRAM_FREE_VARS (program); + return SCM_PROGRAM_FREE_VARIABLES (program); } #undef FUNC_NAME |