From eb9a722a75c7315da50844444717e2dcf6f069e4 Mon Sep 17 00:00:00 2001 From: Matthias Benkard Date: Thu, 4 Dec 2008 21:12:35 +0100 Subject: Automatically register Objective-C classes used as superclasses. darcs-hash:928ea318abd6914917d42d77c8581dd4c3ee67d7 --- Lisp/class-definition.lisp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'Lisp/class-definition.lisp') diff --git a/Lisp/class-definition.lisp b/Lisp/class-definition.lisp index 7410847..1c01a7f 100644 --- a/Lisp/class-definition.lisp +++ b/Lisp/class-definition.lisp @@ -382,12 +382,18 @@ __define-objective-c-method__" direct-slots direct-default-initargs) (let* ((objective-c-superclasses - (remove-if-not #'(lambda (c) (typep c 'objective-c-class)) + (remove-if-not #'(lambda (c) (or (typep c 'objective-c-class) + (eq (symbol-package (class-name c)) + (find-package '#:ns)))) direct-superclasses)) (superclass (case (length objective-c-superclasses) (0 (find-objc-class "NSObject")) - (1 (first objective-c-superclasses)) + (1 (let ((class (first objective-c-superclasses))) + (if (typep class 'forward-referenced-class) + ;; Load the super class definition on demand. + (find-objc-class (symbol->objc-class-name (class-name class))) + class))) (otherwise (error "Tried to derive all of ~S at the same time. ~ (At most one Objective-C class may be derived at once.)" @@ -397,9 +403,7 @@ __define-objective-c-method__" direct-slots)) (new-class-pointer (objcl-create-class (symbol->objc-class-name name) - (find-if #'(lambda (c) - (typep c 'objective-c-class)) - direct-superclasses) + superclass nil (mapcar #'(lambda (x) (getf x :foreign-name -- cgit v1.2.3