paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-03 03:00:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Converter: Fix function call replacement when a parameter has typecast or is another func call.

Browse Source 
git-svn-id: trunk@28872 -
This commit is contained in:
juha 2011-01-06 11:53:42 +00:00
parent 000f6941b0
commit da3a1c47cd
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
converter/convcodetool.pas
View File

@ -553,7 +553,7 @@ var
procedure ReadParams(FuncInfo: TFuncReplacement);
var
ExprStartPos, ExprEndPos: integer;
ExprStartPos, ExprEndPos, BracketCount: integer;
begin
FuncInfo.InclSemiColon:='';
FuncInfo.StartPos:=xStart;
@ -566,14 +566,21 @@ var
ReadNextAtom;
if not AtomIsChar(')') then begin
// read all expressions
BracketCount:=0;
while true do begin
ExprStartPos:=CurPos.StartPos;
// read til comma or bracket close
repeat
ReadNextAtom;
if (CurPos.StartPos>SrcLen)
or (CurPos.Flag in [cafRoundBracketClose, cafComma]) then
if (CurPos.StartPos>SrcLen) or (CurPos.Flag=cafComma) then
break;
if (CurPos.Flag=cafRoundBracketOpen) then
Inc(BracketCount)
else if (CurPos.Flag=cafRoundBracketClose) then begin
if BracketCount=0 then
break;
Dec(BracketCount);
end;
until false;
ExprEndPos:=CurPos.StartPos;
// Add parameter to list