X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/e04b3c2a824de81a05a750f3f8b5baa2fcc02173..647627c10f8de330297b804991b4c9ca3af0a1fc:/glib/gutils.lisp

diff --git a/glib/gutils.lisp b/glib/gutils.lisp
index 86deed5..a78bc2f 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.5 2001/05/04 16:54:35 espen Exp $
+;; $Id: gutils.lisp,v 1.10 2001/11/12 22:26:56 espen Exp $
 
 
 (in-package "KERNEL")
@@ -30,25 +30,9 @@
 	(values (funcall def (if (consp form) form (list form))) t)
       (values form nil))))
 
-(in-package "PCL")
-
-(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)
-  (dolist (sub (class-direct-subclasses class))
-    (update-class sub)))
-
-(defun update-class (class &optional finalizep)  
-    (declare (ignore finalizep))
-    (unless (class-has-a-forward-referenced-superclass-p class)
-      (finalize-inheritance class)))
 
 (in-package "GLIB")
 
-
 (defun type-expand-to (type form)
   (labels ((expand (form0)
              (if (eq (first (mklist form0)) type)
@@ -127,6 +111,11 @@
       (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))
@@ -157,4 +146,56 @@
      'string
      (first strings)
      (if delimiter (string delimiter) "")
-     (concatenate-strings (rest strings)))))
+     (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)))))
+
+
+;;;
+
+(defun utf-8-encode (code)
+  (labels ((encode-bytes (bit)
+             (unless (zerop bit)
+	       (cons
+		(deposit-field 
+                 #x80 (byte 7 6) (ldb (byte bit (- bit 6)) code))
+		(encode-bytes (- bit 6)))))
+           (encode-string (length)
+             (map 'string #'code-char
+              (cons
+               (deposit-field
+	        (mask-field (byte 7 (- 7 length)) #xFF)
+		(byte 7 (- 6 length))
+		(ldb (byte (+ (* length 6) 6) (* length 6)) code))
+	       (encode-bytes (* length 6))))))
+    (cond
+     ((< code #x80) (string (code-char code)))
+     ((< code #x800) (encode-string 1))
+     ((< code #x10000) (encode-string 2))
+     ((< code #x200000) (encode-string 3)) 
+     ((< code #x4000000) (encode-string 4))
+     ((< code #x80000000) (encode-string 5))
+     (t (error "Invalid char code ~A" code)))))
+
+
+(defun latin1-to-unicode (string)
+  (reduce
+   #'(lambda (str1 str2)
+       (concatenate 'string str1 str2))
+   (map 'list #'(lambda (char) (utf-8-encode (char-code char))) string)))