paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-11 23:06:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

* change the realname of procsyms belonging to overriding methods to

Browse Source 
that of the overridden method for Java classes, since the realname
    is used as method identifier (and overriding is name-based and
    case-sensitive in Java)

git-svn-id: branches/jvmbackend@18464 -
This commit is contained in:
Jonas Maebe 2011-08-20 08:02:02 +00:00
parent 7310bbbaf6
commit d6a56cfda6
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/nobj.pas
View File

@ -329,6 +329,12 @@ implementation
{ no new entry, but copy the message name if any from { no new entry, but copy the message name if any from
the procdef in the parent class } the procdef in the parent class }
check_msg_str(vmtpd,pd); check_msg_str(vmtpd,pd);
{ in case of Java, copy the real name from the parent,
since overriding "Destroy" with "destroy" is not
going to work very well }
if is_java_class_or_interface(_class) and
(pd.procsym.realname<>vmtpd.procsym.realname) then
pd.procsym.realname:=vmtpd.procsym.realname;
result:=true; result:=true;
exit; exit;
end; end;
@ -384,6 +390,12 @@ implementation
if (vmtpd.extnumber<>i) then if (vmtpd.extnumber<>i) then
internalerror(200611084); internalerror(200611084);
pd.extnumber:=vmtpd.extnumber; pd.extnumber:=vmtpd.extnumber;
{ in case of Java, copy the real name from the parent,
since overriding "Destroy" with "destroy" is not
going to work very well }
if is_java_class_or_interface(_class) and
(pd.procsym.realname<>vmtpd.procsym.realname) then
pd.procsym.realname:=vmtpd.procsym.realname;
vmtpd:=pd; vmtpd:=pd;
end; end;
result:=true; result:=true;