[Guile-commits] 04/08: Merge 'stable-2.2'

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 6e477b1453636525d7f864f0d36b4fcef0e65bc5
Merge: e26652b f234155
Author: Andy Wingo <address@hidden>
Date:   Sat Sep 23 14:29:16 2017 +0200

    Merge 'stable-2.2'

 module/oop/goops.scm | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --cc module/oop/goops.scm
index bbf7ff6,4569336..78bbc4b
--- a/module/oop/goops.scm
+++ b/module/oop/goops.scm
@@@ -890,7 -908,12 +909,9 @@@ slots as we go.
  (define-standard-class <protected-read-only-slot> (<protected-slot>
                                                     <read-only-slot>))
  (define-standard-class <scm-slot> (<protected-slot>))
 -(define-standard-class <int-slot> (<foreign-slot>))
 -(define-standard-class <float-slot> (<foreign-slot>))
 -(define-standard-class <double-slot> (<foreign-slot>))
  
+ (define (opaque-slot? slot) (is-a? slot <opaque-slot>))
+ (define (read-only-slot? slot) (is-a? slot <read-only-slot>))