X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/e77e7713f290f841c01e99650d30cb56c7921ff9..80a09c29e3e604a25dd0a32282bc6b2c73fbaa4d:/glib/gtype.lisp

diff --git a/glib/gtype.lisp b/glib/gtype.lisp
index 478cab6..2b4a2d0 100644
--- a/glib/gtype.lisp
+++ b/glib/gtype.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: gtype.lisp,v 1.12 2001-10-21 21:50:18 espen Exp $
+;; $Id: gtype.lisp,v 1.16 2002-03-24 12:56:03 espen Exp $
 
 (in-package "GLIB")
 
@@ -121,7 +121,7 @@
 
 (defun %init-types-in-library (pathname ignore)
   (let ((process (ext:run-program
-		  "nm" (list (namestring (truename pathname)))
+		  "nm" (list "-D" (namestring (truename pathname)))
 		  :output :stream :wait nil))
 	(fnames ()))
     (labels ((read-symbols ()
@@ -137,8 +137,9 @@
       (ext:process-close process)
       `(init-type ',fnames))))
 
-(defmacro init-types-in-library (pathname &key ignore)
-  (%init-types-in-library pathname ignore))
+(defmacro init-types-in-library (filename &key ignore)
+  (%init-types-in-library
+   (format nil "~A/~A" *gtk-library-path* filename) ignore))
 
 
 
@@ -243,6 +244,19 @@
 (defun supertype (type)
   (type-from-number (type-parent type)))
 
+(defbinding %type-interfaces (type) pointer
+  ((find-type-number type t) type-number)
+  (n-interfaces unsigned-int :out))
+
+(defun type-interfaces (type)
+  (multiple-value-bind (array length) (%type-interfaces type)
+    (unwind-protect
+	(map-c-array 'list #'identity array 'type-number length)
+      (deallocate-memory array))))
+
+(defun implements (type)
+  (mapcar #'type-from-number (type-interfaces type)))
+
 (defun type-hierarchy (type)
   (let ((type-number (find-type-number type t)))
     (unless (= type-number 0)
@@ -287,7 +301,8 @@
   (let ((sorted ()))
     (loop while unsorted do
       (dolist (type unsorted)
-	(let ((dependencies (rest (type-hierarchy type))))
+	(let ((dependencies
+	       (append (rest (type-hierarchy type)) (type-interfaces type))))
 	  (cond
 	   ((null dependencies)
 	    (push type sorted)
@@ -317,7 +332,11 @@
 		   #'(lambda (options)
 		       (and
 			(string-prefix-p (first options) name)
-			(getf (cdr options) :ignore-prefix)))
+			(getf (cdr options) :ignore-prefix)
+			(not (some
+			      #'(lambda (exception)
+				  (string= name exception))
+			      (getf (cdr options) :except)))))
 		   args))))
 	   (find-types prefix))))