X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=utils.lisp;h=dcd099530255f25c9a00bfa723103499cad1c414;hb=7f3cd207cac41ffb53fa8ca0d4563554e4ef16fa;hp=ed1f6a2b5799684cf9099378d1730cee1dc328fc;hpb=e741d288978f9a65554235ecb3115db8eef60b54;p=lml.git diff --git a/utils.lisp b/utils.lisp index ed1f6a2..dcd0995 100644 --- a/utils.lisp +++ b/utils.lisp @@ -1,4 +1,4 @@ -;;; $Id: utils.lisp,v 1.1 2002/09/30 10:26:43 kevin Exp $ +;;; $Id: utils.lisp,v 1.7 2003/03/12 17:01:48 kevin Exp $ ;;;; ;;;; General purpose utilities @@ -19,7 +19,9 @@ (string-equal "keyword" (package-name (symbol-package x))))) (defun list-to-spaced-string (list) - (format nil "~{ ~A~}" list)) + (if (consp list) + (format nil "~A~{ ~A~}" (first list) (rest list)) + "")) (defun indent-spaces (n &optional (stream *standard-output*)) "Indent n*2 spaces to output stream" @@ -40,9 +42,7 @@ (multiple-value-bind (sec min hr day mon year dow daylight-p zone) (decode-universal-time ut) (declare (ignore daylight-p zone)) - (format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~], ~ -~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~ -~2,'0d:~2,'0d:~2,'0d" + (format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~], ~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~2,'0d:~2,'0d:~2,'0d" dow day (1- mon) @@ -53,13 +53,16 @@ "Function to exit the Lisp implementation. Copied from CLOCC's QUIT function." #+allegro (excl:exit code) #+clisp (#+lisp=cl ext:quit #-lisp=cl lisp:quit code) - #+cmu (ext:quit code) + #+(or cmu scl) (ext:quit code) #+cormanlisp (win32:exitprocess code) #+gcl (lisp:bye code) #+lispworks (lw:quit :status code) #+lucid (lcl:quit code) #+sbcl (sb-ext:quit :unix-status (typecase code (number code) (null 0) (t 1))) - #-(or allegro clisp cmu cormanlisp gcl lispworks lucid sbcl) + #+openmcl (ccl:quit code) + #+(and mcl (not openmcl)) (declare (ignore code)) + #+(and mcl (not openmcl)) (ccl:quit) + #-(or allegro clisp cmu scl cormanlisp gcl lispworks lucid sbcl mcl) (error 'not-implemented :proc (list 'quit code))) @@ -67,10 +70,12 @@ "Returns the current working directory. Based on CLOCC's DEFAULT-DIRECTORY function." #+allegro (excl:current-directory) #+clisp (#+lisp=cl ext:default-directory #-lisp=cl lisp:default-directory) - #+cmu (ext:default-directory) + #+(or cmu scl) (ext:default-directory) #+cormanlisp (ccl:get-current-directory) #+lispworks (hcl:get-working-directory) #+lucid (lcl:working-directory) - #-(or allegro clisp cmu cormanlisp lispworks lucid) (truename ".")) + #+sbcl (sb-unix:posix-getcwd/) + #+mcl (ccl:mac-default-directory) + #-(or allegro clisp cmu scl sbcl cormanlisp lispworks lucid mcl) (truename "."))