X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=mop.lisp;h=cd7c47736dd6e9d38ccc7ce977a21628bf0ffcb4;hp=5bfe3d01ebab6ab1ff667c89bf74ef4d1d05e7fa;hb=e83a72f1e88062d7e17ac77c17cc9c32d51f3c13;hpb=76085dbb3fc5cb7e40deb1e183c858c19d20b21f diff --git a/mop.lisp b/mop.lisp index 5bfe3d0..cd7c477 100644 --- a/mop.lisp +++ b/mop.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Apr 2003 ;;;; -;;;; $Id: mop.lisp,v 1.13 2003/04/30 03:18:55 kevin Exp $ +;;;; $Id: mop.lisp,v 1.18 2003/07/30 19:04:41 kevin Exp $ ;;;; ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -29,7 +29,8 @@ #+cmu (eval-when (:compile-toplevel :load-toplevel :execute) - (if (find-package 'mop) + (if (eq (symbol-package 'pcl:find-class) + (find-package 'common-lisp)) (pushnew :kmr-cmucl-mop cl:*features*) (pushnew :kmr-cmucl-pcl cl:*features*))) @@ -41,7 +42,10 @@ #+kmr-cmucl-mop #:mop #+allegro #:mop #+lispworks #:clos - #+scl #:clos)) + #+scl #:clos + #+openmcl #:openmcl-mop + ) + ) (in-package #:kmr-mop) @@ -57,7 +61,7 @@ (when (and ,required (null value)) (error "metaclass ~A class slot ~A must have a value" (quote ,metaclass) name)) (list name `',value)) - #+(or allegro sbcl cmu scl) + #-lispworks (declare (ignore metaclass slot-name required)) ) @@ -124,7 +128,18 @@ clos:make-method-lambda clos:generic-function-lambda-list clos::compute-slots ;; note: make-method-lambda is not fbound - ))) + ) + #+openmcl + '(openmcl-mop::slot-definition-name openmcl-mop:finalize-inheritance + openmcl-mop::standard-direct-slot-definition openmcl-mop::standard-effective-slot-definition + openmcl-mop::validate-superclass openmcl-mop:direct-slot-definition-class openmcl-mop::effective-slot-definition-class + openmcl-mop:compute-effective-slot-definition + openmcl-mop:class-direct-slots + openmcl-mop::compute-effective-slot-definition-initargs + openmcl-mop::slot-value-using-class + openmcl-mop:class-prototype openmcl-mop:generic-function-method-class openmcl-mop:intern-eql-specializer + openmcl-mop:make-method-lambda openmcl-mop:generic-function-lambda-list + openmcl-mop::compute-slots) )) (eval-when (:compile-toplevel :load-toplevel :execute) (export '(class-of class-name class-slots find-class