From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Sat, 12 Apr 2003 03:14:29 +0000 (+0000)
Subject: r4446: Auto commit for Debian build
X-Git-Tag: debian-2.11.0-2~164
X-Git-Url: http://git.kpe.io/?p=hyperobject.git;a=commitdiff_plain;h=4f4c2990af9e7fba7f1e2b25fab5327d6ae63040

r4446: Auto commit for Debian build
---

diff --git a/debian/changelog b/debian/changelog
index 848a109..448a052 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-hyperobject (2.5.7-1) unstable; urgency=low
+
+  * Encapsulate differences in class-slot order
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Fri, 11 Apr 2003 21:14:17 -0600
+
 cl-hyperobject (2.5.6-1) unstable; urgency=low
 
   * Have lispworks use add-method
diff --git a/mop.lisp b/mop.lisp
index d8dfe61..6a942da 100644
--- a/mop.lisp
+++ b/mop.lisp
@@ -11,7 +11,7 @@
 ;;;; in Text, HTML, and XML formats. This includes hyperlinking
 ;;;; capability and sub-objects.
 ;;;;
-;;;; $Id: mop.lisp,v 1.40 2003/04/04 00:03:30 kevin Exp $
+;;;; $Id: mop.lisp,v 1.41 2003/04/12 03:14:29 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -343,7 +343,11 @@
 		     (name-class subobject) (name-slot subobject) (lookup subobject) (lookup-keys subobject))
 	      )
 	    (push subobject subobjects))))
-      subobjects)))
+      ;; allegro and lispworks reverse class-slots compared to the defclass form
+      ;; subobject is already reversed from the dolist/push loop, so re-reverse on non-allegro/lispworks
+      #+(or lispworks allegro) subobjects
+      #-(or lispworks allegro) (nreverse subobjects)
+    )))
 
 (defun finalize-documentation (cl)
   "Calculate class documentation slot"
@@ -381,6 +385,9 @@
 			:lookup it
 			:link-parameters (slot-value esd 'hyperlink-parameters))
 	 hyperlinks)))
+    ;; allegro and lispworks reverse class-slots compared to the defclass form
+    ;; hyperlinks is already reversed from the dolist/push loop, so re-reverse on non-allegro/lispworks
+    #-(or lispworks allegro) (setq hyperlinks (nreverse hyperlinks))
     (setf (slot-value cl 'hyperlinks) hyperlinks)))
 
 (defun init-hyperobject-class (cl)
@@ -413,5 +420,7 @@
   (hyperlinks (class-of obj)))
 
 (defun hyperobject-class-fields (obj)
-  (class-slots (class-of obj)))
+  ;; allegro and lispworks reverse class-slots
+  #+(or allegro lispworks) (reverse (class-slots (class-of obj)))
+  #-(or allegro lispworks) (class-slots (class-of obj)))