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

* fixed tbf/tb0063

Browse Source 
git-svn-id: trunk@6271 -
This commit is contained in:
Jonas Maebe 2007-01-30 15:53:52 +00:00
parent 9a75d308a8
commit 0650ebe3f2
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/symtable.pas
View File

@ -1025,10 +1025,6 @@ implementation
if not assigned(defowner) then
internalerror(200602061);
if (m_duplicate_names in current_settings.modeswitches) and
(sym.typ in [paravarsym,localvarsym]) then
exit;
{ check for duplicate field, parameter or local names
also in inherited classes }
if (sym.typ in [fieldvarsym,paravarsym,localvarsym]) and
@ -1048,9 +1044,9 @@ implementation
end
else
begin
result:=inherited checkduplicate(hashedid,sym);
if result then
exit;
if not(m_duplicate_names in current_settings.modeswitches) or
not(sym.typ in [paravarsym,localvarsym]) then
result:=inherited checkduplicate(hashedid,sym);
end;
end;
@ -1156,8 +1152,7 @@ implementation
{ check ObjectSymtable, skip this for funcret sym because
that will always be positive because it has the same name
as the procsym }
if not(m_duplicate_names in current_settings.modeswitches) and
not is_funcret_sym(sym) and
if not is_funcret_sym(sym) and
(defowner.typ=procdef) and
assigned(tprocdef(defowner)._class) and
(tprocdef(defowner).owner.defowner=tprocdef(defowner)._class) then