1.1.13: will be tagged as "sbcl-1.1.13"
[sbcl.git] / src / compiler / target-main.lisp
index b621b02..0b11bda 100644 (file)
 (defun actually-compile (name definition *lexenv* source-info tlf errorp)
   (let ((source-paths (when source-info *source-paths*)))
     (with-compilation-values
-     (sb!xc:with-compilation-unit ()
-       ;; FIXME: These bindings were copied from SUB-COMPILE-FILE with
-       ;; few changes. Once things are stable, the shared bindings
-       ;; probably be merged back together into some shared utility
-       ;; macro, or perhaps both merged into one of the existing utility
-       ;; macros SB-C::WITH-COMPILATION-VALUES or
-       ;; CL:WITH-COMPILATION-UNIT.
-       (prog* ((tlf (or tlf 0))
-               ;; If we have a source-info from LOAD, we will
-               ;; also have a source-paths already set up -- so drop
-               ;; the ones from WITH-COMPILATION-VALUES.
-               (*source-paths* (or source-paths *source-paths*))
-               ;; FIXME: Do we need the *INFO-ENVIRONMENT* rebinding
-               ;; here? It's a literal translation of the old CMU CL
-               ;; rebinding to (OR *BACKEND-INFO-ENVIRONMENT*
-               ;; *INFO-ENVIRONMENT*), and it's not obvious whether the
-               ;; rebinding to itself is needed now that SBCL doesn't
-               ;; need *BACKEND-INFO-ENVIRONMENT*.
-               (*info-environment* *info-environment*)
-               (form (get-lambda-to-compile definition))
-               (*source-info* (or source-info
-                               (make-lisp-source-info
-                                form :parent *source-info*)))
-               (*toplevel-lambdas* ())
-               (*block-compile* nil)
-               (*allow-instrumenting* nil)
-               (*code-coverage-records* nil)
-               (*code-coverage-blocks* nil)
-               (*current-path* nil)
-               (*last-source-context* nil)
-               (*last-original-source* nil)
-               (*last-source-form* nil)
-               (*last-format-string* nil)
-               (*last-format-args* nil)
-               (*last-message-count* 0)
-               (*last-error-context* nil)
-               (*gensym-counter* 0)
-               ;; KLUDGE: This rebinding of policy is necessary so that
-               ;; forms such as LOCALLY at the REPL actually extend the
-               ;; compilation policy correctly.  However, there is an
-               ;; invariant that is potentially violated: future
-               ;; refactoring must not allow this to be done in the file
-               ;; compiler.  At the moment we're clearly alright, as we
-               ;; call %COMPILE with a core-object, not a fasl-stream,
-               ;; but caveat future maintainers. -- CSR, 2002-10-27
-               (*policy* (lexenv-policy *lexenv*))
-               ;; see above
-               (*handled-conditions* (lexenv-handled-conditions *lexenv*))
-               ;; ditto
-               (*disabled-package-locks* (lexenv-disabled-package-locks *lexenv*))
-               ;; FIXME: ANSI doesn't say anything about CL:COMPILE
-               ;; interacting with these variables, so we shouldn't. As
-               ;; of SBCL 0.6.7, COMPILE-FILE controls its verbosity by
-               ;; binding these variables, so as a quick hack we do so
-               ;; too. But a proper implementation would have verbosity
-               ;; controlled by function arguments and lexical variables.
-               (*compile-verbose* nil)
-               (*compile-print* nil)
-               (oops nil))
-          (with-world-lock ()
-            (handler-bind (((satisfies handle-condition-p) #'handle-condition-handler))
-              (unless source-paths
-                (find-source-paths form tlf))
-              (let ((*compiler-error-bailout*
-                      (lambda (e)
-                        (setf oops e)
-                        ;; Unwind the compiler frames: users want the know where
-                        ;; the error came from, not how the compiler got there.
-                        (go :error))))
-                (return (%compile form (make-core-object)
-                                  :name name
-                                  :path `(original-source-start 0 ,tlf))))))
-        :error
-          ;; Either signal the error right away, or return a function that
-          ;; will signal the corresponding COMPILED-PROGRAM-ERROR. This is so
-          ;; that we retain our earlier behaviour when called with erronous
-          ;; lambdas via %SIMPLE-EVAL. We could legally do just either one
-          ;; always, but right now keeping the old behaviour seems like less
-          ;; painful option: compiler.pure.lisp is full of tests that make all
-          ;; sort of assumptions about when which things are signalled. FIXME,
-          ;; probably.
-          (if errorp
-              (error oops)
-              (let ((message (princ-to-string oops))
-                    (source (source-to-string form)))
-                (return
-                  (lambda (&rest arguments)
-                    (declare (ignore arguments))
-                    (error 'compiled-program-error
-                           :message message
-                           :source source))))))))))
+      (sb!xc:with-compilation-unit ()
+        ;; FIXME: These bindings were copied from SUB-COMPILE-FILE with
+        ;; few changes. Once things are stable, the shared bindings
+        ;; probably be merged back together into some shared utility
+        ;; macro, or perhaps both merged into one of the existing utility
+        ;; macros SB-C::WITH-COMPILATION-VALUES or
+        ;; CL:WITH-COMPILATION-UNIT.
+        (with-source-paths
+          (prog* ((tlf (or tlf 0))
+                  ;; If we have a source-info from LOAD, we will
+                  ;; also have a source-paths already set up -- so drop
+                  ;; the ones from WITH-COMPILATION-VALUES.
+                  (*source-paths* (or source-paths *source-paths*))
+                  ;; FIXME: Do we need the *INFO-ENVIRONMENT* rebinding
+                  ;; here? It's a literal translation of the old CMU CL
+                  ;; rebinding to (OR *BACKEND-INFO-ENVIRONMENT*
+                  ;; *INFO-ENVIRONMENT*), and it's not obvious whether the
+                  ;; rebinding to itself is needed now that SBCL doesn't
+                  ;; need *BACKEND-INFO-ENVIRONMENT*.
+                  (*info-environment* *info-environment*)
+                  (form (get-lambda-to-compile definition))
+                  (*source-info* (or source-info
+                                  (make-lisp-source-info
+                                   form :parent *source-info*)))
+                  (*toplevel-lambdas* ())
+                  (*block-compile* nil)
+                  (*allow-instrumenting* nil)
+                  (*code-coverage-records* nil)
+                  (*code-coverage-blocks* nil)
+                  (*current-path* nil)
+                  (*last-source-context* nil)
+                  (*last-original-source* nil)
+                  (*last-source-form* nil)
+                  (*last-format-string* nil)
+                  (*last-format-args* nil)
+                  (*last-message-count* 0)
+                  (*last-error-context* nil)
+                  (*gensym-counter* 0)
+                  ;; KLUDGE: This rebinding of policy is necessary so that
+                  ;; forms such as LOCALLY at the REPL actually extend the
+                  ;; compilation policy correctly.  However, there is an
+                  ;; invariant that is potentially violated: future
+                  ;; refactoring must not allow this to be done in the file
+                  ;; compiler.  At the moment we're clearly alright, as we
+                  ;; call %COMPILE with a core-object, not a fasl-stream,
+                  ;; but caveat future maintainers. -- CSR, 2002-10-27
+                  (*policy* (lexenv-policy *lexenv*))
+                  ;; see above
+                  (*handled-conditions* (lexenv-handled-conditions *lexenv*))
+                  ;; ditto
+                  (*disabled-package-locks* (lexenv-disabled-package-locks *lexenv*))
+                  ;; FIXME: ANSI doesn't say anything about CL:COMPILE
+                  ;; interacting with these variables, so we shouldn't. As
+                  ;; of SBCL 0.6.7, COMPILE-FILE controls its verbosity by
+                  ;; binding these variables, so as a quick hack we do so
+                  ;; too. But a proper implementation would have verbosity
+                  ;; controlled by function arguments and lexical variables.
+                  (*compile-verbose* nil)
+                  (*compile-print* nil)
+                  (oops nil))
+             (handler-bind (((satisfies handle-condition-p) #'handle-condition-handler))
+               (unless source-paths
+                 (find-source-paths form tlf))
+               (let ((*compiler-error-bailout*
+                       (lambda (e)
+                         (setf oops e)
+                         ;; Unwind the compiler frames: users want the know where
+                         ;; the error came from, not how the compiler got there.
+                         (go :error))))
+                 (return
+                   (with-world-lock ()
+                     (%compile form (make-core-object)
+                               :name name
+                               :path `(original-source-start 0 ,tlf))))))
+           :error
+             ;; Either signal the error right away, or return a function that
+             ;; will signal the corresponding COMPILED-PROGRAM-ERROR. This is so
+             ;; that we retain our earlier behaviour when called with erronous
+             ;; lambdas via %SIMPLE-EVAL. We could legally do just either one
+             ;; always, but right now keeping the old behaviour seems like less
+             ;; painful option: compiler.pure.lisp is full of tests that make all
+             ;; sort of assumptions about when which things are signalled. FIXME,
+             ;; probably.
+             (if errorp
+                 (error oops)
+                 (let ((message (princ-to-string oops))
+                       (source (source-to-string form)))
+                   (return
+                     (lambda (&rest arguments)
+                       (declare (ignore arguments))
+                       (error 'compiled-program-error
+                              :message message
+                              :source source)))))))))))
 
 (defun compile-in-lexenv (name definition lexenv
                           &optional source-info tlf errorp)
           (t
            (values compiled-definition warnings-p failure-p)))))
 
-(defun compile (name &optional (definition (or (macro-function name)
+(defun compile (name &optional (definition (or (and (symbolp name)
+                                                    (macro-function name))
                                                (fdefinition name))))
   #!+sb-doc
   "Produce a compiled function from DEFINITION. If DEFINITION is a