diff options
author | Andy Wingo <wingo@pobox.com> | 2009-10-13 23:45:22 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-10-23 14:51:19 +0200 |
commit | 56164a5a6c45a4fba065be2cc9a2539ef5cd2b71 (patch) | |
tree | 8f9c94aefc190e254bf14c8ec17cbf251261edd2 /libguile/procs.c | |
parent | a6f15a1eba208c92df5640001390277d641909b8 (diff) | |
download | guile-56164a5a6c45a4fba065be2cc9a2539ef5cd2b71.tar.gz |
de-nargs struct scm_objcode; procedure-property refactor
* libguile/objcodes.h (struct scm_objcode): Remove nargs, nrest, and
nlocs, as they are no longer needed. Also obviates the need for a
padding word.
* libguile/procs.c (scm_thunk_p): Use scm_i_program_arity for programs.
* libguile/procprop.c (scm_i_procedure_arity): Use scm_i_program_arity
for programs.
(scm_procedure_properties, scm_set_procedure_properties_x)
(scm_procedure_property, scm_set_procedure_property_x): Rework so that
non-closure properties are stored directly in a weak hash, instead of
needing a weak hash of "stand-in" closures to hold the properties. Fix
docstrings also.
* libguile/root.h (scm_stand_in_procs): Remove from the scm_sys_protects
set. Actually with libGC, we should be able to store the elements of
scm_sys_protects directly as global variables.
* libguile/gc.c (scm_init_storage): Remove scm_stand_in_procs
initialization.
* libguile/programs.c (scm_i_program_arity): New private accessor, tries
to determine the "minimum arity" of a program.
* libguile/vm.c (really_make_boot_program): Adapt to changes in
struct scm_objcode.
* module/language/assembly.scm (*program-header-len*, byte-length):
* module/language/assembly/compile-bytecode.scm (write-bytecode):
* module/language/assembly/decompile-bytecode.scm (decode-load-program):
* module/language/assembly/disassemble.scm (disassemble-load-program):
Adapt to changes in objcode.
* module/system/xref.scm (program-callee-rev-vars): Adapt to changes in
assembly.
* module/language/glil.scm: Remove nargs, nrest, and nlocs from
glil-program.
* module/language/glil/compile-assembly.scm (make-meta, glil->assembly):
* module/language/glil/decompile-assembly.scm (decompile-toplevel):
(decompile-load-program): Adapt to changes in GLIL and assembly.
* module/language/tree-il/compile-glil.scm (flatten-lambda): Adapt to
changes in GLIL.
* test-suite/tests/asm-to-bytecode.test: Adapt to assembly and bytecode
changes.
* test-suite/tests/tree-il.test: Adapt to GLIL changes.
Diffstat (limited to 'libguile/procs.c')
-rw-r--r-- | libguile/procs.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libguile/procs.c b/libguile/procs.c index 40d6231bb..5de2f33f1 100644 --- a/libguile/procs.c +++ b/libguile/procs.c @@ -144,16 +144,18 @@ SCM_DEFINE (scm_thunk_p, "thunk?", 1, 0, 0, case scm_tc7_gsubr: return scm_from_bool (SCM_GSUBR_REQ (SCM_GSUBR_TYPE (obj)) == 0); case scm_tc7_program: - return scm_from_bool (SCM_PROGRAM_DATA (obj)->nargs == 0 - || (SCM_PROGRAM_DATA (obj)->nargs == 1 - && SCM_PROGRAM_DATA (obj)->nrest)); + { + int a, o, r; + if (scm_i_program_arity (obj, &a, &o, &r)) + return scm_from_bool (a == 0); + else + return SCM_BOOL_F; + } case scm_tc7_pws: obj = SCM_PROCEDURE (obj); goto again; default: - if (SCM_PROGRAM_P (obj) && SCM_PROGRAM_DATA (obj)->nargs == 0) - return SCM_BOOL_T; - /* otherwise fall through */ + return SCM_BOOL_F; } } return SCM_BOOL_F; |