From: Alexey Dejneka Date: Sat, 12 Oct 2002 05:57:45 +0000 (+0000) Subject: 0.7.8.27: X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=800e2822d7004944c3aca5d12a7596ac8c6caca6;p=sbcl.git 0.7.8.27: Removed obsolete OPTIONS slot of SB-C::LEXENV structure. --- diff --git a/src/compiler/ir1util.lisp b/src/compiler/ir1util.lisp index 6e1e798..c98f2bf 100644 --- a/src/compiler/ir1util.lisp +++ b/src/compiler/ir1util.lisp @@ -387,7 +387,7 @@ ;;; slot values. Values for the alist slots are NCONCed to the ;;; beginning of the current value, rather than replacing it entirely. (defun make-lexenv (&key (default *lexenv*) - funs vars blocks tags type-restrictions options + funs vars blocks tags type-restrictions (lambda (lexenv-lambda default)) (cleanup (lexenv-cleanup default)) (policy (lexenv-policy default))) @@ -402,8 +402,7 @@ (frob blocks lexenv-blocks) (frob tags lexenv-tags) (frob type-restrictions lexenv-type-restrictions) - lambda cleanup policy - (frob options lexenv-options)))) + lambda cleanup policy))) ;;; Makes a LEXENV, suitable for using in a MACROLET introduced ;;; macroexpander @@ -432,9 +431,7 @@ (lexenv-type-restrictions lexenv) ; XXX nil nil - (lexenv-policy lexenv) - nil ; XXX - ))) + (lexenv-policy lexenv)))) ;;;; flow/DFO/component hackery diff --git a/src/compiler/lexenv.lisp b/src/compiler/lexenv.lisp index da6c4fc..5a94a63 100644 --- a/src/compiler/lexenv.lisp +++ b/src/compiler/lexenv.lisp @@ -20,7 +20,7 @@ (:constructor make-null-lexenv ()) (:constructor internal-make-lexenv (funs vars blocks tags type-restrictions - lambda cleanup policy options))) + 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 . ) (a @@ -57,10 +57,7 @@ ;; 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 diff --git a/src/pcl/walk.lisp b/src/pcl/walk.lisp index db24948..210c4e0 100644 --- a/src/pcl/walk.lisp +++ b/src/pcl/walk.lisp @@ -136,7 +136,7 @@ (defun bogo-fun-to-walker-info (bogo-fun) (declare (type function bogo-fun)) (funcall bogo-fun *bogo-fun-magic-tag*)) - + (defun with-augmented-environment-internal (env funs macros) ;; Note: In order to record the correct function definition, we ;; would have to create an interpreted closure, but the diff --git a/version.lisp-expr b/version.lisp-expr index 2dcb0b8..c3b2907 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -18,4 +18,4 @@ ;;; internal versions off the main CVS branch, it gets hairier, e.g. ;;; "0.pre7.14.flaky4.13".) -"0.7.8.26" +"0.7.8.27"