r9299: 10 May 2004 Kevin Rosenberg (kevin@rosenberg.net)

        * sql/kmr-mop.lisp: Explicitly check slot order and
        store as a cl:*feature*

diff --git a/ChangeLog b/ChangeLog
index 8dc9bb43f2a8573b0d1f1ad4328d19ee83afc290..ee9f43b14cdc2433c090e192c24658033f8162e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+10 May 2004 Kevin Rosenberg (kevin@rosenberg.net)
+       * sql/kmr-mop.lisp: Explicitly check slot order and
+       store as a cl:*feature*
+       

 9 May 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 2.10.15
        * LATEST-TEST-RESULTS: results with current version
 9 May 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 2.10.15
        * LATEST-TEST-RESULTS: results with current version

diff --git a/sql/kmr-mop.lisp b/sql/kmr-mop.lisp
index d18cec177276f0536156a1981adeb9f02695dc12..e82ac66ddb50d0804969804aaf30bcef73a9d172 100644 (file)
--- a/sql/kmr-mop.lisp
+++ b/sql/kmr-mop.lisp
@@ -46,9 +46,19 @@
   (declare (ignore metaclass slot-name))
   )
 
   (declare (ignore metaclass slot-name))
   )
 

+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defclass %slot-order-test-class ()
+    ((a)
+     (b)))
+  (finalize-inheritance (find-class '%slot-order-test-class))
+  (let ((slots (class-slots (find-class '%slot-order-test-class))))
+    (ecase (slot-definition-name (first slots))
+      (a)
+      (b (pushnew :mop-slot-order-reversed cl:*features*)))))
+       

 (defun ordered-class-slots (class)
 (defun ordered-class-slots (class)

-  #+(or cmu18 sbcl) (class-slots class)
-  #-(or cmu18 sbcl) (reverse (class-slots class)))
+  #+mop-slot-order-reversed (class-slots class)
+  #-mop-slot-order-reversed (reverse (class-slots class)))

 
 ;; Lispworks has symbol for slot rather than the slot instance
 (defun %svuc-slot-name (slot)
 
 ;; Lispworks has symbol for slot rather than the slot instance
 (defun %svuc-slot-name (slot)

diff --git a/sql/metaclasses.lisp b/sql/metaclasses.lisp
index 5586dab79ef6dfaded6412645bd7bdfb971f8a46..1ab11f4ea5ab20669f6a05546cb1bad211ff3650 100644 (file)
--- a/sql/metaclasses.lisp
+++ b/sql/metaclasses.lisp
@@ -362,7 +362,7 @@ column definition in the database.")
    (defun compute-class-precedence-list (class)
      (class-precedence-list class))))
 
    (defun compute-class-precedence-list (class)
      (class-precedence-list class))))
 

-#-(or sbcl cmu18)
+#-mop-slot-order-reversed

 (defmethod compute-slots ((class standard-db-class))
   "Need to sort order of class slots so they are the same across
 implementations."
 (defmethod compute-slots ((class standard-db-class))
   "Need to sort order of class slots so they are the same across
 implementations."