[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 07/08: Incorporate %inherit-magic! into %init-layout!
From: |
Andy Wingo |
Subject: |
[Guile-commits] 07/08: Incorporate %inherit-magic! into %init-layout! |
Date: |
Sun, 11 Jan 2015 21:24:00 +0000 |
wingo pushed a commit to branch wip-goops-refactor
in repository guile.
commit 5c57cb382646c4f0f3facd8a12f4225fe56a826f
Author: Andy Wingo <address@hidden>
Date: Sun Jan 11 22:01:47 2015 +0100
Incorporate %inherit-magic! into %init-layout!
* libguile/goops.c (scm_make_standard_class, scm_sys_init_layout_x):
Move definitions up. Incorporate scm_sys_inherit_magic_x into
scm_sys_init_layout_x.
* libguile/goops.h: Remove scm_sys_init_layout_x declaration.
---
libguile/goops.c | 63 +++++++++++++++++++++++---------------------------
libguile/goops.h | 1 -
module/oop/goops.scm | 10 ++-----
3 files changed, 32 insertions(+), 42 deletions(-)
diff --git a/libguile/goops.c b/libguile/goops.c
index cbb0f63..d3969f1 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -163,6 +163,35 @@ static SCM scm_sys_goops_early_init (void);
static SCM scm_sys_goops_loaded (void);
+
+
+SCM
+scm_make_standard_class (SCM meta, SCM name, SCM dsupers, SCM dslots)
+{
+ return scm_call_4 (scm_variable_ref (var_make_standard_class),
+ meta, name, dsupers, dslots);
+}
+
+SCM_DEFINE (scm_sys_init_layout_x, "%init-layout!", 2, 0, 0,
+ (SCM class, SCM layout),
+ "")
+#define FUNC_NAME s_scm_sys_init_layout_x
+{
+ SCM_VALIDATE_INSTANCE (1, class);
+ SCM_ASSERT (!scm_is_symbol (SCM_VTABLE_LAYOUT (class)), class, 1, FUNC_NAME);
+ SCM_VALIDATE_STRING (2, layout);
+
+ SCM_SET_VTABLE_LAYOUT (class, scm_make_struct_layout (layout));
+ scm_i_struct_inherit_vtable_magic (SCM_CLASS_OF (class), class);
+ SCM_SET_CLASS_FLAGS (class, SCM_CLASSF_GOOPS_OR_VALID);
+
+ return SCM_UNSPECIFIED;
+}
+#undef FUNC_NAME
+
+
+
+
/* This function is used for efficient type dispatch. */
SCM_DEFINE (scm_class_of, "class-of", 1, 0, 0,
(SCM x),
@@ -284,42 +313,8 @@ SCM_DEFINE (scm_class_of, "class-of", 1, 0, 0,
}
#undef FUNC_NAME
-SCM_DEFINE (scm_sys_init_layout_x, "%init-layout!", 2, 0, 0,
- (SCM class, SCM layout),
- "")
-#define FUNC_NAME s_scm_sys_init_layout_x
-{
- SCM_VALIDATE_INSTANCE (1, class);
- SCM_ASSERT (!scm_is_symbol (SCM_VTABLE_LAYOUT (class)), class, 1, FUNC_NAME);
- SCM_VALIDATE_STRING (2, layout);
-
- SCM_SET_VTABLE_LAYOUT (class, scm_make_struct_layout (layout));
- return SCM_UNSPECIFIED;
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_sys_inherit_magic_x, "%inherit-magic!", 2, 0, 0,
- (SCM class, SCM dsupers),
- "")
-#define FUNC_NAME s_scm_sys_inherit_magic_x
-{
- SCM_VALIDATE_INSTANCE (1, class);
- scm_i_struct_inherit_vtable_magic (SCM_CLASS_OF (class), class);
- SCM_SET_CLASS_FLAGS (class, SCM_CLASSF_GOOPS_OR_VALID);
-
- return SCM_UNSPECIFIED;
-}
-#undef FUNC_NAME
-
/******************************************************************************/
-SCM
-scm_make_standard_class (SCM meta, SCM name, SCM dsupers, SCM dslots)
-{
- return scm_call_4 (scm_variable_ref (var_make_standard_class),
- meta, name, dsupers, dslots);
-}
-
/******************************************************************************/
SCM_DEFINE (scm_sys_make_root_class, "%make-root-class", 1, 0, 0,
diff --git a/libguile/goops.h b/libguile/goops.h
index fafd7fa..ca9c41b 100644
--- a/libguile/goops.h
+++ b/libguile/goops.h
@@ -102,7 +102,6 @@ SCM_API SCM scm_slot_ref (SCM obj, SCM slot_name);
SCM_API SCM scm_slot_set_x (SCM obj, SCM slot_name, SCM value);
SCM_INTERNAL void scm_i_inherit_applicable (SCM c);
-SCM_API SCM scm_sys_inherit_magic_x (SCM c, SCM dsupers);
SCM_API SCM scm_instance_p (SCM obj);
SCM_API int scm_is_generic (SCM x);
SCM_API int scm_is_method (SCM x);
diff --git a/module/oop/goops.scm b/module/oop/goops.scm
index a93659b..0186e29 100644
--- a/module/oop/goops.scm
+++ b/module/oop/goops.scm
@@ -446,7 +446,6 @@
(cons z subclasses))))
dsupers)
(%prep-layout! z)
- (%inherit-magic! z dsupers)
z)))
(define <class>
@@ -2450,12 +2449,9 @@ var{initargs}."
(cons class dsubs))))
supers)
- ;; Support for the underlying structs:
-
- ;; Set the layout slot
- (%prep-layout! class)
- ;; Inherit class flags (invisible on scheme level) from supers
- (%inherit-magic! class supers)))
+ ;; Compute struct layout of instances, set the `layout' slot, and
+ ;; update class flags.
+ (%prep-layout! class)))
(define (initialize-object-procedure object initargs)
(let ((proc (get-keyword #:procedure initargs #f)))
- [Guile-commits] branch wip-goops-refactor updated (951cce9 -> b623b66), Andy Wingo, 2015/01/11
- [Guile-commits] 01/08: Move <class> initialization to Scheme, Andy Wingo, 2015/01/11
- [Guile-commits] 05/08: goops.c no longer knows about <class> slot allocation, Andy Wingo, 2015/01/11
- [Guile-commits] 06/08: Remove special cases for <keyword>, Andy Wingo, 2015/01/11
- [Guile-commits] 04/08: Reimplement inherit-applicable! in Scheme, Andy Wingo, 2015/01/11
- [Guile-commits] 07/08: Incorporate %inherit-magic! into %init-layout!,
Andy Wingo <=
- [Guile-commits] 08/08: Cosmetic goops refactors., Andy Wingo, 2015/01/11
- [Guile-commits] 03/08: Reimplement %allocate-instance in Scheme, Andy Wingo, 2015/01/11
- [Guile-commits] 02/08: Re-use the vtable "size" field for GOOPS nfields, Andy Wingo, 2015/01/11