r9314: 11 May 2004 Kevin Rosenberg (kevin@rosenberg.net)

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

diff --git a/sql/kmr-mop.lisp b/sql/kmr-mop.lisp
index bcd893acfbecc6fa9662c3b537af9efe820ec3d7..e82ac66ddb50d0804969804aaf30bcef73a9d172 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-sys)
+(in-package #:clsql)
 
 #+lispworks
 (defun intern-eql-specializer (slot)
@@ -46,3 +46,27 @@
   (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)
+  #+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 slot
+  #-lispworks (slot-definition-name slot))
+
+(defun %svuc-slot-object (slot class)
+  (declare (ignorable class))
+  #+lispworks (clos:find-slot-definition slot class)
+  #-lispworks slot)
+