Ticket #34: ticket34.patch

File ticket34.patch, 1.6 KB (added by dmiles, 6 years ago)
  • src/org/armedbear/lisp/compile-file.lisp

     
    4141
    4242(declaim (ftype (function () t) next-classfile-name))
    4343(defun next-classfile-name ()
    44   (let ((name (%format nil "~A-~D"
    45                        (substitute #\_ #\. (pathname-name *output-file-pathname*))
     44  (let ((name (%format nil "~A_~D"
     45                       (substitute #\_ #\- (substitute #\_ #\. (pathname-name *output-file-pathname*)))
    4646                       (incf *class-number*))))
    47     (namestring (merge-pathnames (make-pathname :name name :type "cls")
     47    (namestring (merge-pathnames (make-pathname :name name :type "class")
    4848                                 *output-file-pathname*))))
    4949
    5050(defmacro report-error (&rest forms)
     
    456456          (let ((zipfile (concatenate 'string (namestring output-file) ".zip"))
    457457                (pathnames ()))
    458458            (dotimes (i *class-number*)
    459               (let* ((file-namestring (%format nil "~A-~D.cls"
    460                                                (substitute #\_ #\. (pathname-name output-file))
     459              (let* ((file-namestring (%format nil "~A_~D.class"
     460                                               (substitute #\_ #\- (substitute #\_ #\. (pathname-name output-file)))
    461461                                               (1+ i)))
    462462                     (pathname (merge-pathnames file-namestring output-file)))
    463463                (when (probe-file pathname)