Commit 03979ade authored by Karsten Poeck's avatar Karsten Poeck
Browse files

Use strcat, minmized whitespace changes and statement reorderings as requested by review comment

parent d05e3333
...@@ -685,22 +685,22 @@ it will filter them appropriately." ...@@ -685,22 +685,22 @@ it will filter them appropriately."
`(:output-file :compile-check :warnings-file `(:output-file :compile-check :warnings-file
#+clisp :lib-file #+(or clasp ecl mkcl) :object-file) keys)) #+clisp :lib-file #+(or clasp ecl mkcl) :object-file) keys))
(output-file (output-file
(or output-file (or output-file
(apply 'compile-file-pathname* input-file :output-file output-file keywords))) (apply 'compile-file-pathname* input-file :output-file output-file keywords)))
(physical-output-file (physicalize-pathname output-file)) (physical-output-file (physicalize-pathname output-file))
(tmp-file (tmpize-pathname physical-output-file))
#+(or clasp ecl) #+(or clasp ecl)
(object-file (object-file
(unless (use-ecl-byte-compiler-p) (unless (use-ecl-byte-compiler-p)
(or object-file (or object-file
#+ecl (compile-file-pathname output-file :type :object) #+ecl (compile-file-pathname output-file :type :object)
#+clasp (compile-file-pathname output-file :output-type :object)))) #+clasp (compile-file-pathname output-file :output-type :object))))
#+clasp
(tmp-object-file (compile-file-pathname tmp-file :output-type :object))
#+mkcl #+mkcl
(object-file (object-file
(or object-file (or object-file
(compile-file-pathname output-file :fasl-p nil))) (compile-file-pathname output-file :fasl-p nil)))
(tmp-file (tmpize-pathname physical-output-file))
#+clasp
(tmp-object-file (compile-file-pathname tmp-file :output-type :object))
#+sbcl #+sbcl
(cfasl-file (etypecase emit-cfasl (cfasl-file (etypecase emit-cfasl
(null nil) (null nil)
...@@ -721,13 +721,13 @@ it will filter them appropriately." ...@@ -721,13 +721,13 @@ it will filter them appropriately."
#+sbcl (if emit-cfasl (list* :emit-cfasl tmp-cfasl keywords) keywords) #+sbcl (if emit-cfasl (list* :emit-cfasl tmp-cfasl keywords) keywords)
#-sbcl keywords)) #-sbcl keywords))
#+ecl (apply 'compile-file input-file :output-file #+ecl (apply 'compile-file input-file :output-file
(if object-file (if object-file
(list* object-file :system-p t keywords) (list* object-file :system-p t keywords)
(list* tmp-file keywords))) (list* tmp-file keywords)))
#+clasp (apply 'compile-file input-file :output-file #+clasp (apply 'compile-file input-file :output-file
(if object-file (if object-file
(list* tmp-object-file :output-type :object #|:system-p t|# keywords) (list* tmp-object-file :output-type :object #|:system-p t|# keywords)
(list* tmp-file keywords))) (list* tmp-file keywords)))
#+mkcl (apply 'compile-file input-file #+mkcl (apply 'compile-file input-file
:output-file object-file :fasl-p nil keywords))))) :output-file object-file :fasl-p nil keywords)))))
(cond (cond
...@@ -740,8 +740,7 @@ it will filter them appropriately." ...@@ -740,8 +740,7 @@ it will filter them appropriately."
#+(or clasp ecl mkcl) #+(or clasp ecl mkcl)
(when (and #+(or clasp ecl) object-file) (when (and #+(or clasp ecl) object-file)
(setf output-truename (setf output-truename
(compiler::build-fasl (compiler::build-fasl tmp-file
tmp-file
#+(or clasp ecl) :lisp-files #+mkcl :lisp-object-files (list #+clasp tmp-object-file #-clasp object-file)))) #+(or clasp ecl) :lisp-files #+mkcl :lisp-object-files (list #+clasp tmp-object-file #-clasp object-file))))
(or (not compile-check) (or (not compile-check)
(apply compile-check input-file (apply compile-check input-file
...@@ -760,8 +759,8 @@ it will filter them appropriately." ...@@ -760,8 +759,8 @@ it will filter them appropriately."
(progn (progn
;;; the following 4 rename-file-overwriting-target better be atomic, but we can't implement this right now ;;; the following 4 rename-file-overwriting-target better be atomic, but we can't implement this right now
#+:target-os-darwin #+:target-os-darwin
(let ((temp-dwarf (pathname (concatenate 'string (namestring output-truename) ".dwarf"))) (let ((temp-dwarf (pathname (strcat (namestring output-truename) ".dwarf")))
(target-dwarf (pathname (concatenate 'string (namestring physical-output-file) ".dwarf")))) (target-dwarf (pathname (strcat (namestring physical-output-file) ".dwarf"))))
(when (probe-file temp-dwarf) (when (probe-file temp-dwarf)
(rename-file-overwriting-target temp-dwarf target-dwarf))) (rename-file-overwriting-target temp-dwarf target-dwarf)))
;;; need to rename the bc or ll file as well or test-bundle.script fails ;;; need to rename the bc or ll file as well or test-bundle.script fails
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment