Changed in-package to use-package

[clg] / glib / gutils.lisp

diff --git a/glib/gutils.lisp b/glib/gutils.lisp
index 15a43d345a491d1af3f0d1d53140fe4eff307847..a78bc2f4b7f7f06407f655fdb9714337b8715fe5 100644 (file)
--- 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.7 2001/05/20 23:10:36 espen Exp $
+;; $Id: gutils.lisp,v 1.10 2001/11/12 22:26:56 espen Exp $
 
 
 (in-package "KERNEL")
@@ -30,41 +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))
-  (dolist (super (class-direct-superclasses class))
-    (unless (class-finalized-p super) (finalize-inheritance super)))
-  (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))
-
-(defmethod finalize-inheritance ((class forward-referenced-class))
-  (error "~A can't be finalized" class))
-
-(defun update-class (class &optional finalizep)  
-  (declare (ignore finalizep))
-  (when (and
-        (class-finalized-p class)
-        (not (class-has-a-forward-referenced-superclass-p class)))
-    (finalize-inheritance class)
-    (dolist (sub (class-direct-subclasses class))
-      (update-class sub))))
-
-(defmethod add-method :before ((gf standard-generic-function)
-                              (method standard-method))
-  (declare (ignore gf))
-  (dolist (specializer (method-specializers method))
-    (when (and
-          (typep specializer 'standard-class)
-          (not (class-finalized-p specializer))
-          (not (class-has-a-forward-referenced-superclass-p specializer)))
-      (finalize-inheritance specializer))))
-
 
 (in-package "GLIB")
 
@@ -187,3 +152,50 @@ (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)))