From 1683d930d3aeb8322f779272ed013651cea0b229 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 12 Apr 2003 03:30:52 +0000 Subject: [PATCH] r4447: Auto commit for Debian build --- mop.lisp | 28 ++++++++++++++-------------- package.lisp | 3 ++- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/mop.lisp b/mop.lisp index 6a942da..01ba7ad 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.41 2003/04/12 03:14:29 kevin Exp $ +;;;; $Id: mop.lisp,v 1.42 2003/04/12 03:30:52 kevin Exp $ ;;;; ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg ;;;; @@ -285,7 +285,7 @@ (defun intern-eql-specializer (slot) `(eql ,slot)) -#+(or sbcl scl cmu lispworks) +#+(or sbcl cmu lispworks) (defun ensure-lazy-reader (class-name slot-name reader &rest reader-keys) (let ((keys nil) (gf (ensure-generic-function 'slot-unbound))) @@ -333,20 +333,20 @@ nil (cdr subobj-def))))) (unless (eq (lookup subobject) t) - #-(or sbcl cmu scl lispworks) + #-(or sbcl cmu lispworks) (eval `(hyperobject::def-lazy-reader ,(name-class subobject) ,(name-slot subobject) ,(lookup subobject) ,@(lookup-keys subobject))) - #+(or sbcl cmu scl lispworks) + #+(or sbcl cmu lispworks) (apply #'ensure-lazy-reader (name-class subobject) (name-slot subobject) (lookup subobject) (lookup-keys subobject)) ) (push subobject 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) + ;; allegro and lispworks don't reverse class-slots compared to the defclass form + ;; subobject is already reversed from the dolist/push loop, so re-reverse on cmu/sbcl/scl + #+(or cmu sbcl scl) subobjects + #-(or cmu sbcl scl) (nreverse subobjects) ))) (defun finalize-documentation (cl) @@ -385,9 +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)) + ;; cmu/sbcl/scl reverse class-slots compared to the defclass form + ;; hyperlinks is already reversed from the dolist/push loop, so re-reverse on sbcl/scl/cmu + #-(or cmu sbcl scl) (setq hyperlinks (nreverse hyperlinks)) (setf (slot-value cl 'hyperlinks) hyperlinks))) (defun init-hyperobject-class (cl) @@ -420,7 +420,7 @@ (hyperlinks (class-of obj))) (defun hyperobject-class-fields (obj) - ;; allegro and lispworks reverse class-slots - #+(or allegro lispworks) (reverse (class-slots (class-of obj))) - #-(or allegro lispworks) (class-slots (class-of obj))) + ;; cmucl/sbcl/scl reverse class-slots + #+(or cmu sbcl scl) (reverse (class-slots (class-of obj))) + #-(or cmu sbcl scl) (class-slots (class-of obj))) diff --git a/package.lisp b/package.lisp index b261fde..94de26b 100644 --- a/package.lisp +++ b/package.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Apr 2000 ;;;; -;;;; $Id: package.lisp,v 1.40 2003/03/31 19:22:22 kevin Exp $ +;;;; $Id: package.lisp,v 1.41 2003/04/12 03:30:52 kevin Exp $ ;;;; ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg ;;;; ************************************************************************* @@ -84,6 +84,7 @@ clos::compute-effective-slot-definition-initargs clos::slot-value-using-class clos::class-prototype clos:generic-function-method-class + ;; note: make-method-lambda is not fbound clos:intern-eql-specializer clos:make-method-lambda) :hyperobject)) -- 2.34.1