X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=genutils.lisp;h=55751ff84fb41faf7ed51fc9cb23b76eb360ae11;hb=d691dfbbed177726ba5a5313e23568c21e045359;hp=09b14fa1be3382289f1ce0b1c88573794dfa879f;hpb=8646b9afb9979064c3b0b79990c064dce7cb12b7;p=kmrcl.git diff --git a/genutils.lisp b/genutils.lisp index 09b14fa..55751ff 100644 --- a/genutils.lisp +++ b/genutils.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Apr 2000 ;;;; -;;;; $Id: genutils.lisp,v 1.5 2002/10/12 06:10:17 kevin Exp $ +;;;; $Id: genutils.lisp,v 1.7 2002/11/04 19:19:04 kevin Exp $ ;;;; ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -252,7 +252,7 @@ (defun mapcar-append-string-nontailrec (func v) -"Concatenate results of mapcar lambda calls" + "Concatenate results of mapcar lambda calls" (aif (car v) (concatenate 'string (funcall func it) (mapcar-append-string-nontailrec func (cdr v))) @@ -260,7 +260,7 @@ (defun mapcar-append-string (func v &optional (accum "")) -"Concatenate results of mapcar lambda calls" + "Concatenate results of mapcar lambda calls" (aif (car v) (mapcar-append-string func @@ -268,9 +268,8 @@ (concatenate 'string accum (funcall func it))) accum)) - (defun mapcar2-append-string-nontailrec (func la lb) -"Concatenate results of mapcar lambda call's over two lists" + "Concatenate results of mapcar lambda call's over two lists" (let ((a (car la)) (b (car lb))) (if (and a b) @@ -279,7 +278,7 @@ ""))) (defun mapcar2-append-string (func la lb &optional (accum "")) -"Concatenate results of mapcar lambda call's over two lists" + "Concatenate results of mapcar lambda call's over two lists" (let ((a (car la)) (b (car lb))) (if (and a b) @@ -295,11 +294,12 @@ (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))) + (when (numberp n) + (let ((fmt (format nil "~~~DT" (+ n n)))) + (format stream fmt)))) (defun print-list (l &optional (output *standard-output*)) -"Print a list to a stream" + "Print a list to a stream" (if (consp l) (progn (mapcar (lambda (x) (princ x output) (princ #\newline output)) l) @@ -307,7 +307,7 @@ nil)) (defun print-rows (rows &optional (ostrm *standard-output*)) -"Print a list of list rows to a stream" + "Print a list of list rows to a stream" (dolist (r rows) (mapcar (lambda (a) (princ a ostrm) (princ #\space ostrm)) r) (terpri ostrm)))