guile/guile-core/libguile ChangeLog goops.c goo...

[Mikael Djurfeldt]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Mikael Djurfeldt <address@hidden>       01/03/04 12:46:04

Modified files:
        guile-core/libguile: ChangeLog goops.c goops.h 

Log message:
        * goops.c, goops.h (scm_sys_pre_expand_closure_x): Removed.
        (scm_sys_tag_body): Added.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/ChangeLog.diff?r1=1.1292&r2=1.1293
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/goops.c.diff?r1=1.21&r2=1.22
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/goops.h.diff?r1=1.8&r2=1.9

Patches:
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1292 
guile/guile-core/libguile/ChangeLog:1.1293
--- guile/guile-core/libguile/ChangeLog:1.1292  Sun Mar  4 09:09:33 2001
+++ guile/guile-core/libguile/ChangeLog Sun Mar  4 12:46:03 2001
@@ -1,3 +1,8 @@
+2001-03-04  Mikael Djurfeldt  <address@hidden>
+
+       * goops.c, goops.h (scm_sys_pre_expand_closure_x): Removed.
+       (scm_sys_tag_body): Added.
+
 2001-03-04  Dirk Herrmann  <address@hidden>
 
        * continuations.c (continuation_apply), eval.c (scm_m_lambda,
Index: guile/guile-core/libguile/goops.c
diff -u guile/guile-core/libguile/goops.c:1.21 
guile/guile-core/libguile/goops.c:1.22
--- guile/guile-core/libguile/goops.c:1.21      Sun Mar  4 09:09:34 2001
+++ guile/guile-core/libguile/goops.c   Sun Mar  4 12:46:04 2001
@@ -934,21 +934,12 @@
 }
 #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
+#define FUNC_NAME s_scm_sys_tag_body
 {
-  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;
+  return scm_cons (SCM_IM_LAMBDA, body);
 }
 #undef FUNC_NAME
 
Index: guile/guile-core/libguile/goops.h
diff -u guile/guile-core/libguile/goops.h:1.8 
guile/guile-core/libguile/goops.h:1.9
--- guile/guile-core/libguile/goops.h:1.8       Sat Mar  3 21:27:41 2001
+++ guile/guile-core/libguile/goops.h   Sun Mar  4 12:46:04 2001
@@ -258,7 +258,7 @@
 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);