;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-;; $Id: gtype.lisp,v 1.47 2006/02/26 15:30:01 espen Exp $
+;; $Id: gtype.lisp,v 1.51 2006/04/18 11:42:20 espen Exp $
(in-package "GLIB")
(defbinding type-init () nil)
(type-init)
-(deftype type-number () '(unsigned 32))
+(deftype type-number () 'unsigned-long)
(deftype gtype () 'symbol)
(register-type (car type) (cdr type)))
*registered-types*)
(mapc #'(lambda (type)
+ (apply #'register-new-type type))
+ *registered-static-types*)
+ (mapc #'(lambda (type)
(register-type-alias (car type) (cdr type)))
*registered-type-aliases*))
(unwind-protect
(loop
as symbol = (let ((line (read-line (process-output process) nil)))
- (when line (subseq line 11)))
+ (when line
+ (subseq line (1+ (position #\Space line :from-end t)))))
while symbol
when (and
(> (length symbol) 9)
(defmethod finalize-inheritance ((class ginstance-class))
- (call-next-method)
(let* ((class-name (class-name class))
(super (most-specific-proxy-superclass class))
(gtype (or
(not (eq (class-name super) (supertype type-number))))
(warn "Super class mismatch between CLOS and GObject for ~A"
class-name)))
-
- (update-size class))
+ (update-size class)
+ (call-next-method))
(defmethod shared-initialize ((class ginstance-class) names &rest initargs)
(error "Doing copy-from-alien on a ref. counted class is most certainly an error, but if it really is what you want you should use REFERENCE-FOREIGN on the returned instance instead."))
(define-type-method reader-function ((type ginstance))
- #'(lambda (location &optional (offset 0) weak-p)
- (declare (ignore weak-p))
- (ensure-proxy-instance type (sap-ref-sap location offset))))
+ (let ((class (type-expand type)))
+ #'(lambda (location &optional (offset 0) weak-p)
+ (declare (ignore weak-p))
+ (ensure-proxy-instance class (sap-ref-sap location offset)))))
;;;; Registering fundamental types