paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-16 01:00:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: handle an exception thrown by all options parser.

Browse Source 
git-svn-id: trunk@42384 -
This commit is contained in:
juha 2013-08-11 15:40:41 +00:00
parent 960505e772
commit 2a45b388fc
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/compiler.pp
View File

@ -615,7 +615,7 @@ begin
// Option was not found, try separating the parameter.
// ToDo: figure out the length in a more clever way.
if (Length(aOptAndValue) < 3) or (aOptAndValue[1] <> '-') then
raise Exception.Create('Invalid option & value ' + aOptAndValue);
raise Exception.CreateFmt('Invalid option or value "%s".', [aOptAndValue]);
if aOptAndValue[2] in ['e', 'd', 'u', 'I', 'k', 'o'] then
OptLen := 2
else

26
ide/frames/compiler_other_options.pas
View File

@ -116,18 +116,23 @@ procedure TCompilerOtherOptionsFrame.btnAllOptionsClick(Sender: TObject);
var
AllOpts: TfrmAllCompilerOptions;
begin
FOptionsReader.FromCustomOptions(memoCustomOptions.Lines);
AllOpts := TfrmAllCompilerOptions.Create(Nil);
try
AllOpts.OptionsReader:=FOptionsReader;
if AllOpts.ShowModal = mrOK then
begin
// Synchronize with custom options memo
AllOpts.ToCustomOptions(memoCustomOptions.Lines);
memoCustomOptions.Invalidate;
FOptionsReader.FromCustomOptions(memoCustomOptions.Lines);
AllOpts := TfrmAllCompilerOptions.Create(Nil);
try
AllOpts.OptionsReader:=FOptionsReader;
if AllOpts.ShowModal = mrOK then
begin
// Synchronize with custom options memo
AllOpts.ToCustomOptions(memoCustomOptions.Lines);
memoCustomOptions.Invalidate;
end;
finally
AllOpts.Free;
end;
finally
AllOpts.Free;
except
on E: Exception do
ShowMessage('Error parsing custom options: '+E.Message);
end;
end;
@ -613,7 +618,6 @@ begin
CompilerExecutable := EnvironmentOptions.GetParsedCompilerFilename;
if ReadAndParseOptions <> mrOK then
ShowMessage(ErrorMsg);
//FromCustomOptions(FCustomOptions);
except
on E: Exception do
ShowMessage('Error parsing options: '+E.Message);