paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-18 13:29:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed calling inherited class methods from category methods when using

Browse Source 
the iPhoneOS/Mac OS X 10.6 objc runtime interface (tests/test/tobjc25.pp)

git-svn-id: trunk@14289 -
This commit is contained in:
Jonas Maebe 2009-11-29 21:41:47 +00:00
parent a823e6834d
commit a6716fd2a2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/objcutil.pas
View File

@ -145,8 +145,16 @@ end;
if (oo_is_classhelper in tobjectdef(tclassrefdef(def).pointeddef).objectoptions) then if (oo_is_classhelper in tobjectdef(tclassrefdef(def).pointeddef).objectoptions) then
begin begin
{ in case we are in a category method, we need the metaclass of the { in case we are in a category method, we need the metaclass of the
superclass class extended by this category (= metaclass of superclass of superclass) } superclass class extended by this category (= metaclass of superclass of superclass)
result:=cloadvmtaddrnode.create(ctypenode.create(tobjectdef(tclassrefdef(def).pointeddef).childof.childof)); for the fragile abi, and the metaclass of the superclass for the non-fragile ABI }
{$if defined(onlymacosx10_6) or defined(arm) }
{ NOTE: those send2 methods are only available on Mac OS X 10.6 and later!
(but also on all iPhone SDK revisions we support) }
if (target_info.system in system_objc_nfabi) then
result:=cloadvmtaddrnode.create(ctypenode.create(tobjectdef(tclassrefdef(def).pointeddef).childof))
else
{$endif onlymacosx10_6 or arm}
result:=cloadvmtaddrnode.create(ctypenode.create(tobjectdef(tclassrefdef(def).pointeddef).childof.childof));
result:=objcloadbasefield(result,'ISA'); result:=objcloadbasefield(result,'ISA');
typecheckpass(result); typecheckpass(result);
{ we're done } { we're done }