diff options
| author | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 2001-03-04 20:46:04 +0000 |
|---|---|---|
| committer | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 2001-03-04 20:46:04 +0000 |
| commit | 5e03762c12262629f059d60a47f9d3c08e0102b7 (patch) | |
| tree | 215987ac6fc6e145d5e4d00e4691d88941cf5d9b | |
| parent | db4b4ca64f0480198cbc82e0f6fb3d3a8af5f580 (diff) | |
| download | guile-5e03762c12262629f059d60a47f9d3c08e0102b7.tar.gz | |
* goops.c, goops.h (scm_sys_pre_expand_closure_x): Removed.
(scm_sys_tag_body): Added.
| -rw-r--r-- | libguile/ChangeLog | 5 | ||||
| -rw-r--r-- | libguile/goops.c | 19 | ||||
| -rw-r--r-- | libguile/goops.h | 2 |
3 files changed, 11 insertions, 15 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 83d86343c..2d1c80d8d 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,8 @@ +2001-03-04 Mikael Djurfeldt <mdj@linnaeus.mit.edu> + + * goops.c, goops.h (scm_sys_pre_expand_closure_x): Removed. + (scm_sys_tag_body): Added. + 2001-03-04 Dirk Herrmann <D.Herrmann@tu-bs.de> * continuations.c (continuation_apply), eval.c (scm_m_lambda, diff --git a/libguile/goops.c b/libguile/goops.c index e4dff3da8..f3250c210 100644 --- a/libguile/goops.c +++ b/libguile/goops.c @@ -934,21 +934,12 @@ SCM_DEFINE (scm_accessor_method_slot_definition, "accessor-method-slot-definitio } #undef FUNC_NAME -SCM_DEFINE (scm_sys_pre_expand_closure_x, "%pre-expand-closure!", 1, 0, 0, - (SCM closure), +SCM_DEFINE (scm_sys_tag_body, "%tag-body", 1, 0, 0, + (SCM body), "Internal GOOPS magic---don't use this function!") -#define FUNC_NAME s_scm_sys_pre_expand_closure_x -{ - SCM formals, code, env; - SCM_VALIDATE_CLOSURE (1, closure); - formals = SCM_CAR (SCM_CODE (closure)); - env = SCM_EXTEND_ENV (formals, formals, SCM_ENV (closure)); - code = SCM_CDR (SCM_CODE (closure)); - while (SCM_NNULLP (SCM_CDR (code)) - && SCM_IMP (SCM_CAR (code)) - && SCM_ISYMP (SCM_CAR (code))) - code = scm_m_expand_body (code, env); - return closure; +#define FUNC_NAME s_scm_sys_tag_body +{ + return scm_cons (SCM_IM_LAMBDA, body); } #undef FUNC_NAME diff --git a/libguile/goops.h b/libguile/goops.h index a443d4cc0..069fbfb38 100644 --- a/libguile/goops.h +++ b/libguile/goops.h @@ -258,7 +258,7 @@ SCM scm_method_generic_function (SCM obj); SCM scm_method_specializers (SCM obj); SCM scm_method_procedure (SCM obj); SCM scm_accessor_method_slot_definition (SCM obj); -SCM scm_sys_pre_expand_closure_x (SCM closure); +SCM scm_sys_tag_body (SCM body); SCM scm_sys_fast_slot_ref (SCM obj, SCM index); SCM scm_sys_fast_slot_set_x (SCM obj, SCM index, SCM value); SCM scm_slot_ref_using_class (SCM cls, SCM obj, SCM slot_name); |