diff options
author | Andy Wingo <wingo@pobox.com> | 2009-12-04 19:20:11 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-12-04 19:20:11 +0100 |
commit | 314b87163eac1358923cb84e7f2c87d06aa03756 (patch) | |
tree | e8c0a077e3f4c4d0920c4e2586e79b18277c09c7 /libguile/procprop.c | |
parent | f36878ba2d04427e76b85a9e91fce71f56ba7c7f (diff) | |
download | guile-314b87163eac1358923cb84e7f2c87d06aa03756.tar.gz |
eval.c closures are now applicable smobs, not tc3s
* libguile/debug.c (scm_procedure_name): Remove a SCM_CLOSUREP case and
some dead code.
(scm_procedure_module): Remove. This was introduced a few months ago
for the hygienic expander, but now it is no longer needed, as the
expander keeps track of this information itself.
* libguile/debug.h: Remove scm_procedure_module.
* libguile/eval.c: Instead of using tc3 closures, define a "boot
closure" applicable smob type, and represent closures with that. The
advantage is that after eval.scm is compiled, boot closures take up no
address space (besides a smob number) in the runtime, and require no
special cases in procedure dispatch.
* libguile/eval.h: Remove the internal functions scm_i_call_closure_0
and scm_closure_apply, and the public function scm_closure.
* libguile/gc.c (scm_storage_prehistory): No tc3_closure displacement
registration.
(scm_i_tag_name): Remove closure case, and a dead cclo case.
* libguile/vm.c (apply_foreign):
* libguile/print.c (iprin1):
* libguile/procs.c (scm_procedure_p, scm_procedure_documentation);
* libguile/evalext.c (scm_self_evaluating_p):
* libguile/goops.c (scm_class_of): Remove tc3_closure/tcs_closure cases.
* libguile/hash.c (scm_hasher):
* libguile/hooks.c (scm_add_hook_x): Use new scm_i_procedure_arity.
* libguile/macros.c (macro_print): Print all macros using the same code.
(scm_macro_transformer): Return any procedure, not just programs.
* libguile/procprop.h:
* libguile/procprop.c (scm_i_procedure_arity): Instead of returning a
list that the caller has to parse, have the same prototype as
scm_i_program_arity. An incompatible change, but it's an internal
function anyway.
(scm_procedure_properties, scm_set_procedure_properties)
(scm_procedure_property, scm_set_procedure_property): Remove closure
cases, and use scm_i_program_arity for arity.
* libguile/procs.h (SCM_CLOSUREP, SCM_CLOSCAR, SCM_CODE)
(SCM_CLOSURE_NUM_REQUIRED_ARGS, SCM_CLOSURE_HAS_REST_ARGS)
(SCM_CLOSURE_BODY, SCM_PROCPROPS, SCM_SETPROCPROPS, SCM_ENV)
(SCM_TOP_LEVEL): Remove these macros that pertain to boot closures
only. Only eval.c should know abut boot closures.
* libguile/procs.c (scm_closure_p): Remove this function. There is a
simple stub in deprecated.scm now.
(scm_thunk_p): Use scm_i_program_arity.
* libguile/tags.h (scm_tc3_closure): Remove. Yay, another tc3 to play
with!
(scm_tcs_closures): Remove.
* libguile/validate.h (SCM_VALIDATE_CLOSURE): Remove.
* module/ice-9/deprecated.scm (closure?): Add stub.
* module/ice-9/documentation.scm (object-documentation)
* module/ice-9/session.scm (help-doc, arity)
* module/oop/goops.scm (compute-getters-n-setters)
* module/oop/goops/describe.scm (describe)
* module/system/repl/describe.scm (display-object, display-type):
Remove calls to closure?.
Diffstat (limited to 'libguile/procprop.c')
-rw-r--r-- | libguile/procprop.c | 133 |
1 files changed, 57 insertions, 76 deletions
diff --git a/libguile/procprop.c b/libguile/procprop.c index c69dbd238..c452c28d7 100644 --- a/libguile/procprop.c +++ b/libguile/procprop.c @@ -41,65 +41,49 @@ SCM_GLOBAL_SYMBOL (scm_sym_system_procedure, "system-procedure"); SCM_GLOBAL_SYMBOL (scm_sym_arity, "arity"); -static SCM non_closure_props; -static scm_i_pthread_mutex_t non_closure_props_lock = SCM_I_PTHREAD_MUTEX_INITIALIZER; +static SCM props; +static scm_i_pthread_mutex_t props_lock = SCM_I_PTHREAD_MUTEX_INITIALIZER; -SCM -scm_i_procedure_arity (SCM proc) +int +scm_i_procedure_arity (SCM proc, int *req, int *opt, int *rest) { - int a = 0, o = 0, r = 0; if (SCM_IMP (proc)) - return SCM_BOOL_F; + return 0; loop: switch (SCM_TYP7 (proc)) { case scm_tc7_program: - if (scm_i_program_arity (proc, &a, &o, &r)) - break; - else - return SCM_BOOL_F; + return scm_i_program_arity (proc, req, opt, rest); case scm_tc7_smob: if (SCM_SMOB_APPLICABLE_P (proc)) { int type = SCM_SMOB_DESCRIPTOR (proc).gsubr_type; - a += SCM_GSUBR_REQ (type); - o = SCM_GSUBR_OPT (type); - r = SCM_GSUBR_REST (type); - break; + *req = SCM_GSUBR_REQ (type); + *opt = SCM_GSUBR_OPT (type); + *rest = SCM_GSUBR_REST (type); + return 1; } else - { - return SCM_BOOL_F; - } + return 0; case scm_tc7_gsubr: { unsigned int type = SCM_GSUBR_TYPE (proc); - a = SCM_GSUBR_REQ (type); - o = SCM_GSUBR_OPT (type); - r = SCM_GSUBR_REST (type); - break; + *req = SCM_GSUBR_REQ (type); + *opt = SCM_GSUBR_OPT (type); + *rest = SCM_GSUBR_REST (type); + return 1; } case scm_tc7_pws: proc = SCM_PROCEDURE (proc); goto loop; - case scm_tcs_closures: - a = SCM_CLOSURE_NUM_REQUIRED_ARGS (proc); - r = SCM_CLOSURE_HAS_REST_ARGS (proc) ? 1 : 0; - break; case scm_tcs_struct: - if (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC) - { - r = 1; - break; - } - else if (!SCM_STRUCT_APPLICABLE_P (proc)) - return SCM_BOOL_F; + if (!SCM_STRUCT_APPLICABLE_P (proc)) + return 0; proc = SCM_STRUCT_PROCEDURE (proc); goto loop; default: - return SCM_BOOL_F; + return 0; } - return scm_list_3 (scm_from_int (a), scm_from_int (o), scm_from_bool(r)); } /* FIXME: instead of the weak hash, perhaps for some kinds of procedures, use @@ -111,18 +95,22 @@ SCM_DEFINE (scm_procedure_properties, "procedure-properties", 1, 0, 0, "Return @var{obj}'s property list.") #define FUNC_NAME s_scm_procedure_properties { - SCM props; + SCM ret; + int req, opt, rest; SCM_VALIDATE_PROC (1, proc); - if (SCM_CLOSUREP (proc)) - props = SCM_PROCPROPS (proc); - else - { - scm_i_pthread_mutex_lock (&non_closure_props_lock); - props = scm_hashq_ref (non_closure_props, proc, SCM_EOL); - scm_i_pthread_mutex_unlock (&non_closure_props_lock); - } - return scm_acons (scm_sym_arity, scm_i_procedure_arity (proc), props); + + scm_i_pthread_mutex_lock (&props_lock); + ret = scm_hashq_ref (props, proc, SCM_EOL); + scm_i_pthread_mutex_unlock (&props_lock); + + scm_i_procedure_arity (proc, &req, &opt, &rest); + + return scm_acons (scm_sym_arity, + scm_list_3 (scm_from_int (req), + scm_from_int (opt), + scm_from_bool (rest)), + ret); } #undef FUNC_NAME @@ -133,14 +121,10 @@ SCM_DEFINE (scm_set_procedure_properties_x, "set-procedure-properties!", 2, 0, 0 { SCM_VALIDATE_PROC (1, proc); - if (SCM_CLOSUREP (proc)) - SCM_SETPROCPROPS (proc, alist); - else - { - scm_i_pthread_mutex_lock (&non_closure_props_lock); - scm_hashq_set_x (non_closure_props, proc, alist); - scm_i_pthread_mutex_unlock (&non_closure_props_lock); - } + scm_i_pthread_mutex_lock (&props_lock); + scm_hashq_set_x (props, proc, alist); + scm_i_pthread_mutex_unlock (&props_lock); + return SCM_UNSPECIFIED; } #undef FUNC_NAME @@ -154,19 +138,22 @@ SCM_DEFINE (scm_procedure_property, "procedure-property", 2, 0, 0, if (scm_is_eq (key, scm_sym_arity)) /* avoid a cons in this case */ - return scm_i_procedure_arity (proc); + { + int req, opt, rest; + scm_i_procedure_arity (proc, &req, &opt, &rest); + return scm_list_3 (scm_from_int (req), + scm_from_int (opt), + scm_from_bool (rest)); + } else { - SCM props; - if (SCM_CLOSUREP (proc)) - props = SCM_PROCPROPS (proc); - else - { - scm_i_pthread_mutex_lock (&non_closure_props_lock); - props = scm_hashq_ref (non_closure_props, proc, SCM_EOL); - scm_i_pthread_mutex_unlock (&non_closure_props_lock); - } - return scm_assq_ref (props, key); + SCM ret; + + scm_i_pthread_mutex_lock (&props_lock); + ret = scm_hashq_ref (props, proc, SCM_EOL); + scm_i_pthread_mutex_unlock (&props_lock); + + return scm_assq_ref (ret, key); } } #undef FUNC_NAME @@ -182,18 +169,12 @@ SCM_DEFINE (scm_set_procedure_property_x, "set-procedure-property!", 3, 0, 0, if (scm_is_eq (key, scm_sym_arity)) SCM_MISC_ERROR ("arity is a read-only property", SCM_EOL); - if (SCM_CLOSUREP (proc)) - SCM_SETPROCPROPS (proc, - scm_assq_set_x (SCM_PROCPROPS (proc), key, val)); - else - { - scm_i_pthread_mutex_lock (&non_closure_props_lock); - scm_hashq_set_x (non_closure_props, proc, - scm_assq_set_x (scm_hashq_ref (non_closure_props, proc, - SCM_EOL), - key, val)); - scm_i_pthread_mutex_unlock (&non_closure_props_lock); - } + scm_i_pthread_mutex_lock (&props_lock); + scm_hashq_set_x (props, proc, + scm_assq_set_x (scm_hashq_ref (props, proc, + SCM_EOL), + key, val)); + scm_i_pthread_mutex_unlock (&props_lock); return SCM_UNSPECIFIED; } @@ -205,7 +186,7 @@ SCM_DEFINE (scm_set_procedure_property_x, "set-procedure-property!", 3, 0, 0, void scm_init_procprop () { - non_closure_props = scm_make_weak_key_hash_table (SCM_UNDEFINED); + props = scm_make_weak_key_hash_table (SCM_UNDEFINED); #include "libguile/procprop.x" } |