X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/285b2df4310a4d4b8ae84a2da1358187983ae5a8..dba0c4467ec6412ea2666a2621ae496cc2ee7552:/glib/gutils.lisp

diff --git a/glib/gutils.lisp b/glib/gutils.lisp
index 22615af..e9a67db 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.3 2000-10-05 17:18:28 espen Exp $
+;; $Id: gutils.lisp,v 1.6 2001-05-11 15:57:13 espen Exp $
 
 
 (in-package "KERNEL")
@@ -30,9 +30,26 @@
 	(values (funcall def (if (consp form) form (list form))) t)
       (values form nil))))
 
+(in-package "PCL")
 
-(in-package "GLIB")
+;;;; 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")
 
 (defun type-expand-to (type form)
   (labels ((expand (form0)
@@ -50,7 +67,7 @@
     `(progn
        (let ((,gc-inhibit lisp::*gc-inhibit*))
 	 (ext:gc-off)
-	 (unwind-protect
+	 	 (unwind-protect
 	     ,@body
 	   (unless ,gc-inhibit
 	     (ext:gc-on)))))))
@@ -83,7 +100,7 @@
   
 (defun null-pointer-p (pointer)
   (zerop (sap-int pointer)))
-
+  
 
 (defmacro when-bind ((var expr) &body body)
   `(let ((,var ,expr))
@@ -112,3 +129,42 @@
       (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)))))
+
+(defun string-prefix-p (string1 string2)
+  (string= string1 string2 :end2 (length string1)))