0.7.9.58:

[sbcl.git] / src / compiler / lexenv.lisp

diff --git a/src/compiler/lexenv.lisp b/src/compiler/lexenv.lisp
index 0726e52..34f37ba 100644 (file)
--- a/src/compiler/lexenv.lisp
+++ b/src/compiler/lexenv.lisp
@@ -18,15 +18,24 @@
 #!-sb-fluid (declaim (inline internal-make-lexenv)) ; only called in one place
 (def!struct (lexenv
             (:constructor make-null-lexenv ())
+            (:constructor make-null-interactive-lexenv
+                          (&aux (policy (list '(safety . 3)
+                                              '(compilation-speed . 2)
+                                              '(speed . 1)
+                                              '(space . 1)
+                                              '(debug . 1)
+                                              '(inhibit-warnings . 1)))))
             (:constructor internal-make-lexenv
-                          (functions variables blocks tags type-restrictions
-                                     lambda cleanup policy options)))
+                          (funs vars blocks tags
+                                 type-restrictions
+                                 weakend-type-restrictions
+                                lambda cleanup policy)))
   ;; an alist of (NAME . WHAT), where WHAT is either a FUNCTIONAL (a
   ;; local function), a DEFINED-FUN, representing an
   ;; INLINE/NOTINLINE declaration, or a list (MACRO . <function>) (a
   ;; local macro, with the specifier expander). Note that NAME may be
   ;; a (SETF <name>) list, not necessarily a single symbol.
-  (functions nil :type list)
+  (funs nil :type list)
   ;; an alist translating variable names to LEAF structures. A special
   ;; binding is indicated by a :SPECIAL GLOBAL-VAR leaf. Each special
   ;; binding within the code gets a distinct leaf structure, as does
@@ -36,7 +45,7 @@
   ;;
   ;; If the CDR is (MACRO . <exp>), then <exp> is the expansion of a
   ;; symbol macro.
-  (variables nil :type list)
+  (vars nil :type list)
   ;; BLOCKS and TAGS are alists from block and go-tag names to 2-lists
   ;; of the form (<entry> <continuation>), where <continuation> is the
   ;; continuation to exit to, and <entry> is the corresponding ENTRY node.
@@ -49,18 +58,16 @@
   ;; THING is a continuation, this is used to track the innermost THE
   ;; type declaration.
   (type-restrictions nil :type list)
+  (weakend-type-restrictions nil :type list)
   ;; the lexically enclosing lambda, if any
-  ;; 
+  ;;
   ;; FIXME: This should be :TYPE (OR CLAMBDA NULL), but it was too hard
   ;; to get CLAMBDA defined in time for the cross-compiler.
-  (lambda nil) 
+  (lambda nil)
   ;; the lexically enclosing cleanup, or NIL if none enclosing within Lambda
   (cleanup nil)
   ;; the current OPTIMIZE policy
-  (policy *policy* :type policy)
-  ;; an alist of miscellaneous options that are associated with the
-  ;; lexical environment
-  (options nil :type list))
+  (policy *policy* :type policy))
 
 ;;; support for the idiom (in MACROEXPAND and elsewhere) that NIL is
 ;;; to be taken as a null lexical environment
@@ -85,5 +92,5 @@
   ;; by LAMBDA, but this implementation doesn't try.
   (and (null (lexenv-blocks lexenv))
        (null (lexenv-tags lexenv))
-       (null (lexenv-variables lexenv))
-       (null (lexenv-functions lexenv))))
+       (null (lexenv-vars lexenv))
+       (null (lexenv-funs lexenv))))