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/procs.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/procs.c')
-rw-r--r-- | libguile/procs.c | 58 |
1 files changed, 6 insertions, 52 deletions
diff --git a/libguile/procs.c b/libguile/procs.c index c163bf6f1..71d50bdd7 100644 --- a/libguile/procs.c +++ b/libguile/procs.c @@ -100,7 +100,6 @@ SCM_DEFINE (scm_procedure_p, "procedure?", 1, 0, 0, if (!((SCM_OBJ_CLASS_FLAGS (obj) & SCM_CLASSF_PURE_GENERIC) || SCM_STRUCT_APPLICABLE_P (obj))) break; - case scm_tcs_closures: case scm_tc7_gsubr: case scm_tc7_pws: case scm_tc7_program: @@ -114,45 +113,14 @@ SCM_DEFINE (scm_procedure_p, "procedure?", 1, 0, 0, } #undef FUNC_NAME -SCM_DEFINE (scm_closure_p, "closure?", 1, 0, 0, - (SCM obj), - "Return @code{#t} if @var{obj} is a closure.") -#define FUNC_NAME s_scm_closure_p -{ - return scm_from_bool (SCM_CLOSUREP (obj)); -} -#undef FUNC_NAME - SCM_DEFINE (scm_thunk_p, "thunk?", 1, 0, 0, (SCM obj), "Return @code{#t} if @var{obj} is a thunk.") #define FUNC_NAME s_scm_thunk_p { - if (SCM_NIMP (obj)) - { - again: - switch (SCM_TYP7 (obj)) - { - case scm_tcs_closures: - return scm_from_bool (SCM_CLOSURE_NUM_REQUIRED_ARGS (obj) == 0); - case scm_tc7_gsubr: - return scm_from_bool (SCM_GSUBR_REQ (SCM_GSUBR_TYPE (obj)) == 0); - case scm_tc7_program: - { - 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: - return SCM_BOOL_F; - } - } - return SCM_BOOL_F; + int req, opt, rest; + return scm_from_bool (scm_i_procedure_arity (obj, &req, &opt, &rest) + && req == 0); } #undef FUNC_NAME @@ -181,25 +149,11 @@ SCM_DEFINE (scm_procedure_documentation, "procedure-documentation", 1, 0, 0, "documentation for that procedure.") #define FUNC_NAME s_scm_procedure_documentation { - SCM code; - SCM_ASSERT (scm_is_true (scm_procedure_p (proc)), - proc, SCM_ARG1, FUNC_NAME); + SCM_VALIDATE_PROC (SCM_ARG1, proc); if (SCM_PROGRAM_P (proc)) return scm_assq_ref (scm_program_properties (proc), sym_documentation); - switch (SCM_TYP7 (proc)) - { - case scm_tcs_closures: - code = SCM_CLOSURE_BODY (proc); - if (scm_is_null (SCM_CDR (code))) - return SCM_BOOL_F; - code = SCM_CAR (code); - if (scm_is_string (code)) - return code; - else - return SCM_BOOL_F; - default: - return SCM_BOOL_F; - } + else + return SCM_BOOL_F; } #undef FUNC_NAME |