Index: defsystem.lisp =================================================================== RCS file: /cvsroot/clocc/clocc/src/defsystem-3.x/defsystem.lisp,v retrieving revision 1.12 diff -u -r1.12 defsystem.lisp --- defsystem.lisp 2000/04/07 19:21:24 1.12 +++ defsystem.lisp 2000/04/17 18:39:50 @@ -826,6 +826,13 @@ #+(or (and allegro-version>= (version>= 4 0)) :mcl) (pushnew :cltl2 *features*)) +;;; this is a kludge. really +#+sbcl +(eval-when (compile load eval) + (rename-package "COMMON-LISP" "COMMON-LISP" + (cons "LISP" (package-nicknames "COMMON-LISP")))) + + ;;; ******************************** ;;; Provide/Require/*modules* ****** ;;; ******************************** @@ -849,7 +856,7 @@ ;;; Now that ANSI CL includes PROVIDE and REQUIRE again, is this code ;;; necessary? -#-(or (and :CMU (not :new-compiler)) :vms :mcl :lispworks :clisp +#-(or (and :CMU (not :new-compiler)) :vms :mcl :lispworks :clisp :sbcl (and allegro-version>= (version>= 4 1))) (eval-when #-(or :lucid :cmu17) (:compile-toplevel :load-toplevel :execute) #+(or :lucid :cmu17) (compile load eval) @@ -960,8 +967,13 @@ ;;; package. To avoid name conflicts, we've decided to name this the ;;; MAKE package. A nice side-effect is that the short nickname ;;; MK is my initials. + +;;; added to this mess of conditional code, SBCL is based on CMUCL but +;;; doesn't define :CLTL2 (which is correct for an ANSI CL, at least +;;; by my reading of the Hyperspec) and doesn't have a CONDITIONS +;;; package -dan -#-(or :cltl2 :lispworks) +#-(or :cltl2 :lispworks :ansi-cl) (in-package "MAKE" :nicknames '("MK")) ;;; For CLtL2 compatible lisps... @@ -1000,7 +1012,7 @@ (make-package "MAKE" :nicknames '("MK") :use '("COMMON-LISP")))) ;;; sds -#+:clisp +#+(or :clisp :sbcl) (defpackage "MAKE" (:use "COMMON-LISP") (:nicknames "MK")) ;;; *** Marco Antoniotti 19951012 @@ -1009,7 +1021,7 @@ (defpackage "MAKE" (:use "COMMON-LISP" "CONDITIONS") (:nicknames "MK")) -#+(or :cltl2 :lispworks) +#+(or :sbcl :cltl2 :lispworks) (eval-when (compile load eval) (in-package "MAKE"))