[Guile-commits] 02/07: Change name of "static" flag indicating static slot allocation

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 5c8bb1363032eb5797fbd232dec162350304a768
Author: Andy Wingo <address@hidden>
Date:   Thu Sep 7 17:05:32 2017 +0200

    Change name of "static" flag indicating static slot allocation
    
    * libguile/goops.h (SCM_VTABLE_FLAG_GOOPS_STATIC_SLOT_ALLOCATION):
      Rename from SCM_VTABLE_FLAG_GOOPS_STATIC.
    * libguile/goops.c (scm_init_goops_builtins): Adapt.
    * module/oop/goops.scm (class-has-statically-allocated-slots?):
      (initialize): Adapt.
---
 libguile/goops.c     | 4 ++--
 libguile/goops.h     | 2 +-
 module/oop/goops.scm | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libguile/goops.c b/libguile/goops.c
index 5b24ee6..ed9dd1e 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -1024,8 +1024,8 @@ scm_init_goops_builtins (void *unused)
                 scm_from_int (SCM_VTABLE_FLAG_GOOPS_VALID));
   scm_c_define ("vtable-flag-goops-slot",
                 scm_from_int (SCM_VTABLE_FLAG_GOOPS_SLOT));
-  scm_c_define ("vtable-flag-goops-static",
-                scm_from_int (SCM_VTABLE_FLAG_GOOPS_STATIC));
+  scm_c_define ("vtable-flag-goops-static-slot-allocation",
+                scm_from_int (SCM_VTABLE_FLAG_GOOPS_STATIC_SLOT_ALLOCATION));
 }
 
 void
diff --git a/libguile/goops.h b/libguile/goops.h
index 9dd1e1f..8565f4f 100644
--- a/libguile/goops.h
+++ b/libguile/goops.h
@@ -43,7 +43,7 @@
 #define SCM_VTABLE_FLAG_GOOPS_CLASS SCM_VTABLE_FLAG_GOOPS_0
 #define SCM_VTABLE_FLAG_GOOPS_VALID SCM_VTABLE_FLAG_GOOPS_1
 #define SCM_VTABLE_FLAG_GOOPS_SLOT SCM_VTABLE_FLAG_GOOPS_2
-#define SCM_VTABLE_FLAG_GOOPS_STATIC SCM_VTABLE_FLAG_GOOPS_3
+#define SCM_VTABLE_FLAG_GOOPS_STATIC_SLOT_ALLOCATION SCM_VTABLE_FLAG_GOOPS_3
 
 #define SCM_CLASS_OF(x)         SCM_STRUCT_VTABLE (x)
 #define SCM_CLASS_FLAGS(class) (SCM_VTABLE_FLAGS (class))
diff --git a/module/oop/goops.scm b/module/oop/goops.scm
index 48370c6..3e72524 100644
--- a/module/oop/goops.scm
+++ b/module/oop/goops.scm
@@ -280,7 +280,7 @@
   (class-has-flags? (struct-vtable obj) vtable-flag-goops-class))
 
 (define (class-has-statically-allocated-slots? class)
-  (class-has-flags? class vtable-flag-goops-static))
+  (class-has-flags? class vtable-flag-goops-static-slot-allocation))
 
 ;;;
 ;;; Now that we know the slots that must be present in classes, and
@@ -925,8 +925,8 @@ slots as we go."
 
   ;; Now that we're all done with that, mark <class> and <slot> as
   ;; static.
-  (class-add-flags! <class> vtable-flag-goops-static)
-  (class-add-flags! <slot> vtable-flag-goops-static))
+  (class-add-flags! <class> vtable-flag-goops-static-slot-allocation)
+  (class-add-flags! <slot> vtable-flag-goops-static-slot-allocation))
 
 
 
@@ -2821,7 +2821,7 @@ var{initargs}."
     (match (filter class-has-statically-allocated-slots?
                    (class-precedence-list class))
       (()
-       (class-add-flags! class vtable-flag-goops-static))
+       (class-add-flags! class vtable-flag-goops-static-slot-allocation))
       (classes
        (error "Class has superclasses with static slot allocation" classes))))
   (struct-set! class class-index-direct-slots