Changeset 14212

Timestamp:

10/21/12 19:17:45 (9 years ago)

Author:

Mark Evenson

Message:

Fixes #255 so that COMPILE-FILE now handles :EXTERNAL-FORMAT correctly.

Remove debugging code from previous work.

File:

• trunk/abcl/src/org/armedbear/lisp/compile-file.lisp (modified) (5 diffs)

trunk/abcl/src/org/armedbear/lisp/compile-file.lisp

@@ -716 +716 @@
 (defvar *fasl-stream* nil)
 
-(defvar *debug-compile-from-stream* nil)
 (defun compile-from-stream (in output-file temp-file temp-file2
                             extract-toplevel-funcs-and-macros
@@ -729 +728 @@
          (start (get-internal-real-time))
          *fasl-uninterned-symbols*)
-    (setf *debug-compile-from-stream* 
-          (list :in in
-                :compile-file-pathname *compile-file-pathname*))
     (when *compile-verbose*
       (format t "; Compiling ~A ...~%" namestring))
@@ -815 +811 @@
               (let ((*package* (find-package :keyword)))
                 (write *toplevel-exports* :stream e-out)))))
-        (with-open-file (in temp-file :direction :input)
+        (with-open-file (in temp-file :direction :input :external-format *fasl-external-format*)
           (with-open-file (out temp-file2 :direction :output
                                :if-does-not-exist :create
-                               :if-exists :supersede)
+                               :if-exists :supersede
+                               :external-format *fasl-external-format*)
             (let ((*package* (find-package '#:cl))
                   (*print-fasl* t)
@@ -876 +873 @@
                      ((:print *compile-print*) *compile-print*)
                      (extract-toplevel-funcs-and-macros nil)
-                     external-format)
-  (declare (ignore external-format))    ; FIXME
+                     (external-format :utf-8))
   (flet ((pathname-with-type (pathname type &optional suffix)
            (when suffix
@@ -907 +903 @@
            (warnings-p nil)
            (failure-p nil))
-      (with-open-file (in input-file :direction :input)
+      (with-open-file (in input-file :direction :input :external-format external-format)
         (compile-from-stream in output-file temp-file temp-file2
                              extract-toplevel-funcs-and-macros