0.6.12.11:

[sbcl.git] / src / compiler / early-c.lisp

diff --git a/src/compiler/early-c.lisp b/src/compiler/early-c.lisp
index b8732f8..913bde5 100644 (file)
--- a/src/compiler/early-c.lisp
+++ b/src/compiler/early-c.lisp
@@ -15,10 +15,11 @@
 
 (in-package "SB!C")
 
-;;; FIXME: shouldn't SB-C::&MORE be in this list?
-(defconstant sb!xc:lambda-list-keywords
+;;; FIXME: Shouldn't SB!C::&MORE be in this list?
+(defconstant-eqx sb!xc:lambda-list-keywords
   '(&optional &rest &key &aux &body &whole &allow-other-keys &environment)
   #!+sb-doc
+  #'equal
   "symbols which are magical in a lambda list")
 \f
 ;;;; cross-compiler-only versions of CL special variables, so that we
@@ -37,55 +38,16 @@
 
 ;;; the type of LAYOUT-DEPTHOID slot values
 (def!type sb!kernel::layout-depthoid () '(or index (integer -1 -1)))
-
-;;; a value for an optimization declaration
-(def!type sb!c::cookie-quality () '(or (rational 0 3) null))
 \f
-;;; A COOKIE holds information about the compilation environment for a
-;;; node. See the LEXENV definition for a description of how it is
-;;; used.
-(def!struct (cookie (:copier nil))
-  (speed   nil :type cookie-quality)
-  (space   nil :type cookie-quality)
-  (safety  nil :type cookie-quality)
-  (cspeed  nil :type cookie-quality)
-  (brevity nil :type cookie-quality)
-  (debug   nil :type cookie-quality))
-
-;;; KLUDGE: This needs to be executable in cold init toplevel forms, earlier
-;;; than the default copier closure created by DEFSTRUCT toplevel forms would
-;;; be available, and earlier than LAYOUT-INFO is initialized (which is a
-;;; prerequisite for COPY-STRUCTURE to work), so we define it explicitly using
-;;; DEFUN, so that it can be installed by the cold loader, and using
-;;; hand-written, hand-maintained slot-by-slot copy it doesn't need to call
-;;; COPY-STRUCTURE. -- WHN 19991019
-(defun copy-cookie (cookie)
-  (make-cookie :speed   (cookie-speed   cookie)
-              :space   (cookie-space   cookie)
-              :safety  (cookie-safety  cookie)
-              :cspeed  (cookie-cspeed  cookie)
-              :brevity (cookie-brevity cookie)
-              :debug   (cookie-debug   cookie)))
-
-;;; *DEFAULT-COOKIE* holds the current global compiler policy information.
-;;; Whenever the policy is changed, we copy the structure so that old uses will
-;;; still get the old values. *DEFAULT-INTERFACE-COOKIE* holds any values
-;;; specified by an OPTIMIZE-INTERFACE declaration.
-;;;
-;;; FIXME: Why isn't COOKIE called POLICY?
-(declaim (type cookie *default-cookie* *default-interface-cookie*))
-(defvar *default-cookie*)         ; initialized in cold init
-(defvar *default-interface-cookie*) ; initialized in cold init
-
 ;;; possible values for the INLINE-ness of a function.
 (deftype inlinep ()
   '(member :inline :maybe-inline :notinline nil))
-(defconstant inlinep-translations
+(defparameter *inlinep-translations*
   '((inline . :inline)
     (notinline . :notinline)
     (maybe-inline . :maybe-inline)))
 
-;;; The lexical environment we are currently converting in.
+;;; the lexical environment we are currently converting in
 (defvar *lexenv*)
 (declaim (type lexenv *lexenv*))
 
@@ -111,12 +73,14 @@
 (defvar *compiler-warning-count*)
 (defvar *compiler-style-warning-count*)
 (defvar *compiler-note-count*)
+(defvar *compiler-trace-output*)
+(defvar *constraint-number*)
 (defvar *converting-for-interpreter*)
 (defvar *count-vop-usages*)
 (defvar *current-path*)
 (defvar *current-component*)
-(defvar *default-cookie*)
-(defvar *default-interface-cookie*)
+(defvar *delayed-ir1-transforms*)
+(defvar *policy*)
 (defvar *dynamic-counts-tn*)
 (defvar *elsewhere*)
 (defvar *event-info*)
@@ -153,11 +117,11 @@
 (declaim (ftype (function (symbol) (values)) note-lexical-binding))
 (defun note-lexical-binding (symbol)
   (let ((name (symbol-name symbol)))
-    ;; This check is intended to protect us from getting silently burned when
-    ;; we define
+    ;; This check is intended to protect us from getting silently
+    ;; burned when we define
     ;;   foo.lisp:
-    ;;     (DEFVAR *FOO*)
-    ;;     (DEFUN FOO (X) (1+ X *FOO*))
+    ;;     (DEFVAR *FOO* -3)
+    ;;     (DEFUN FOO (X) (+ X *FOO*))
     ;;   bar.lisp:
     ;;     (DEFUN BAR (X)
     ;;       (LET ((*FOO* X))
@@ -165,6 +129,7 @@
     ;; and then we happen to compile bar.lisp before foo.lisp.
     (when (and (char= #\* (aref name 0))
               (char= #\* (aref name (1- (length name)))))
+      ;; FIXME: should be COMPILER-STYLE-WARNING?
       (style-warn "using the lexical binding of the symbol ~S, not the~@
 dynamic binding, even though the symbol name follows the usual naming~@
 convention (names like *FOO*) for special variables" symbol)))