paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-26 11:43:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Converter: take better care of exceptions during unit conversion.

Browse Source 
git-svn-id: trunk@41487 -
This commit is contained in:
juha 2013-06-02 08:23:59 +00:00
parent 27e955ca5c
commit 4923cf00d8
1 changed files with 16 additions and 9 deletions

25
converter/convertdelphi.pas
View File

@ -1576,13 +1576,20 @@ var
Converter: TDelphiUnit;
begin
Converter:=TDelphiUnit.Create(Self, AUnitInfo.Filename,[]);
Converter.fUnitInfo:=AUnitInfo;
ConvUnits.Add(Converter);
Result:=Converter.CopyAndLoadFile;
if Result<>mrOK then exit;
Result:=Converter.CheckFailed(Result);
if Result<>mrOK then exit;
Result:=Converter.ConvertUnitFile;
try
Converter.fUnitInfo:=AUnitInfo;
ConvUnits.Add(Converter);
Result:=Converter.CopyAndLoadFile;
if Result<>mrOK then exit;
Result:=Converter.CheckFailed(Result);
if Result<>mrOK then exit;
Result:=Converter.ConvertUnitFile;
except
DebugLn(['TConvertDelphiProject.ConvertAllUnits: Exception happened while converting ',
Converter.fLazUnitFilename]);
ConvUnits.Remove(Converter);
raise;
end;
end;
var
@ -1630,8 +1637,8 @@ begin
end;
finally
if Result=mrOk then begin
// Try to convert FormFiles also in case of exception.
// Unit name replacements etc. are implmented there.
// Try to convert form files also in case of an exception.
// Unit name replacements etc. are implemented there.
Result:=ConvertAllFormFiles(ConvUnits);
// Finally save project once more
Result:=LazarusIDE.DoSaveProject([sfQuietUnitCheck]);