Commit 812c0dc0 authored by Jan Moringen's avatar Jan Moringen

UIOP: Remove more unsatisfiable or redundant read-time conditionals

This time, consider unsatisfiable/redundant parts of expressions
instead of only whole expressions.

* #+genera enclosed in #+genera

* #+(or clasp ecl) enclosed in #+(and ecl ecl-bytecomp)

* #-(or abcl xcl ...) and #+(or abcl xcl ...) enclosed in #-(or abcl
    xcl ...)

* #+(and sbcl ...) enclosed in #+sbcl

* #+(or ecl ...), #+ecl enclosed in #-(or ecl ...) as well
   as (implied) #+sbcl enclosed in #+sbcl
parent 56b532ac
......@@ -81,7 +81,7 @@ Some constraints:
#+genera
(unless (fboundp 'ensure-directories-exist)
(defun ensure-directories-exist (path)
#+genera (fs:create-directories-recursively (pathname path))))
(fs:create-directories-recursively (pathname path))))
;;; Survival utilities
(defun asym (name &optional package errorp)
......
......@@ -6,6 +6,6 @@
;; Work around:
#+(and ecl ecl-bytecmp)
(when (and (eq asdf:*compile-file-failure-behaviour* :error)
#+(or clasp ecl) (equal (compile-file-type) "fasc"))
(equal (compile-file-type) "fasc"))
(error 'compile-file-error :description "faking it"))
(warn "Warning."))
......@@ -237,9 +237,9 @@ The behavior in presence of symlinks is not portable. Use IOlib to handle such s
(let* ((directory (ensure-directory-pathname directory))
#-(or abcl cormanlisp genera xcl)
(wild (merge-pathnames*
#-(or abcl allegro cmucl lispworks sbcl scl xcl)
#-(or allegro cmucl lispworks sbcl scl)
*wild-directory*
#+(or abcl allegro cmucl lispworks sbcl scl xcl) "*.*"
#+(or allegro cmucl lispworks sbcl scl) "*.*"
directory))
(dirs
#-(or abcl cormanlisp genera xcl)
......
......@@ -410,7 +410,7 @@ or COMPRESSION on SBCL, and APPLICATION-TYPE on SBCL/Windows."
(when compression (list :compression compression))
;;--- only save runtime-options for standalone executables
(when executable (list :toplevel #'restore-image :save-runtime-options t))
#+(and sbcl os-windows) ;; passing :application-type :gui will disable the console window.
#+os-windows ;; passing :application-type :gui will disable the console window.
;; the default is :console - only works with SBCL 1.1.15 or later.
(when application-type (list :application-type application-type)))))
#-(or allegro clisp clozure cmucl gcl lispworks sbcl scl)
......
......@@ -555,7 +555,7 @@ LAUNCH-PROGRAM returns a PROCESS-INFO object."
;; Use at your own risk.
#-(or allegro clisp clozure ecl)
(nest
#+(or ecl sbcl) (unless (find-symbol* :escape-arguments #+ecl :ext #+sbcl :sb-impl nil))
#+sbcl (unless (find-symbol* :escape-arguments :sb-impl nil))
(parameter-error "~S doesn't support string commands on Windows on this Lisp"
'launch-program command))
;; NB: We add cmd /c here. Behavior without going through cmd is not well specified
......@@ -679,4 +679,3 @@ LAUNCH-PROGRAM returns a PROCESS-INFO object."
;; returns (io err pid) of which we keep io.
(t (prop 'process io-or-pid)))))
process-info)))
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