Ignore:
Timestamp:
10/21/12 19:17:45 (8 years ago)
Author:
Mark Evenson
Message:

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

Remove debugging code from previous work.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/compile-file.lisp

    r14176 r14212  
    716716(defvar *fasl-stream* nil)
    717717
    718 (defvar *debug-compile-from-stream* nil)
    719718(defun compile-from-stream (in output-file temp-file temp-file2
    720719                            extract-toplevel-funcs-and-macros
     
    729728         (start (get-internal-real-time))
    730729         *fasl-uninterned-symbols*)
    731     (setf *debug-compile-from-stream*
    732           (list :in in
    733                 :compile-file-pathname *compile-file-pathname*))
    734730    (when *compile-verbose*
    735731      (format t "; Compiling ~A ...~%" namestring))
     
    815811              (let ((*package* (find-package :keyword)))
    816812                (write *toplevel-exports* :stream e-out)))))
    817         (with-open-file (in temp-file :direction :input)
     813        (with-open-file (in temp-file :direction :input :external-format *fasl-external-format*)
    818814          (with-open-file (out temp-file2 :direction :output
    819815                               :if-does-not-exist :create
    820                                :if-exists :supersede)
     816                               :if-exists :supersede
     817                               :external-format *fasl-external-format*)
    821818            (let ((*package* (find-package '#:cl))
    822819                  (*print-fasl* t)
     
    876873                     ((:print *compile-print*) *compile-print*)
    877874                     (extract-toplevel-funcs-and-macros nil)
    878                      external-format)
    879   (declare (ignore external-format))    ; FIXME
     875                     (external-format :utf-8))
    880876  (flet ((pathname-with-type (pathname type &optional suffix)
    881877           (when suffix
     
    907903           (warnings-p nil)
    908904           (failure-p nil))
    909       (with-open-file (in input-file :direction :input)
     905      (with-open-file (in input-file :direction :input :external-format external-format)
    910906        (compile-from-stream in output-file temp-file temp-file2
    911907                             extract-toplevel-funcs-and-macros
Note: See TracChangeset for help on using the changeset viewer.