X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=package.lisp;h=9d9a718999438a95927eb12d9fcda1213eb0c9ee;hb=39d00302eebe628c8bdc89d6a292a0d9bfe3f7bc;hp=61b19e9854f7d030033ab83cef389b465bf2a439;hpb=7ffe31bff2d7daa3df28ed34fe439f7e541ffbb5;p=hyperobject.git

diff --git a/package.lisp b/package.lisp
index 61b19e9..9d9a718 100644
--- a/package.lisp
+++ b/package.lisp
@@ -1,4 +1,4 @@
-;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,46 +7,93 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.6 2002/11/22 15:43:22 kevin Exp $
+;;;; $Id: package.lisp,v 1.42 2003/04/15 05:18: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)))
+(eval-when (:compile-toplevel :execute)
+  (declaim (optimize (speed 2) (safety 2) (compilation-speed 0) (debug 2))))
 
 (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*)))
+
+
 (defpackage #:hyperobject
-  (:nicknames #:ho-mop)
-  (:use #:common-lisp #:kmrcl)
+  (:nicknames #:ho)
+  (:use #:common-lisp #:kmrcl
+	#+kmr-sbcl-mop #:sb-mop
+	#+allegro #:mop
+	#+lispworks #:clos)
   (:export
-   #:define-hyperobject
+   #:package
    #: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!
+   #:hyperobject-class-user-name
    #:load-all-subobjects
-   #:print-hyperobject
+   #:view
+   #:fmt-comma-integer
+   #:processed-queued-definitions
    ))
 
 (defpackage #:hyperobject-user
-  (:niceknames #:ho-user)
+  (:nicknames #:ho-user)
   (:use #:hyperobject #:cl #:cl-user))
 
-(defpackage #:hyperobject-no-mop-user
-  (:niceknames #:ho-no-mop-user)
-  (:use #:hyperobject-no-mop #: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)
+  #+cmu
+  '(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)
+  #+scl
+  '(clos:class-slots clos::standard-class
+    clos::slot-definition-name clos:finalize-inheritance
+    clos::standard-direct-slot-definition clos::standard-effective-slot-definition
+    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
+    ;; note: make-method-lambda is not fbound
+    clos:intern-eql-specializer clos:make-method-lambda
+    clos:generic-function-lambda-list)
+  
+   :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*))))