paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-07 21:10:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

PoChecker: TPoFamily.CheckDuplicateOriginals rewritten in order not to use TPOFile.OriginalList

Browse Source 
git-svn-id: trunk@57345 -
This commit is contained in:
maxim 2018-02-21 22:56:28 +00:00
parent b37b2476b5
commit d67b1cba36
1 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
components/pochecker/pofamilies.pp
View File

@ -11,7 +11,7 @@ uses
// LCL // LCL
LCLProc, Masks, LCLProc, Masks,
// LazUtils // LazUtils
FileUtil, LazFileUtils, Translations, FileUtil, LazFileUtils, Translations, StringHashList,
// PoChecker // PoChecker
PoCheckerConsts; PoCheckerConsts;
@ -721,42 +721,47 @@ procedure TPoFamily.CheckDuplicateOriginals(out WarningCount: Integer;
var var
i: Integer; i: Integer;
PoItem: TPOFileItem; PoItem: TPOFileItem;
DupItemsList: TStringHashList;
LastHash, CurHash: Cardinal; LastHash, CurHash: Cardinal;
begin begin
//debugln('TPoFamily.CheckMismatchedOriginals'); //debugln('TPoFamily.CheckMismatchedOriginals');
DoTestStart(PoTestTypeNames[pttCheckDuplicateOriginals], ShortMasterName); DoTestStart(PoTestTypeNames[pttCheckDuplicateOriginals], ShortMasterName);
WarningCount := 0; WarningCount := 0;
DupItemsList := TStringHashList.Create(true);
for i := 0 to FMaster.Items.Count - 1 do begin
PoItem := TPOFileItem(FMaster.Items[i]);
if PoItem.Duplicate = true then
DupItemsList.Add(PoItem.Original, PoItem);
end;
//debugln('TPoFamily.CehckDuplicateOriginals'); //debugln('TPoFamily.CehckDuplicateOriginals');
//debugln('FMaster.OriginalList.Count = ',DbgS(FMaster.OriginalList.Count)); //debugln('DupItemsList.Count = ',DbgS(DupItemsList.Count));
LastHash := 0; LastHash := 0;
for i := 0 to FMaster.OriginalList.Count - 1 do for i := 0 to DupItemsList.Count - 1 do
begin begin
PoItem := TPoFileItem(FMaster.OriginalList.List[i]^.Data); PoItem := TPoFileItem(DupItemsList.List[i]^.Data);
if Assigned(PoItem) then if Assigned(PoItem) then
begin begin
CurHash := FMaster.OriginalList.List[i]^.HashValue ; CurHash := DupItemsList.List[i]^.HashValue;
if PoItem.Duplicate = true then if (WarningCount = 0) then
begin begin
if (WarningCount = 0) then ErrorLog.Add(Divider);
begin ErrorLog.Add(Format(sErrorsByTest,[sShortCheckDuplicateOriginals]));
ErrorLog.Add(Divider); ErrorLog.Add(ShortMasterName);
ErrorLog.Add(Format(sErrorsByTest,[sShortCheckDuplicateOriginals])); ErrorLog.Add(Divider);
ErrorLog.Add(ShortMasterName); ErrorLog.Add('');
ErrorLog.Add(Divider);
ErrorLog.Add('');
end;
if (CurHash <> LastHash) then
begin//new value for PoItem.Original
LastHash := CurHash;
Inc(WarningCount);
if (WarningCount > 1) then ErrorLog.Add('');
ErrorLog.Add(Format(sDuplicateOriginals,[PoItem.Original]));
//debugln(format('The (untranslated) value "%s" is used for more than 1 entry:',[PoItem.Original]));
end;
ErrorLog.Add(format(sDuplicateLineNrWithValue,[PoItem.LineNr,PoItem.IdentifierLow]));
//debugln(format(sDuplicateLineNrWithValue,[PoItem.LineNr,PoItem.IdentifierLow]));
end; end;
if (CurHash <> LastHash) then
begin//new value for PoItem.Original
LastHash := CurHash;
Inc(WarningCount);
if (WarningCount > 1) then ErrorLog.Add('');
ErrorLog.Add(Format(sDuplicateOriginals,[PoItem.Original]));
//debugln(format('The (untranslated) value "%s" is used for more than 1 entry:',[PoItem.Original]));
end;
ErrorLog.Add(format(sDuplicateLineNrWithValue,[PoItem.LineNr,PoItem.IdentifierLow]));
//debugln(format(sDuplicateLineNrWithValue,[PoItem.LineNr,PoItem.IdentifierLow]));
end; end;
end; end;
@ -769,6 +774,8 @@ begin
ErrorLog.Add(''); ErrorLog.Add('');
end; end;
DupItemsList.Free;
DoTestEnd(PoTestTypeNames[pttCheckDuplicateOriginals], WarningCount); DoTestEnd(PoTestTypeNames[pttCheckDuplicateOriginals], WarningCount);
//debugln('TPoFamily.CheckDuplicateOriginals: ',Dbgs(WarningCount),' Errors'); //debugln('TPoFamily.CheckDuplicateOriginals: ',Dbgs(WarningCount),' Errors');
end; end;