X-Git-Url: http://git.kpe.io/?p=lml2.git;a=blobdiff_plain;f=utils.lisp;h=16f3e26aeda99dc0bab168d817fe5713f60666f8;hp=a275a3e95eac802a7b0b8ebbff5c2e9504865e8e;hb=733ea685ca7cdeeefbd5494954b308b9dbe51846;hpb=2073dd5bd54fc1bb53e994edcc77b397849d51c4

diff --git a/utils.lisp b/utils.lisp
index a275a3e..16f3e26 100644
--- a/utils.lisp
+++ b/utils.lisp
@@ -1,83 +1,32 @@
-;;; $Id: utils.lisp,v 1.2 2003/06/28 08:18:21 kevin Exp $
-;;;;
-;;;; General purpose utilities
-
-(in-package #:lml2)
-
-(defmacro aif (test then &optional else)
-  `(let ((it ,test))
-     (if it ,then ,else)))
-
-(defmacro awhen (test-form &body body)
-  `(aif ,test-form
-        (progn ,@body)))
-
-(defun keyword-symbol? (x)
-  "Returns T if object is a symbol in the keyword package"
-  (and (symbolp x)
-       (string-equal "keyword" (package-name (symbol-package x)))))
-
-(defun list-to-spaced-string (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"
-  (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)
-    (let ((eof (cons 'eof nil)))
-      (with-open-file (in file :direction :input)
-        (do ((line (read-line in nil eof) 
-                   (read-line in nil eof)))
-            ((eq line eof))
-          (write-string line strm)
-          (write-char #\newline strm))))))
-
-(defun date-string (ut)
-  (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."
-    #+allegro (excl:exit code)
-    #+clisp (#+lisp=cl ext:quit #-lisp=cl lisp: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)))
-    #+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)))
-
-
-(defun lml-cwd ()
-  "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)
-  #+(or cmu scl) (ext:default-directory)
-  #+cormanlisp (ccl:get-current-directory)
-  #+lispworks (hcl:get-working-directory)
-  #+lucid (lcl:working-directory)
-  #+sbcl (sb-unix:posix-getcwd/)
-  #+mcl (ccl:mac-default-directory)
-  #-(or allegro clisp cmu scl sbcl cormanlisp lispworks lucid mcl) (truename "."))
-
-
+;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; *************************************************************************
+;;;; FILE IDENTIFICATION
+;;;;
+;;;; Name:          utils.lisp
+;;;; Purpose:       General purpose utilities
+;;;; Author:        Kevin M. Rosenberg
+;;;; Date Started:  June 2002
+;;;;
+;;;; $Id$
+;;;;
+;;;; This file, part of LML2, is copyrighted and open-source software.
+;;;; Rights of modification and redistribution are in the LICENSE file.
+;;;;
+;;;; *************************************************************************
+
+(in-package #:lml2)
+
+
+(defun lml-quit (&optional (code 0))
+  "Function to exit the Lisp implementation."
+  (kmrcl:quit code))
+
+(defun lml-cwd ()
+  "Returns the current working directory."
+  (kmrcl:cwd))
+
+(defmacro fformat (stream control-string &rest args)
+  (if stream
+      `(funcall (formatter ,control-string) ,stream ,@args)
+      `(format nil ,control-string ,@args)))
+