0.7.1.18:

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

diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp
index 82faea7..780ee91 100644 (file)
--- a/src/compiler/main.lisp
+++ b/src/compiler/main.lisp
@@ -14,7 +14,7 @@
 (in-package "SB!C")
 
 ;;; FIXME: Doesn't this belong somewhere else, like early-c.lisp?
-(declaim (special *constants* *free-variables* *component-being-compiled*
+(declaim (special *constants* *free-vars* *component-being-compiled*
                  *code-vector* *next-location* *result-fixups*
                  *free-funs* *source-paths*
                  *seen-blocks* *seen-funs* *list-conflicts-table*
@@ -40,13 +40,11 @@
 ;;; :BLOCK-COMPILE and :ENTRY-POINTS arguments that COMPILE-FILE was
 ;;; called with.
 ;;;
-;;; *BLOCK-COMPILE-ARGUMENT* holds the original value of the
-;;; :BLOCK-COMPILE argument, which overrides any internal
-;;; declarations.
+;;; *BLOCK-COMPILE-ARG* holds the original value of the :BLOCK-COMPILE
+;;; argument, which overrides any internal declarations.
 (defvar *block-compile*)
-(defvar *block-compile-argument*)
-(declaim (type (member nil t :specified)
-              *block-compile* *block-compile-argument*))
+(defvar *block-compile-arg*)
+(declaim (type (member nil t :specified) *block-compile* *block-compile-arg*))
 (defvar *entry-points*)
 (declaim (list *entry-points*))
 
@@ -317,8 +315,8 @@
     (declare (special *constraint-number* *delayed-ir1-transforms*))
     (loop
       (ir1-optimize-until-done component)
-      (when (or (component-new-funs component)
-               (component-reanalyze-funs component))
+      (when (or (component-new-functionals component)
+               (component-reanalyze-functionals component))
        (maybe-mumble "locall ")
        (locall-analyze-component component))
       (dfo-as-needed component)
@@ -330,8 +328,8 @@
       (flet ((want-reoptimization-p ()
               (or (component-reoptimize component)
                   (component-reanalyze component)
-                  (component-new-funs component)
-                  (component-reanalyze-funs component))))
+                  (component-new-functionals component)
+                  (component-reanalyze-functionals component))))
        (unless (and (want-reoptimization-p)
                     ;; We delay the generation of type checks until
                     ;; the type constraints have had time to
@@ -507,7 +505,7 @@
 ;;;; global data structures entirely when possible and consing up the
 ;;;; others from scratch instead of clearing and reusing them?
 
-;;; Clear the INFO in constants in the *FREE-VARIABLES*, etc. In
+;;; Clear the INFO in constants in the *FREE-VARS*, etc. In
 ;;; addition to allowing stuff to be reclaimed, this is required for
 ;;; correct assignment of constant offsets, since we need to assign a
 ;;; new offset for each component. We don't clear the FUNCTIONAL-INFO
@@ -522,7 +520,7 @@
             (declare (ignore k))
             (when (constant-p v)
               (setf (leaf-info v) nil)))
-          *free-variables*)
+          *free-vars*)
   (values))
 
 ;;; Blow away the REFS for all global variables, and let COMPONENT
@@ -541,7 +539,7 @@
                      x))
           (here-p (x)
             (eq (node-component x) component)))
-    (blast *free-variables*)
+    (blast *free-vars*)
     (blast *free-funs*)
     (blast *constants*))
   (values))
@@ -557,7 +555,7 @@
   ;; Clear global tables.
   (when (boundp '*free-funs*)
     (clrhash *free-funs*)
-    (clrhash *free-variables*)
+    (clrhash *free-vars*)
     (clrhash *constants*))
 
   ;; Clear debug counters and tables.
@@ -595,7 +593,7 @@
 \f
 ;;;; trace output
 
-;;; Print out some useful info about Component to Stream.
+;;; Print out some useful info about COMPONENT to STREAM.
 (defun describe-component (component *standard-output*)
   (declare (type component component))
   (format t "~|~%;;;; component: ~S~2%" (component-name component))
@@ -624,7 +622,7 @@
 ;;;; the error context and for recovering from errors.
 ;;;;
 ;;;; The interface we provide to this stuff is the stream-oid
-;;;; Source-Info structure. The bookkeeping is done as a side-effect
+;;;; SOURCE-INFO structure. The bookkeeping is done as a side effect
 ;;;; of getting the next source form.
 
 ;;; A FILE-INFO structure holds all the source information for a
@@ -1302,7 +1300,7 @@
 ;;; Return (VALUES NIL WARNINGS-P FAILURE-P).
 (defun sub-compile-file (info)
   (declare (type source-info info))
-  (let* ((*block-compile* *block-compile-argument*)
+  (let* ((*block-compile* *block-compile-arg*)
         (*package* (sane-package))
         (*policy* *policy*)
         (*lexenv* (make-null-lexenv))
@@ -1415,7 +1413,7 @@
 
      ;; extensions
      (trace-file nil) 
-     ((:block-compile *block-compile-argument*) nil))
+     ((:block-compile *block-compile-arg*) nil))
 
   #!+sb-doc
   "Compile INPUT-FILE, producing a corresponding fasl file and returning