From 314b87163eac1358923cb84e7f2c87d06aa03756 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 4 Dec 2009 19:20:11 +0100 Subject: 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?. --- libguile/macros.c | 60 ++++++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 32 deletions(-) (limited to 'libguile/macros.c') diff --git a/libguile/macros.c b/libguile/macros.c index d7c054e72..0d714000c 100644 --- a/libguile/macros.c +++ b/libguile/macros.c @@ -46,46 +46,42 @@ static int macro_print (SCM macro, SCM port, scm_print_state *pstate) { SCM code = SCM_MACRO_CODE (macro); - if (!SCM_CLOSUREP (code) - || scm_is_false (scm_procedure_p (SCM_PRINT_CLOSURE)) - || scm_is_false (scm_printer_apply (SCM_PRINT_CLOSURE, - macro, port, pstate))) - { - scm_puts ("#<", port); - if (SCM_MACRO_TYPE (macro) < 4 && SCM_MACRO_IS_EXTENDED (macro)) - scm_puts ("extended-", port); + scm_puts ("#<", port); + + if (SCM_MACRO_TYPE (macro) < 4 && SCM_MACRO_IS_EXTENDED (macro)) + scm_puts ("extended-", port); - if (!SCM_CLOSUREP (code) && !SCM_PROGRAM_P (code)) - scm_puts ("primitive-", port); + /* FIXME: doesn't catch boot closures; but do we care? */ + if (!SCM_PROGRAM_P (code)) + scm_puts ("primitive-", port); - if (SCM_MACRO_TYPE (macro) == 0) - scm_puts ("syntax", port); + if (SCM_MACRO_TYPE (macro) == 0) + scm_puts ("syntax", port); #if SCM_ENABLE_DEPRECATED == 1 - if (SCM_MACRO_TYPE (macro) == 1) - scm_puts ("macro", port); + if (SCM_MACRO_TYPE (macro) == 1) + scm_puts ("macro", port); #endif - if (SCM_MACRO_TYPE (macro) == 2) - scm_puts ("macro!", port); - if (SCM_MACRO_TYPE (macro) == 3) - scm_puts ("builtin-macro!", port); - if (SCM_MACRO_TYPE (macro) == 4) - scm_puts ("syncase-macro", port); - - scm_putc (' ', port); - scm_iprin1 (scm_macro_name (macro), port, pstate); + if (SCM_MACRO_TYPE (macro) == 2) + scm_puts ("macro!", port); + if (SCM_MACRO_TYPE (macro) == 3) + scm_puts ("builtin-macro!", port); + if (SCM_MACRO_TYPE (macro) == 4) + scm_puts ("syncase-macro", port); - if (SCM_MACRO_IS_EXTENDED (macro)) - { - scm_putc (' ', port); - scm_write (SCM_SMOB_OBJECT_2 (macro), port); - scm_putc (' ', port); - scm_write (SCM_SMOB_OBJECT_3 (macro), port); - } + scm_putc (' ', port); + scm_iprin1 (scm_macro_name (macro), port, pstate); - scm_putc ('>', port); + if (SCM_MACRO_IS_EXTENDED (macro)) + { + scm_putc (' ', port); + scm_write (SCM_SMOB_OBJECT_2 (macro), port); + scm_putc (' ', port); + scm_write (SCM_SMOB_OBJECT_3 (macro), port); } + scm_putc ('>', port); + return 1; } @@ -273,7 +269,7 @@ SCM_DEFINE (scm_macro_transformer, "macro-transformer", 1, 0, 0, SCM_VALIDATE_SMOB (1, m, macro); data = SCM_PACK (SCM_SMOB_DATA (m)); - if (SCM_CLOSUREP (data) || SCM_PROGRAM_P (data)) + if (scm_is_true (scm_procedure_p (data))) return data; else return SCM_BOOL_F; -- cgit v1.2.3