X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/1d1a23e1247d4265590ae3df01b62fb69ba5cfac..94f15c3c3cc7b65dd194b6c10bad3b19a3e31f53:/glib/gutils.lisp diff --git a/glib/gutils.lisp b/glib/gutils.lisp index d38164c..5d6e649 100644 --- a/glib/gutils.lisp +++ b/glib/gutils.lisp @@ -15,7 +15,7 @@ ;; License along with this library; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -;; $Id: gutils.lisp,v 1.2 2000-08-22 23:12:20 espen Exp $ +;; $Id: gutils.lisp,v 1.4 2001-04-29 20:01:54 espen Exp $ (in-package "KERNEL") @@ -83,7 +83,7 @@ (defun make-pointer (address) (defun null-pointer-p (pointer) (zerop (sap-int pointer))) - + (defmacro when-bind ((var expr) &body body) `(let ((,var ,expr)) @@ -105,3 +105,41 @@ (defun assoc-rem (key alist &key (test #'eq)) (defun assoc-delete (key alist &key (test #'eq)) (delete-if #'(lambda (element) (funcall test key (car element))) alist)) + + +(defun funcallable (object) + (if (consp object) + (fdefinition object) + object)) + + +(defun split-string (string delimiter) + (declare (simple-string string) (character delimiter)) + (check-type string string) + (check-type delimiter character) + (let ((pos (position delimiter string))) + (if (not pos) + (list string) + (cons + (subseq string 0 pos) + (split-string (subseq string (1+ pos)) delimiter))))) + +(defun split-string-if (string predicate) + (declare (simple-string string)) + (check-type string string) + (check-type predicate (or symbol function)) + (let ((pos (position-if predicate string :start 1))) + (if (not pos) + (list string) + (cons + (subseq string 0 pos) + (split-string-if (subseq string pos) predicate))))) + +(defun concatenate-strings (strings &optional delimiter) + (if (not (rest strings)) + (first strings) + (concatenate + 'string + (first strings) + (if delimiter (string delimiter) "") + (concatenate-strings (rest strings)))))