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

Converter: do dummy string replacement for known problematic syntax when CodeTools raised an exception. Issue #23552

Browse Source 
git-svn-id: trunk@41967 -
This commit is contained in:
juha 2013-07-02 12:57:31 +00:00
parent 09cfe454ce
commit 1cc1c541af
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
converter/convertdelphi.pas
View File

@ -504,6 +504,8 @@ begin
end;
function TDelphiUnit.CopyAndLoadFile: TModalResult;
var
CodeOk, CodeFixed: Boolean;
begin
fOwnerConverter.fSettings.AddLogLine(Format(lisConvDelphiConvertingFile,
[fOrigUnitFilename]));
@ -536,8 +538,25 @@ begin
// Fix include file names.
Result:=FixIncludeFiles;
if Result<>mrOK then exit;
// Create a tool for missing units.
fUsedUnitsTool:=TUsedUnitsTool.Create(fCTLink, fOrigUnitFilename);
CodeFixed:=False;
repeat
CodeOk:=True;
try
// Create a tool for missing units.
fUsedUnitsTool:=TUsedUnitsTool.Create(fCTLink, fOrigUnitFilename);
except
// If CodeTool's BuildTree raised exception, try dummy replacement for
// some known problematic syntax, currently only OleVariant.type.
if CodeFixed then
Raise // There was a second exception -> we are doomed!
else begin
with fPascalBuffer do
Source:=StringReplace(Source,'.type','.&type',[rfReplaceAll]);
CodeOk := False;
CodeFixed := True; // Try replacements only once
end;
end;
until CodeOk;
if fOwnerConverter is TConvertDelphiProjPack then
with TConvertDelphiProjPack(fOwnerConverter) do begin
fUsedUnitsTool.OnCheckPackageDependency:=@CheckPackageDep;