paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-02 17:10:34 +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 if not assigned(defowner) then
internalerror(200602061); 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 { check for duplicate field, parameter or local names
also in inherited classes } also in inherited classes }
if (sym.typ in [fieldvarsym,paravarsym,localvarsym]) and if (sym.typ in [fieldvarsym,paravarsym,localvarsym]) and
@ -1048,9 +1044,9 @@ implementation
end end
else else
begin begin
result:=inherited checkduplicate(hashedid,sym); if not(m_duplicate_names in current_settings.modeswitches) or
if result then not(sym.typ in [paravarsym,localvarsym]) then
exit; result:=inherited checkduplicate(hashedid,sym);
end; end;
end; end;
@ -1156,8 +1152,7 @@ implementation
{ check ObjectSymtable, skip this for funcret sym because { check ObjectSymtable, skip this for funcret sym because
that will always be positive because it has the same name that will always be positive because it has the same name
as the procsym } as the procsym }
if not(m_duplicate_names in current_settings.modeswitches) and if not is_funcret_sym(sym) and
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) then