X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/1d1a23e1247d4265590ae3df01b62fb69ba5cfac..ac60c4d4c929172db12c2aa41b0c4b530639208f:/glib/gutils.lisp diff --git a/glib/gutils.lisp b/glib/gutils.lisp index d38164c..2558973 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.9 2001-10-21 16:53:13 espen Exp $ (in-package "KERNEL") @@ -33,7 +33,6 @@ (defun type-expand-1 (form) (in-package "GLIB") - (defun type-expand-to (type form) (labels ((expand (form0) (if (eq (first (mklist form0)) type) @@ -50,7 +49,7 @@ (defmacro with-gc-disabled (&body body) `(progn (let ((,gc-inhibit lisp::*gc-inhibit*)) (ext:gc-off) - (unwind-protect + (unwind-protect ,@body (unless ,gc-inhibit (ext:gc-on))))))) @@ -83,7 +82,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 +104,64 @@ (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 intersection-p (list1 list2 &key (test #'eq)) + (dolist (obj list1 nil) + (when (member obj list2 :test test) + (return-from intersection-p t)))) + + +(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) delimiter)))) + +(defun string-prefix-p (prefix string) + (and + (>= (length string) (length prefix)) + (string= prefix string :end2 (length prefix)))) + +(defun get-all (plist property) + (multiple-value-bind (property value tail) + (get-properties plist (list property)) + (when tail + (cons value (get-all (cddr tail) property))))) + +(defun plist-remove (plist property) + (when plist + (if (eq (first plist) property) + (plist-remove (cddr plist) property) + (list* + (first plist) (second plist) (plist-remove (cddr plist) property)))))