X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/a8d0633f93db4ae4bbd6fe96f3bd98b2aae67f2d..0c0db5e2b38bf90a44b4cfb4646102470093fed1:/glib/gutils.lisp diff --git a/glib/gutils.lisp b/glib/gutils.lisp index e9a67db..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.6 2001-05-11 15:57:13 espen Exp $ +;; $Id: gutils.lisp,v 1.9 2001-10-21 16:53:13 espen Exp $ (in-package "KERNEL") @@ -30,24 +30,6 @@ (defun type-expand-1 (form) (values (funcall def (if (consp form) form (list form))) t) (values form nil)))) -(in-package "PCL") - -;;;; Make PCL's class finalization protocol behave as specified in AMOP - -(defmethod finalize-inheritance ((class std-class)) - (update-cpl class (compute-class-precedence-list class)) - (update-slots class (compute-slots class)) - (update-gfs-of-class class) - (update-inits class (compute-default-initargs class)) - (update-make-instance-function-table class)) - -(defun update-class (class &optional finalizep) - (declare (ignore finalizep)) - (unless (class-has-a-forward-referenced-superclass-p class) - (finalize-inheritance class) - (dolist (sub (class-direct-subclasses class)) - (update-class sub)))) - (in-package "GLIB") @@ -164,7 +146,22 @@ (defun concatenate-strings (strings &optional delimiter) 'string (first strings) (if delimiter (string delimiter) "") - (concatenate-strings (rest strings))))) - -(defun string-prefix-p (string1 string2) - (string= string1 string2 :end2 (length string1))) + (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)))))