X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/a8d0633f93db4ae4bbd6fe96f3bd98b2aae67f2d..573086fb20aa64e6938b4b8f1c44a5b5f64f44f6:/glib/gutils.lisp

diff --git a/glib/gutils.lisp b/glib/gutils.lisp
index e9a67db..33f85b7 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.8 2001-05-29 15:40:38 espen Exp $
 
 
 (in-package "KERNEL")
@@ -30,24 +30,6 @@
 	(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,9 @@
      'string
      (first strings)
      (if delimiter (string delimiter) "")
-     (concatenate-strings (rest strings)))))
+     (concatenate-strings (rest strings) delimiter))))
 
-(defun string-prefix-p (string1 string2)
-  (string= string1 string2 :end2 (length string1)))
+(defun string-prefix-p (prefix string)
+  (and
+   (>= (length string) (length prefix))
+   (string= prefix string :end2 (length prefix))))