X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fprimordial-extensions.lisp;h=38aa0635b0103963519fed7c83100493d035bdaf;hb=86210c4e406c1b2ff10cc3bac0e71435867db48b;hp=f78d9f8f33e115444a441705eb5be5cfbaf7763b;hpb=c7468ce98233e22d968b8a740743b4bac9ea2c5a;p=sbcl.git

diff --git a/src/code/primordial-extensions.lisp b/src/code/primordial-extensions.lisp
index f78d9f8..38aa063 100644
--- a/src/code/primordial-extensions.lisp
+++ b/src/code/primordial-extensions.lisp
@@ -31,10 +31,10 @@
 ;;; and there's also the noted-below problem that the C-level code
 ;;; contains implicit assumptions about this marker.
 ;;;
-;;; KLUDGE: Note that as of version 0.6.6 there's a dependence in the
+;;; KLUDGE: Note that as of version 0.pre7 there's a dependence in the
 ;;; gencgc.c code on this value being a symbol. (This is only one of
-;;; many nasty dependencies between that code and this, alas.)
-;;; -- WHN 2001-02-28
+;;; several nasty dependencies between that code and this, alas.)
+;;; -- WHN 2001-08-17
 ;;;
 ;;; FIXME: We end up doing two DEFCONSTANT forms because (1) LispWorks
 ;;; needs EVAL-WHEN wrapped around DEFCONSTANT, and (2) SBCL's
@@ -47,7 +47,8 @@
 ;;; interpreter to go away, which is waiting for sbcl-0.7.x..
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defconstant +empty-ht-slot+ '%empty-ht-slot%))
-(defconstant +empty-ht-slot+ '#.+empty-ht-slot+) ; egads.. See FIXME above.
+;;; We shouldn't need this mess now that EVAL-WHEN works.
+#+nil (defconstant +empty-ht-slot+ '#.+empty-ht-slot+) ; egads.. See FIXME above.
 ;;; KLUDGE: Using a private symbol still leaves us vulnerable to users
 ;;; getting nonconforming behavior by messing around with
 ;;; DO-ALL-SYMBOLS. That seems like a fairly obscure problem, so for
@@ -67,7 +68,7 @@
 ;;;; DO-related stuff which needs to be visible on the cross-compilation host
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defun do-do-body (varlist endlist decls-and-code bind step name block)
+  (defun frob-do-body (varlist endlist decls-and-code bind step name block)
     (let* ((r-inits nil) ; accumulator for reversed list
 	   (r-steps nil) ; accumulator for reversed list
 	   (label-1 (gensym))
@@ -128,10 +129,22 @@
 ;;; EXIT-FORMS are evaluated as a PROGN, with the result being the
 ;;; value of the DO.
 (defmacro do-anonymous (varlist endlist &rest body)
-  (do-do-body varlist endlist body 'let 'psetq 'do-anonymous (gensym)))
+  (frob-do-body varlist endlist body 'let 'psetq 'do-anonymous (gensym)))
 
 ;;;; miscellany
 
+;;; Lots of code wants to get to the KEYWORD package or the
+;;; COMMON-LISP package without a lot of fuss, so we cache them in
+;;; variables. TO DO: How much does this actually buy us? It sounds
+;;; sensible, but I don't know for sure that it saves space or time..
+;;; -- WHN 19990521
+;;;
+;;; (The initialization forms here only matter on the cross-compilation
+;;; host; In the target SBCL, these variables are set in cold init.)
+(declaim (type package *cl-package* *keyword-package*))
+(defvar *cl-package*      (find-package "COMMON-LISP"))
+(defvar *keyword-package* (find-package "KEYWORD"))
+
 ;;; Concatenate together the names of some strings and symbols,
 ;;; producing a symbol in the current package.
 (eval-when (:compile-toplevel :load-toplevel :execute)
@@ -246,7 +259,11 @@
      ,@(when doc (list doc))))
 (defun %defconstant-eqx-value (symbol expr eqx)
   (flet ((bummer (explanation)
-	   (error "~@<bad DEFCONSTANT-EQX ~S: ~2I~_~A~:>" symbol explanation)))
+	   (error "~@<bad DEFCONSTANT-EQX ~S ~2I~_~S: ~2I~_~A ~S~:>"
+		  symbol
+		  expr
+		  explanation
+		  (symbol-value symbol))))
     (cond ((not (boundp symbol))
 	   expr)
 	  ((not (constantp symbol))