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/debug.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/debug.c')
-rw-r--r-- | libguile/debug.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/libguile/debug.c b/libguile/debug.c index 0310ffbe1..b220efd8b 100644 --- a/libguile/debug.c +++ b/libguile/debug.c @@ -143,14 +143,6 @@ SCM_DEFINE (scm_procedure_name, "procedure-name", 1, 0, 0, default: { SCM name = scm_procedure_property (proc, scm_sym_name); -#if 0 - /* Source property scm_sym_procname not implemented yet... */ - SCM name = scm_source_property (SCM_CAR (SCM_CLOSURE_BODY (proc)), scm_sym_procname); - if (scm_is_false (name)) - name = scm_procedure_property (proc, scm_sym_name); -#endif - if (scm_is_false (name) && SCM_CLOSUREP (proc)) - name = scm_reverse_lookup (SCM_ENV (proc), proc); if (scm_is_false (name) && SCM_PROGRAM_P (proc)) name = scm_program_name (proc); return name; @@ -193,27 +185,6 @@ SCM_DEFINE (scm_procedure_source, "procedure-source", 1, 0, 0, } #undef FUNC_NAME -SCM_DEFINE (scm_procedure_module, "procedure-module", 1, 0, 0, - (SCM proc), - "Return the module that was current when @var{proc} was defined.") -#define FUNC_NAME s_scm_procedure_module -{ - SCM_VALIDATE_PROC (SCM_ARG1, proc); - - if (scm_is_true (scm_program_p (proc))) - return scm_program_module (proc); - else if (SCM_CLOSUREP (proc)) - { - SCM env = SCM_ENV (proc); - while (scm_is_pair (env)) - env = scm_cdr (env); - return env; - } - else - return SCM_BOOL_F; -} -#undef FUNC_NAME - |