X-Git-Url: http://git.kpe.io/?p=lml.git;a=blobdiff_plain;f=utils.lisp;h=9c2f9799ec661f199606af985fe5adebaf72715d;hp=ed1f6a2b5799684cf9099378d1730cee1dc328fc;hb=HEAD;hpb=e741d288978f9a65554235ecb3115db8eef60b54

diff --git a/utils.lisp b/utils.lisp
index ed1f6a2..9c2f979 100644
--- a/utils.lisp
+++ b/utils.lisp
@@ -1,9 +1,8 @@
-;;; $Id: utils.lisp,v 1.1 2002/09/30 10:26:43 kevin Exp $
+;;; $Id$
 ;;;;
 ;;;; General purpose utilities
 
-(in-package :lml)
-
+(in-package #:lml)
 
 (defmacro aif (test then &optional else)
   `(let ((it ,test))
@@ -19,47 +18,52 @@
        (string-equal "keyword" (package-name (symbol-package x)))))
 
 (defun list-to-spaced-string (list)
-  (format nil "~{ ~A~}" list))
+  (format nil "~{~A~^ ~}" list))
+
+(defun print-n-chars (char n stream)
+  (declare (fixnum n)
+           (optimize (speed 3) (safety 0) (space 0)))
+  (do ((i 0 (1+ i)))
+      ((= i n) char)
+    (declare (fixnum i))
+    (write-char char stream)))
 
 (defun indent-spaces (n &optional (stream *standard-output*))
   "Indent n*2 spaces to output stream"
-  (let ((fmt (format nil "~~~DT" (+ n n))))
-    (format stream fmt)))
+  (print-n-chars #\space (+ n n) stream))
 
 (defun print-file-contents (file &optional (strm *standard-output*))
   "Opens a reads a file. Returns the contents as a single string"
   (when (probe-file file)
     (with-open-file (in file :direction :input)
-		    (do ((line (read-line in nil 'eof) 
-			       (read-line in nil 'eof)))
-			((eql line 'eof))
-		      (format strm "~A~%" line)))))
+                    (do ((line (read-line in nil 'eof)
+                               (read-line in nil 'eof)))
+                        ((eql line 'eof))
+                      (write-string line strm)
+                      (write-char #\newline strm)))))
 
 (defun date-string (ut)
-  (if (typep ut 'integer)
-      (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" 
-		dow
-		day
-		(1- mon)
-		year
-		hr min sec))))
+  (check-type ut integer)
+  (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"
+            dow day (1- mon) year hr min sec)))
 
 (defun lml-quit (&optional (code 0))
-  "Function to exit the Lisp implementation. Copied from CLOCC's QUIT function."
+  "Function to exit the Lisp implementation."
     #+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 +71,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 "."))
+
 
-