* tprocdef.customprocname: fixed bug introduced in r21069 that was causing result to always contain 'procedure' or 'function' word. These should be included only if pno_proctypeoption flag is given. Resolves #24640.

git-svn-id: trunk@25126 -
This commit is contained in:
sergei 2013-07-17 12:41:55 +00:00
parent 2240c24252
commit 8b1463aedc

View File

@ -4693,12 +4693,14 @@ implementation
potype_destructor:
s:=s+'destructor ';
else
if (pno_proctypeoption in pno) and
assigned(returndef) and
not(is_void(returndef)) then
s:=s+'function '
else
s:=s+'procedure ';
if (pno_proctypeoption in pno) then
begin
if assigned(returndef) and
not(is_void(returndef)) then
s:=s+'function '
else
s:=s+'procedure ';
end;
end;
if (pno_ownername in pno) and
(owner.symtabletype in [recordsymtable,objectsymtable]) then