paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-12 22:24:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

compiler: forgotten unit in r16660

Browse Source 
git-svn-id: trunk@16661 -
This commit is contained in:
paul 2010-12-30 08:07:05 +00:00
parent 2af416e145
commit b437f85984
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/pexpr.pas
View File

@ -1541,7 +1541,7 @@ implementation
begin begin
p1:=ctypenode.create(hdef); p1:=ctypenode.create(hdef);
{ search also in inherited methods } { search also in inherited methods }
searchsym_in_class(tobjectdef(hdef),current_objectdef,pattern,srsym,srsymtable); searchsym_in_class(tobjectdef(hdef),tobjectdef(current_structdef),pattern,srsym,srsymtable);
if assigned(srsym) then if assigned(srsym) then
check_hints(srsym,srsym.symoptions,srsym.deprecatedmsg); check_hints(srsym,srsym.symoptions,srsym.deprecatedmsg);
consume(_ID); consume(_ID);
@ -2369,12 +2369,12 @@ implementation
assigned(current_structdef) and assigned(current_structdef) and
(current_structdef.typ=objectdef) then (current_structdef.typ=objectdef) then
begin begin
hclassdef:=current_objectdef.childof; hclassdef:=tobjectdef(current_structdef).childof;
{ Objective-C categories *replace* methods in the class { Objective-C categories *replace* methods in the class
they extend, or add methods to it. So calling an they extend, or add methods to it. So calling an
inherited method always calls the method inherited from inherited method always calls the method inherited from
the parent of the extended class } the parent of the extended class }
if is_objccategory(current_objectdef) then if is_objccategory(current_structdef) then
hclassdef:=hclassdef.childof; hclassdef:=hclassdef.childof;
{ if inherited; only then we need the method with { if inherited; only then we need the method with
the same name } the same name }
@ -2393,7 +2393,7 @@ implementation
if (po_msgstr in pd.procoptions) then if (po_msgstr in pd.procoptions) then
searchsym_in_class_by_msgstr(hclassdef,pd.messageinf.str^,srsym,srsymtable) searchsym_in_class_by_msgstr(hclassdef,pd.messageinf.str^,srsym,srsymtable)
else else
searchsym_in_class(hclassdef,current_objectdef,hs,srsym,srsymtable); searchsym_in_class(hclassdef,tobjectdef(current_structdef),hs,srsym,srsymtable);
end end
else else
begin begin
@ -2401,7 +2401,7 @@ implementation
hsorg:=orgpattern; hsorg:=orgpattern;
consume(_ID); consume(_ID);
anon_inherited:=false; anon_inherited:=false;
searchsym_in_class(hclassdef,current_objectdef,hs,srsym,srsymtable); searchsym_in_class(hclassdef,tobjectdef(current_structdef),hs,srsym,srsymtable);
end; end;
if assigned(srsym) then if assigned(srsym) then
begin begin