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

IDE: macro loop detection

Browse Source 
git-svn-id: branches/fixes_1_2@44090 -
This commit is contained in:
mattias 2014-02-16 01:25:58 +00:00
parent 9c94505024
commit 3cc16cc06d
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ide/transfermacros.pp
View File

@ -310,32 +310,32 @@ begin
if SysUtils.CompareText(fBusy[i],MacroName)=0 then begin
inc(InUse);
if InUse>MaxUsePerMacro then begin
// circle detected
Handled:=true;
// cycle detected
MacroStr:='<CYCLE:'+MacroName+'>';
break;
Result:=false;
exit;
end;
end;
end;
end;
if MacroParam<>'' then begin
// substitute param
if fBusy=nil then fBusy:=TStringList.Create;
try
fBusy.Add(MacroName);
if fBusy=nil then fBusy:=TStringList.Create;
try
fBusy.Add(MacroName);
if MacroParam<>'' then begin
// substitute param
if not SubstituteStr(MacroParam,Data,Depth+1) then begin
Result:=false;
exit;
end;
finally
fBusy.Delete(fBusy.Count-1);
end;
end;
// find macro and get value
ExecuteMacro(MacroName,MacroParam,Data,Handled,Abort,Depth+1);
if Abort then begin
Result:=false;
exit;
// find macro and get value
ExecuteMacro(MacroName,MacroParam,Data,Handled,Abort,Depth+1);
if Abort then begin
Result:=false;
exit;
end;
finally
fBusy.Delete(fBusy.Count-1);
end;
MacroStr:=MacroParam;
// mark unhandled macros