X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-load.lisp;h=79000f065a4f61f3f66a22795732dd99c7ea398e;hb=cd5a858174d892f876699373dc3ea389cf2c4d40;hp=d022e5574853dc27e055f7e412f733a32e1e9818;hpb=01488e5ddb6c8c10bc01bc9c502be1fe9de8e370;p=sbcl.git

diff --git a/src/code/target-load.lisp b/src/code/target-load.lisp
index d022e55..79000f0 100644
--- a/src/code/target-load.lisp
+++ b/src/code/target-load.lisp
@@ -28,31 +28,38 @@
 ;;;; LOAD-AS-SOURCE
 
 ;;; Load a text stream.  (Note that load-as-fasl is in another file.)
-(defun load-as-source (stream verbose print)
+(defun load-as-source (stream &key verbose print (context "loading"))
   (maybe-announce-load stream verbose)
-  (macrolet ((do-sexprs ((sexpr stream) &body body)
-               (aver (symbolp sexpr))
-               (with-unique-names (source-info)
-                 (once-only ((stream stream))
-                   `(if (handler-case (pathname stream)
-                          (error () nil))
-                        (let ((,source-info (sb!c::make-file-source-info
-                                            (pathname ,stream)
-                                            (stream-external-format ,stream))))
-                          (setf (sb!c::source-info-stream ,source-info) ,stream)
-                          (sb!c::do-forms-from-info ((,sexpr) ,source-info)
-                            ,@body))
-                        (do ((,sexpr (read ,stream nil *eof-object*)
-                                     (read ,stream nil *eof-object*)))
-                            ((eq ,sexpr *eof-object*))
-                          ,@body))))))
-    (do-sexprs (sexpr stream)
-      (if print
-          (let ((results (multiple-value-list (eval sexpr))))
-            (load-fresh-line)
-            (format t "~{~S~^, ~}~%" results))
-          (eval sexpr)))
-    t))
+  (let* ((pathname (ignore-errors (translate-logical-pathname stream)))
+         (native (when pathname (native-namestring pathname))))
+    (with-simple-restart (abort "Abort ~A file ~S." context native)
+      (flet ((eval-form (form index)
+               (with-simple-restart (continue "Ignore error and continue ~A file ~S."
+                                              context native)
+                 (loop
+                   (with-simple-restart (retry "Retry EVAL of current toplevel form.")
+                     (if print
+                         (let ((results (multiple-value-list (eval-tlf form index))))
+                           (load-fresh-line)
+                           (format t "~{~S~^, ~}~%" results))
+                         (eval-tlf form index)))
+                   (return)))))
+        (if pathname
+            (let* ((info (sb!c::make-file-source-info
+                          pathname (stream-external-format stream)))
+                   (sb!c::*source-info* info))
+              (setf (sb!c::source-info-stream info) stream)
+              (sb!c::do-forms-from-info ((form current-index) info)
+                (sb!c::with-source-paths
+                  (sb!c::find-source-paths form current-index)
+                  (eval-form form current-index))))
+            (let ((sb!c::*source-info* nil))
+              (do ((form (read stream nil *eof-object*)
+                         (read stream nil *eof-object*)))
+                  ((eq form *eof-object*))
+                (sb!c::with-source-paths
+                  (eval-form form nil))))))))
+  t)
 
 ;;;; LOAD itself
 
@@ -111,7 +118,7 @@
              (return-from load
                (if faslp
                    (load-as-fasl stream verbose print)
-                   (load-as-source stream verbose print))))))
+                   (load-as-source stream :verbose verbose :print print))))))
     ;; Case 1: stream.
     (when (streamp pathspec)
       (return-from load (load-stream pathspec (fasl-header-p pathspec))))
@@ -139,8 +146,11 @@
           (return-from load nil))
         (let* ((real (probe-file stream))
                (should-be-fasl-p
-                (and real (string= (pathname-type real) *fasl-file-type*))))
-          (when (fasl-header-p stream :errorp should-be-fasl-p)
+                (and real (string-equal (pathname-type real) *fasl-file-type*))))
+          ;; Don't allow empty .fasls, and assume other empty files
+          ;; are source files.
+          (when (and (or should-be-fasl-p (not (eql 0 (file-length stream))))
+                     (fasl-header-p stream :errorp should-be-fasl-p))
             (return-from load (load-stream stream t)))))
       ;; Case 3: Open using the gived external format, process as source.
       (with-open-file (stream pathname :external-format external-format)