wingo pushed a commit to branch master
in repository guile.
commit c6fb41fcbfc61f115c13acc3a7dbc5dda5b463c6
Author: Andy Wingo <[email protected]>
Date: Mon Jan 19 15:57:23 2015 +0100
Minor GOOPS cleanups
* module/oop/goops.scm: Minor commenting fixes.
---
module/oop/goops.scm | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/module/oop/goops.scm b/module/oop/goops.scm
index 6e4cd4b..cf8eda7 100644
--- a/module/oop/goops.scm
+++ b/module/oop/goops.scm
@@ -247,9 +247,10 @@
;;; class-index-flags. `vtable-flag-vtable' indicates that instances of
;;; a vtable are themselves vtables, and `vtable-flag-validated'
;;; indicates that the struct's layout has been validated. goops.c
-;;; defines a couple of additional flags: one to indicate that a vtable
-;;; is actually a class, and one to indicate that the class is "valid",
-;;; meaning that it hasn't been redefined.
+;;; defines a few additional flags: one to indicate that a vtable is
+;;; actually a class, one to indicate that the class is "valid" (meaning
+;;; that it hasn't been redefined), and one to indicate that instances
+;;; of a class are slot definition objects (<slot> instances).
;;;
(define vtable-flag-goops-metaclass
(logior vtable-flag-vtable vtable-flag-goops-class))
@@ -269,6 +270,10 @@
(define-inlinable (class? obj)
(class-has-flags? (struct-vtable obj) vtable-flag-goops-metaclass))
+(define-inlinable (slot? obj)
+ (and (struct? obj)
+ (class-has-flags? (struct-vtable obj) vtable-flag-goops-slot)))
+
(define-inlinable (instance? obj)
(class-has-flags? (struct-vtable obj) vtable-flag-goops-class))
@@ -377,7 +382,6 @@ subclasses of @var{c}."
;;; more of the protocol. Again, the CPL and class hierarchy slots
;;; remain uninitialized.
;;;
-
(define* (get-keyword key l #:optional default)
"Determine an associated value for the keyword @var{key} from the list
@var{l}. The list @var{l} has to consist of an even number of elements,
@@ -426,10 +430,6 @@ followed by its associated value. If @var{l} does not
hold a value for
(struct-set! <slot> class-index-redefined #f)
<slot>)))
-(define-inlinable (slot? obj)
- (and (struct? obj)
- (class-has-flags? (struct-vtable obj) vtable-flag-goops-slot)))
-
(define-syntax-rule (define-slot-accessor name docstring %name field)
(begin
(define-syntax-rule (%name obj)
