X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Flexenv.lisp;h=0b1f956ee4c2d13d868b5bb10046e62fc07ed20f;hb=cae594ffb04c80cfa70abce4a6a35a9ba5a27e8c;hp=37b9ca6ec36a03c8eafae920c0ffd8e77518df72;hpb=416152f084604094445a758ff399871132dff2bd;p=sbcl.git diff --git a/src/compiler/lexenv.lisp b/src/compiler/lexenv.lisp index 37b9ca6..0b1f956 100644 --- a/src/compiler/lexenv.lisp +++ b/src/compiler/lexenv.lisp @@ -19,14 +19,14 @@ (def!struct (lexenv (:constructor make-null-lexenv ()) (:constructor internal-make-lexenv - (functions variables blocks tags type-restrictions - lambda cleanup policy options))) + (funs vars blocks tags type-restrictions + lambda cleanup policy options))) ;; an alist of (NAME . WHAT), where WHAT is either a FUNCTIONAL (a - ;; local function), a DEFINED-FUNCTION, representing an + ;; local function), a DEFINED-FUN, representing an ;; INLINE/NOTINLINE declaration, or a list (MACRO . ) (a ;; local macro, with the specifier expander). Note that NAME may be ;; a (SETF ) 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 +36,7 @@ ;; ;; If the CDR is (MACRO . ), then 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 ( ), where is the ;; continuation to exit to, and is the corresponding ENTRY node. @@ -85,5 +85,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))))