mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-18 18:40:22 +02:00
567a6d1ee7
* libguile/goops.c (SCM_GOOPS_UNBOUND, SCM_GOOPS_UNBOUNDP): Remove internal macros. (scm_make_unbound, scm_unbound_p): Remove internal functions. (scm_sys_clear_fields_x): Add "unbound" parameter, for the init value. * module/oop/goops.scm (*unbound*): Define in Scheme as a simple heap-allocated value. (unbound?): New definition. (%allocate-instance): Pass *unbound* to %clear-fields!. (make-class, slot-definition-init-value) (slot-definition-init-form, make-closure-variable): Use *unbound* instead of (make-unbound), which is now gone. * module/oop/goops/active-slot.scm (compute-get-n-set): Use *unbound* instead of make-unbound. This module uses the GOOPS internals module; perhaps we should export make-unbound or something... * module/oop/goops/save.scm (make-unbound): Export our own make-unbound definition, for use by residualized save code. * module/language/ecmascript/base.scm (<undefined>, *undefined*): Use a unique object kind and instance for the undefined value. * libguile/vm.c (scm_i_vm_mark_stack): Fill the stack with SCM_UNSPECIFIED instead of SCM_UNBOUND.
63 lines
2.2 KiB
Scheme
63 lines
2.2 KiB
Scheme
;;; installed-scm-file
|
||
|
||
;;;; Copyright (C) 1999, 2001, 2006, 2009, 2015 Free Software Foundation, Inc.
|
||
;;;; Copyright (C) 1993-1998 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr>
|
||
;;;;
|
||
;;;; This library is free software; you can redistribute it and/or
|
||
;;;; modify it under the terms of the GNU Lesser General Public
|
||
;;;; License as published by the Free Software Foundation; either
|
||
;;;; version 3 of the License, or (at your option) any later version.
|
||
;;;;
|
||
;;;; This library is distributed in the hope that it will be useful,
|
||
;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
;;;; Lesser General Public License for more details.
|
||
;;;;
|
||
;;;; You should have received a copy of the GNU Lesser General Public
|
||
;;;; License along with this library; if not, write to the Free Software
|
||
;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||
;;;;
|
||
|
||
|
||
;;;;
|
||
;;;; This file was based upon active-slot.stklos from the STk distribution
|
||
;;;; version 4.0.1 by Erick Gallesio <eg@unice.fr>.
|
||
;;;;
|
||
|
||
(define-module (oop goops active-slot)
|
||
:use-module (oop goops internal)
|
||
:export (<active-class>))
|
||
|
||
(define-class <active-class> (<class>))
|
||
|
||
(define-method (compute-get-n-set (class <active-class>) slot)
|
||
(if (eq? (slot-definition-allocation slot) #:active)
|
||
(let* ((index (slot-ref class 'nfields))
|
||
(s (cdr slot))
|
||
(before-ref (get-keyword #:before-slot-ref s #f))
|
||
(after-ref (get-keyword #:after-slot-ref s #f))
|
||
(before-set! (get-keyword #:before-slot-set! s #f))
|
||
(after-set! (get-keyword #:after-slot-set! s #f))
|
||
(unbound *unbound*))
|
||
(slot-set! class 'nfields (+ index 1))
|
||
(list (lambda (o)
|
||
(if before-ref
|
||
(if (before-ref o)
|
||
(let ((res (struct-ref o index)))
|
||
(and after-ref (not (eqv? res unbound)) (after-ref o))
|
||
res)
|
||
*unbound*)
|
||
(let ((res (struct-ref o index)))
|
||
(and after-ref (not (eqv? res unbound)) (after-ref o))
|
||
res)))
|
||
|
||
(lambda (o v)
|
||
(if before-set!
|
||
(if (before-set! o v)
|
||
(begin
|
||
(struct-set! o index v)
|
||
(and after-set! (after-set! o v))))
|
||
(begin
|
||
(struct-set! o index v)
|
||
(and after-set! (after-set! o v)))))))
|
||
(next-method)))
|