1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-20 02:30:23 +02:00

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.
This commit is contained in:
Andy Wingo 2015-01-11 22:01:47 +01:00
parent 2025a02793
commit 60061fe0fe
3 changed files with 32 additions and 42 deletions

View file

@ -447,7 +447,6 @@
(cons z subclasses))))
dsupers)
(%prep-layout! z)
(%inherit-magic! z dsupers)
z)))
(define <class>
@ -2471,12 +2470,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)))