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

* catch duplicate field declarations in a single class in Delphi mode

Browse Source 
(mantis #10457)

git-svn-id: trunk@9534 -
This commit is contained in:
Jonas Maebe 2007-12-26 15:21:18 +00:00
parent 71999fab94
commit c05f18a1b0
3 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -7473,6 +7473,7 @@ tests/webtbf/tw0893.pp svneol=native#text/plain
tests/webtbf/tw0896.pp svneol=native#text/plain tests/webtbf/tw0896.pp svneol=native#text/plain
tests/webtbf/tw0896a.pp svneol=native#text/plain tests/webtbf/tw0896a.pp svneol=native#text/plain
tests/webtbf/tw10425a.pp svneol=native#text/plain tests/webtbf/tw10425a.pp svneol=native#text/plain
tests/webtbf/tw10457.pp svneol=native#text/plain
tests/webtbf/tw1157a.pp svneol=native#text/plain tests/webtbf/tw1157a.pp svneol=native#text/plain
tests/webtbf/tw1238.pp svneol=native#text/plain tests/webtbf/tw1238.pp svneol=native#text/plain
tests/webtbf/tw1251a.pp svneol=native#text/plain tests/webtbf/tw1251a.pp svneol=native#text/plain

34
compiler/symtable.pas
View File

@ -1080,16 +1080,26 @@ implementation
{ procsym and propertysym have special code { procsym and propertysym have special code
to override values in inherited classes. For other to override values in inherited classes. For other
symbols check for duplicates } symbols check for duplicates }
if not(sym.typ in [procsym,propertysym]) and if not(sym.typ in [procsym,propertysym]) then
(
not(m_delphi in current_settings.modeswitches) or
is_object(tdef(defowner))
) then
begin begin
{ but private ids can be reused } { but private ids can be reused }
hsym:=search_class_member(tobjectdef(defowner),hashedid.id); hsym:=search_class_member(tobjectdef(defowner),hashedid.id);
if assigned(hsym) and if assigned(hsym) and
tsym(hsym).is_visible_for_object(tobjectdef(defowner),tobjectdef(defowner)) then (
(not(m_delphi in current_settings.modeswitches) and
tsym(hsym).is_visible_for_object(tobjectdef(defowner),tobjectdef(defowner))
) or
(
{ In Delphi, you can repeat members of a parent class. You can't }
{ do this for objects however, and you (obviouly) can't }
{ declare two fields with the same name in a single class }
(m_delphi in current_settings.modeswitches) and
(
is_object(tdef(defowner)) or
(hsym.owner = self)
)
)
) then
begin begin
DuplicateSym(hashedid,sym,hsym); DuplicateSym(hashedid,sym,hsym);
result:=true; result:=true;
@ -1207,7 +1217,11 @@ implementation
if not is_funcret_sym(sym) and if not is_funcret_sym(sym) and
(defowner.typ=procdef) and (defowner.typ=procdef) and
assigned(tprocdef(defowner)._class) and assigned(tprocdef(defowner)._class) and
(tprocdef(defowner).owner.defowner=tprocdef(defowner)._class) then (tprocdef(defowner).owner.defowner=tprocdef(defowner)._class) and
(
not(m_delphi in current_settings.modeswitches) or
is_object(tprocdef(defowner)._class)
) then
result:=tprocdef(defowner)._class.symtable.checkduplicate(hashedid,sym); result:=tprocdef(defowner)._class.symtable.checkduplicate(hashedid,sym);
end; end;
@ -1233,7 +1247,11 @@ implementation
if not(m_duplicate_names in current_settings.modeswitches) and if not(m_duplicate_names in current_settings.modeswitches) and
(defowner.typ=procdef) and (defowner.typ=procdef) and
assigned(tprocdef(defowner)._class) and assigned(tprocdef(defowner)._class) and
(tprocdef(defowner).owner.defowner=tprocdef(defowner)._class) then (tprocdef(defowner).owner.defowner=tprocdef(defowner)._class) and
(
not(m_delphi in current_settings.modeswitches) or
is_object(tprocdef(defowner)._class)
) then
result:=tprocdef(defowner)._class.symtable.checkduplicate(hashedid,sym); result:=tprocdef(defowner)._class.symtable.checkduplicate(hashedid,sym);
end; end;

17
tests/webtbf/tw10457.pp Normal file
View File

@ -0,0 +1,17 @@
{ %fail }
{$ifdef fpc}
{$mode delphi}
{$endif}
uses SysUtils, Classes;
Type
Tdatamodule1 = class(Tobject)
rrr: Tobject;
rrr: Tobject;
end;
begin
end.