r9457: Reworked CLSQL file structure.

[clsql.git] / sql / kmr-mop.lisp

diff --git a/sql/kmr-mop.lisp b/sql/kmr-mop.lisp
index b709f1bea9c0b7ec81b21f4bd6ee462d9e93b881..8fccf57778e306a4a9ce6b3b7801dfd49c026d3e 100644 (file)
--- a/sql/kmr-mop.lisp
+++ b/sql/kmr-mop.lisp
@@ -16,7 +16,7 @@
 ;;;; This file was extracted from the KMRCL utilities
 ;;;; *************************************************************************
 
-(in-package #:clsql)
+(in-package #:clsql-sys)
 
 #+lispworks
 (defun intern-eql-specializer (slot)
@@ -46,9 +46,19 @@
   (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)
-  #+(or cmu sbcl) (class-slots class)
-  #-(or cmu sbcl) (reverse (class-slots class)))
+  #+mop-slot-order-reversed (reverse (class-slots class))
+  #-mop-slot-order-reversed (class-slots class))
 
 ;; Lispworks has symbol for slot rather than the slot instance
 (defun %svuc-slot-name (slot)