X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=mop.lisp;h=07240b77d9c0f7f1c0a228b0e6d070a379973a37;hp=79ac647ed59eaea2d307c8a9a9293c1b1916c76d;hb=0d0bdfdfb15376444d09b8bbbbe4e7034f710dcf;hpb=23dc098eb50376f955b164df32cea3927ec7f945

diff --git a/mop.lisp b/mop.lisp
index 79ac647..07240b7 100644
--- a/mop.lisp
+++ b/mop.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;
-;;;; $Id: mop.lisp,v 1.10 2003/04/29 07:52:38 kevin Exp $
+;;;; $Id: mop.lisp,v 1.14 2003/05/05 20:15:22 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*)))
 
@@ -58,7 +59,7 @@
 	(error "metaclass ~A class slot ~A must have a value" (quote ,metaclass) name))
       (list name `',value))
     #+(or allegro sbcl cmu scl)
-    (declare (ignore slot-name required))
+    (declare (ignore metaclass slot-name required))
     )
 
   (defmacro process-slot-option (metaclass slot-name)
@@ -70,7 +71,7 @@
 					    slot)
       (list* option `',value already-processed-options))
     #-lispworks
-    (declare (ignore slot-name))
+    (declare (ignore metaclass slot-name))
     )
 
 
@@ -92,6 +93,7 @@
      sb-pcl::direct-slot-definition-class
      sb-pcl::effective-slot-definition-class
      sb-pcl::compute-effective-slot-definition
+     sb-pcl:class-direct-slots
      sb-pcl::compute-effective-slot-definition-initargs
      sb-pcl::slot-value-using-class
      sb-pcl:class-prototype sb-pcl:generic-function-method-class sb-pcl:intern-eql-specializer
@@ -103,6 +105,7 @@
      pcl::standard-direct-slot-definition pcl::standard-effective-slot-definition
      pcl::validate-superclass pcl:direct-slot-definition-class pcl::effective-slot-definition-class
      pcl:compute-effective-slot-definition
+     pcl:class-direct-slots
      pcl::compute-effective-slot-definition-initargs
      pcl::slot-value-using-class
      pcl:class-prototype pcl:generic-function-method-class pcl:intern-eql-specializer
@@ -113,11 +116,12 @@
      clos::slot-definition-name clos:finalize-inheritance
      clos::standard-direct-slot-definition clos::standard-effective-slot-definition
      clos::effective-slot-definition-class
+     clos:class-direct-slots
      clos::validate-superclass clos:direct-slot-definition-class
      clos:compute-effective-slot-definition
      clos::compute-effective-slot-definition-initargs
      clos::slot-value-using-class
-     clos:class-prototype clos:generic-function-method-class clos:intern-eql-specializer
+     clos::class-prototype clos:generic-function-method-class clos:intern-eql-specializer
      clos:make-method-lambda clos:generic-function-lambda-list
      clos::compute-slots
      ;; note: make-method-lambda is not fbound
@@ -136,6 +140,7 @@
 	    class-prototype generic-function-method-class intern-eql-specializer
 	    make-method-lambda generic-function-lambda-list
 	    compute-slots
+	    class-direct-slots
 	    ;; KMR-MOP encapsulating macros
 	    process-slot-option
 	    process-class-option))