GitHub-Mirror/x2utils
1
0
Fork 0
mirror of synced 2024-11-09 21:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Fixed: conversion errors now report the named specifier causing the error

Browse Source
This commit is contained in:
Mark van Renswoude 2008-03-21 15:07:40 +00:00
parent 4cab1f15b4
commit 8c2549eda0
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
X2UtNamedFormat.pas
View File

@ -106,6 +106,7 @@ var
paramNames: TStringList; paramNames: TStringList;
paramValues: array of TVarRec; paramValues: array of TVarRec;
specifierIndex: Integer; specifierIndex: Integer;
errorMsg: String;
begin begin
if Length(AParams) mod 2 = 1 then if Length(AParams) mod 2 = 1 then
@ -192,11 +193,27 @@ begin
Inc(paramIndex); Inc(paramIndex);
end; end;
try
Result := Format(formatString, paramValues);
except
on E:EConvertError do
begin
errorMsg := E.Message;
{ Translate specifiers in error messages back to names }
for paramIndex := 0 to Pred(paramNames.Count) do
errorMsg := StringReplace(errorMsg, SpecifierChar + IntToStr(paramIndex) + ':',
SpecifierChar + SpecifierNameStart +
paramNames[paramIndex] + SpecifierNameEnd + ':',
[rfReplaceAll]);
raise EConvertError.Create(errorMsg);
end;
end;
finally finally
FreeAndNil(paramNames); FreeAndNil(paramNames);
end; end;
Result := Format(formatString, paramValues);
end; end;