X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=package.lisp;h=2cff019cefab96be7d7448b22c3a45e1a696c7a1;hb=19cb24908d2ba2faec3afbdd180eed0c7d7d8515;hp=61b19e9854f7d030033ab83cef389b465bf2a439;hpb=7ffe31bff2d7daa3df28ed34fe439f7e541ffbb5;p=hyperobject.git

diff --git a/package.lisp b/package.lisp
index 61b19e9..2cff019 100644
--- a/package.lisp
+++ b/package.lisp
@@ -1,52 +1,108 @@
-;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          package.lisp
-;;;; Purpose:       Package definition for hyperobject package
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Apr 2000
-;;;;
-;;;; $Id: package.lisp,v 1.6 2002/11/22 15:43:22 kevin Exp $
-;;;;
-;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
-;;;; *************************************************************************
-
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-
-(in-package :cl-user)
-
-(defpackage #:hyperobject
-  (:nicknames #:ho-mop)
-  (:use #:common-lisp #:kmrcl)
-  (:export
-   #:define-hyperobject
-   #:hyperobject
-   #:hyperobject-class
-   #:hyperobject-base-url!
-   #:hyperobject-class-title
-   #:load-all-subobjects
-   #:print-hyperobject
-   ))
-
-(defpackage #:hyperobject-no-mop
-  (:nicknames #:ho-no-mop)
-  (:use #:common-lisp #:kmrcl)
-  (:export
-   #:define-hyperobject
-   #:hyperobject
-   #:hyperobject-base-url!
-   #:load-all-subobjects
-   #:print-hyperobject
-   ))
-
-(defpackage #:hyperobject-user
-  (:niceknames #:ho-user)
-  (:use #:hyperobject #:cl #:cl-user))
-
-(defpackage #:hyperobject-no-mop-user
-  (:niceknames #:ho-no-mop-user)
-  (:use #:hyperobject-no-mop #:cl #:cl-user))
-
-
-
+;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; *************************************************************************
+;;;; FILE IDENTIFICATION
+;;;;
+;;;; Name:          package.lisp
+;;;; Purpose:       Package definition for hyperobject package
+;;;; Programmer:    Kevin M. Rosenberg
+;;;; Date Started:  Apr 2000
+;;;;
+;;;; $Id: package.lisp,v 1.49 2003/06/06 21:59:29 kevin Exp $
+;;;;
+;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
+;;;; *************************************************************************
+
+(in-package #:cl-user)
+
+#+sbcl
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (if (find-package 'sb-mop)
+      (pushnew :kmr-sbcl-mop cl:*features*)
+      (pushnew :kmr-sbcl-pcl cl:*features*)))
+
+#+cmu
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (if (eq (symbol-package 'pcl:find-class)
+	  (find-package 'common-lisp))
+      (pushnew :kmr-cmucl-mop cl:*features*)
+      (pushnew :kmr-cmucl-pcl cl:*features*)))
+
+
+(defpackage #:hyperobject
+  (:nicknames #:ho)
+  (:use #:common-lisp #:kmrcl
+	#+kmr-sbcl-mop #:sb-mop
+	#+kmr-cmucl-mop #:mop
+	#+allegro #:mop
+	#+lispworks #:clos
+	#+scl #:clos)
+  (:export
+   #:package
+   #:hyperobject
+   #:hyperobject-class
+   #:hyperobject-class-user-name
+   #:load-all-subobjects
+   #:view
+   #:fmt-comma-integer
+   #:processed-queued-definitions
+   #:all-subobjects
+   #:subobjects
+   ))
+
+(defpackage #:hyperobject-user
+  (:nicknames #:ho-user)
+  (:use #:hyperobject #:cl #:cl-user))
+
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (shadowing-import
+   #+allegro
+   '(excl::compute-effective-slot-definition-initargs)
+   #+lispworks
+   '(clos::compute-effective-slot-definition-initargs)
+   #+kmr-sbcl-mop 
+   '(sb-pcl::compute-effective-slot-definition-initargs)
+   #+kmr-sbcl-pcl
+   '(sb-pcl:class-of sb-pcl:class-name sb-pcl:class-slots sb-pcl:find-class
+     sb-pcl::standard-class
+     sb-pcl:slot-definition-name sb-pcl::finalize-inheritance
+     sb-pcl::standard-direct-slot-definition
+     sb-pcl::standard-effective-slot-definition sb-pcl::validate-superclass
+     sb-pcl::direct-slot-definition-class sb-pcl::compute-effective-slot-definition
+     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
+     sb-pcl:make-method-lambda sb-pcl:generic-function-lambda-list
+     sb-pcl::class-precedence-list)
+   #+kmr-cmucl-mop 
+   '(pcl::compute-effective-slot-definition-initargs)
+   #+kmr-cmucl-pcl
+   '(pcl:class-of  pcl:class-name pcl:class-slots pcl:find-class pcl::standard-class
+     pcl::slot-definition-name pcl:finalize-inheritance
+     pcl::standard-direct-slot-definition pcl::standard-effective-slot-definition
+     pcl::validate-superclass pcl:direct-slot-definition-class
+     pcl:compute-effective-slot-definition
+     pcl::compute-effective-slot-definition-initargs
+     pcl::slot-value-using-class
+     pcl:class-prototype pcl:generic-function-method-class pcl:intern-eql-specializer
+     pcl:make-method-lambda pcl:generic-function-lambda-list
+     pcl::class-precedence-list)
+   #+scl
+   '(clos::compute-effective-slot-definition-initargs
+     clos::class-prototype
+     ;; note: make-method-lambda is not fbound
+     )
+  
+   :hyperobject))
+
+#+sbcl
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (if (find-package 'sb-mop)
+      (setq cl:*features* (delete :kmr-sbcl-mop cl:*features*))
+      (setq cl:*features* (delete :kmr-sbcl-pcl cl:*features*))))
+
+#+cmu
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (if (find-package 'mop)
+      (setq cl:*features* (delete :kmr-cmucl-mop cl:*features*))
+      (setq cl:*features* (delete :kmr-cmucl-pcl cl:*features*))))