diff options
| author | Matthias Benkard <code@mail.matthias.benkard.de> | 2008-02-02 23:26:55 +0100 |
|---|---|---|
| committer | Matthias Benkard <code@mail.matthias.benkard.de> | 2008-02-02 23:26:55 +0100 |
| commit | 3d0e2eda9285b91a998b86cb72c806c2aa5d789e (patch) | |
| tree | 05faddca66b1b032d9f2f6464c984a5e0bd68f6e /Lisp/class-definition.lisp | |
| parent | 4157d85957b1b89fabf1a55f2896ec58ee6d99d6 (diff) | |
Replace all occurrences of OBJC-CLASS with OBJECTIVE-C-CLASS.
darcs-hash:1ba389d5a50343a134892bde78ba62e21842f684
Diffstat (limited to 'Lisp/class-definition.lisp')
| -rw-r--r-- | Lisp/class-definition.lisp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Lisp/class-definition.lisp b/Lisp/class-definition.lisp index 3da1ec2..ea77362 100644 --- a/Lisp/class-definition.lisp +++ b/Lisp/class-definition.lisp @@ -39,11 +39,6 @@ (foreign-slot-definition-mixin c2mop:standard-effective-slot-definition) ()) -(defclass objective-c-class (standard-class) - ((class-ptr :initarg :class-ptr - :type c-pointer - :accessor pointer-to))) - (defmethod c2mop:direct-slot-definition-class ((class objective-c-class) &rest initargs) @@ -82,6 +77,15 @@ (cerror "FIXME" '())))) +(defmethod c2mop:slot-boundp-using-class ((class objective-c-class) + instance + effective-slot-definition) + (declare (ignore instance)) + (etypecase effective-slot-definition + (standard-effective-slot-definition (call-next-method)) + (foreign-effective-slot-definition t))) + + (defmethod c2mop:compute-slots ((class objective-c-class)) ;; FIXME: Maybe add lots of foreign slots here whose presence the ;; Objective-C runtime tells us. @@ -93,7 +97,6 @@ (let ((class (call-next-method))) class)) -#+(or) (defmethod initialize-instance ((class objective-c-class) &key documentation name @@ -101,11 +104,10 @@ direct-superclasses direct-slots direct-default-initargs - class-ptr + pointer wrapped-foreign-class) (call-next-method)) -#+(or) (defmethod reinitialize-instance ((class objective-c-class) &key documentation name @@ -113,7 +115,7 @@ direct-superclasses direct-slots direct-default-initargs - class-ptr + pointer wrapped-foreign-class) (call-next-method)) |