Skip to content

some code cleanup #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xor-el merged 8 commits into from
Dec 21, 2025
Merged

some code cleanup #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac23cb3
remove unneeded defines
Xor-el Dec 21, 2025
ba4f1a7
remover some more unneeded compiler special casing
Xor-el Dec 21, 2025
b23da6e
refactor away from HlpNullable
Xor-el Dec 21, 2025
52ab35f
merge dunit & test insight test projects as one
Xor-el Dec 21, 2025
9a03a54
add missing changes
Xor-el Dec 21, 2025
bd064fa
remove unneeded GetHashCode in THashResult
Xor-el Dec 21, 2025
b708ecd
disable compilation on fpc big endian
Xor-el Dec 21, 2025
1d07a59
clean up unused define
Xor-el Dec 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion HashLib.Benchmark/Delphi/PerformanceBenchmarkConsole.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ uses
HlpMurmurHash3_x86_32 in '..\..\HashLib\src\Hash32\HlpMurmurHash3_x86_32.pas',
HlpMurmurHash3_x86_128 in '..\..\HashLib\src\Hash128\HlpMurmurHash3_x86_128.pas',
HlpSipHash128 in '..\..\HashLib\src\Hash128\HlpSipHash128.pas',
HlpNullable in '..\..\HashLib\src\Nullable\HlpNullable.pas',
HlpNullDigest in '..\..\HashLib\src\NullDigest\HlpNullDigest.pas',
HlpOneAtTime in '..\..\HashLib\src\Hash32\HlpOneAtTime.pas',
HlpPJW in '..\..\HashLib\src\Hash32\HlpPJW.pas',
Expand Down
1 change: 0 additions & 1 deletion HashLib.Benchmark/Delphi/PerformanceBenchmarkFMX.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ uses
HlpMurmurHash3_x86_32 in '..\..\HashLib\src\Hash32\HlpMurmurHash3_x86_32.pas',
HlpMurmurHash3_x86_128 in '..\..\HashLib\src\Hash128\HlpMurmurHash3_x86_128.pas',
HlpSipHash128 in '..\..\HashLib\src\Hash128\HlpSipHash128.pas',
HlpNullable in '..\..\HashLib\src\Nullable\HlpNullable.pas',
HlpNullDigest in '..\..\HashLib\src\NullDigest\HlpNullDigest.pas',
HlpOneAtTime in '..\..\HashLib\src\Hash32\HlpOneAtTime.pas',
HlpPJW in '..\..\HashLib\src\Hash32\HlpPJW.pas',
Expand Down
140 changes: 0 additions & 140 deletions HashLib.Tests/Delphi.Tests/HashLib.Tests.TestInsight.dpr
View file
Open in desktop

This file was deleted.

24 changes: 17 additions & 7 deletions HashLib.Tests/Delphi.Tests/HashLib.Tests.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,22 @@ program HashLib.Tests;
}

{$WARN DUPLICATE_CTOR_DTOR OFF}
{$IFDEF CONSOLE_TESTRUNNER}
{$APPTYPE CONSOLE}

{$IFNDEF TESTINSIGHT}
{$IFDEF CONSOLE_TESTRUNNER}
{$APPTYPE CONSOLE}
{$ENDIF}
{$ENDIF}

uses
Forms,
TestFramework,
GUITestRunner,
TextTestRunner,
{$IFDEF TESTINSIGHT}
TestInsight.DUnit,
{$ELSE}
Forms,
TestFramework,
GUITestRunner,
TextTestRunner,
{$ENDIF}
HlpHash in '..\..\HashLib\src\Base\HlpHash.pas',
HlpKDF in '..\..\HashLib\src\Base\HlpKDF.pas',
HlpHashBuffer in '..\..\HashLib\src\Base\HlpHashBuffer.pas',
Expand Down Expand Up @@ -117,7 +124,6 @@ uses
HlpPBKDF_Argon2NotBuildInAdapter in '..\..\HashLib\src\KDF\HlpPBKDF_Argon2NotBuildInAdapter.pas',
HlpArgon2TypeAndVersion in '..\..\HashLib\src\KDF\HlpArgon2TypeAndVersion.pas',
HlpPBKDF_ScryptNotBuildInAdapter in '..\..\HashLib\src\KDF\HlpPBKDF_ScryptNotBuildInAdapter.pas',
HlpNullable in '..\..\HashLib\src\Nullable\HlpNullable.pas',
HlpConverters in '..\..\HashLib\src\Utils\HlpConverters.pas',
HlpBitConverter in '..\..\HashLib\src\Utils\HlpBitConverter.pas',
HlpBits in '..\..\HashLib\src\Utils\HlpBits.pas',
Expand All @@ -139,10 +145,14 @@ uses

begin

{$IFDEF TESTINSIGHT}
TestInsight.DUnit.RunRegisteredTests;
{$ELSE}
Application.Initialize;
if IsConsole then
TextTestRunner.RunRegisteredTests
else
GUITestRunner.RunRegisteredTests;
{$ENDIF}

end.
1 change: 0 additions & 1 deletion HashLib.Tests/src/CRCTests.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
interface

uses
Classes,
SysUtils,
{$IFDEF FPC}
fpcunit,
Expand Down
74 changes: 0 additions & 74 deletions HashLib/src/Base/HlpHashResult.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,6 @@ interface

uses
SysUtils,
{$IFDEF FPC}
base64,
{$ELSE}
{$IFDEF HAS_DELPHI_NET_ENCODING}
System.NetEncoding,
{$ELSE}
Classes,
EncdDecd,
{$ENDIF HAS_DELPHI_NET_ENCODING}
{$ENDIF FPC}
HlpBits,
HlpHashLibTypes,
HlpIHashResult,
Expand Down Expand Up @@ -49,8 +39,6 @@ THashResult = class sealed(TInterfacedObject, IHashResult)
function GetUInt64(): UInt64;
function ToString(AGroup: Boolean = False): String; reintroduce;
function Equals(const AHashResult: IHashResult): Boolean; reintroduce;
function GetHashCode(): {$IFDEF DELPHI}Int32; {$ELSE}PtrInt;
{$ENDIF DELPHI}override;

end;

Expand Down Expand Up @@ -107,68 +95,6 @@ function THashResult.GetBytes: THashLibByteArray;
result := FHash;
end;

function THashResult.GetHashCode: {$IFDEF DELPHI}Int32; {$ELSE}PtrInt;
{$ENDIF DELPHI}

var
LResult: UInt32;
LIdx, LTop: Int32;
LTemp: String;
{$IFDEF HAS_DELPHI_NET_ENCODING}
LTempHolder: THashLibByteArray;
{$ELSE}
{$IFDEF DELPHI}
LTempHolder: TBytesStream;
{$ENDIF DELPHI}
{$ENDIF HAS_DELPHI_NET_ENCODING}
{$IFDEF FPC}
LTempHolder: String;
{$ENDIF FPC}
begin

{$IFDEF HAS_DELPHI_NET_ENCODING}
LTempHolder := Self.FHash;
{$ELSE}
{$IFDEF DELPHI}
LTempHolder := TBytesStream.Create(Self.FHash);
{$ENDIF DELPHI}
{$ENDIF HAS_DELPHI_NET_ENCODING}
{$IFDEF FPC}
LTempHolder := EncodeStringBase64(TConverters.ConvertBytesToString(Self.FHash,
TEncoding.UTF8));
{$ENDIF FPC}
{$IFDEF HAS_DELPHI_NET_ENCODING}
LTemp := StringReplace(TNetEncoding.base64.EncodeBytesToString(LTempHolder),
sLineBreak, '', [rfReplaceAll]);
{$ELSE}
{$IFDEF DELPHI}
try
LTemp := StringReplace(String(EncodeBase64(LTempHolder.Memory,
LTempHolder.Size)), sLineBreak, '', [rfReplaceAll]);
finally
LTempHolder.Free;
end;
{$ENDIF DELPHI}
{$ENDIF HAS_DELPHI_NET_ENCODING}
{$IFDEF FPC}
LTemp := LTempHolder;
{$ENDIF FPC}
LTemp := AnsiUpperCase(LTemp);

LResult := 0;
LIdx := 1;
LTop := System.Length(LTemp);

while LIdx <= LTop do
begin
LResult := TBits.RotateLeft32(LResult, 5);
LResult := LResult xor UInt32(LTemp[LIdx]);
System.Inc(LIdx);
end;

result := LResult;
end;

function THashResult.GetInt32: Int32;
begin
if System.Length(FHash) <> sizeof(Int32) then
Expand Down
4 changes: 0 additions & 4 deletions HashLib/src/Crypto/HlpGost.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ interface

uses
HlpHashLibTypes,
{$IFDEF DELPHI}
HlpHash,
HlpHashBuffer,
{$ENDIF DELPHI}
HlpBits,
HlpConverters,
HlpIHash,
Expand Down
7 changes: 0 additions & 7 deletions HashLib/src/Crypto/HlpGrindahl256.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,7 @@
interface

uses
{$IFDEF DELPHI2010}
SysUtils, // to get rid of compiler hint "not inlined" on Delphi 2010.
{$ENDIF DELPHI2010}
HlpHashLibTypes,
{$IFDEF DELPHI}
HlpHash,
HlpHashBuffer,
{$ENDIF DELPHI}
HlpConverters,
HlpIHash,
HlpIHashInfo,
Expand Down
7 changes: 0 additions & 7 deletions HashLib/src/Crypto/HlpGrindahl512.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,7 @@
interface

uses
{$IFDEF DELPHI2010}
SysUtils, // to get rid of compiler hint "not inlined" on Delphi 2010.
{$ENDIF DELPHI2010}
HlpHashLibTypes,
{$IFDEF DELPHI}
HlpHash,
HlpHashBuffer,
{$ENDIF DELPHI}
HlpBits,
HlpConverters,
HlpIHash,
Expand Down
7 changes: 0 additions & 7 deletions HashLib/src/Crypto/HlpHAS160.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,7 @@
interface

uses
{$IFDEF DELPHI2010}
SysUtils, // to get rid of compiler hint "not inlined" on Delphi 2010.
{$ENDIF DELPHI2010}
HlpHashLibTypes,
{$IFDEF DELPHI}
HlpHash,
HlpHashBuffer,
{$ENDIF DELPHI}
HlpConverters,
HlpIHash,
HlpIHashInfo,
Expand Down
7 changes: 0 additions & 7 deletions HashLib/src/Crypto/HlpHaval.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,7 @@
interface

uses
{$IFDEF DELPHI2010}
SysUtils, // to get rid of compiler hint "not inlined" on Delphi 2010.
{$ENDIF DELPHI2010}
HlpHashLibTypes,
{$IFDEF DELPHI}
HlpHash,
HlpHashBuffer,
{$ENDIF DELPHI}
HlpBits,
HlpHashSize,
HlpHashRounds,
Expand Down
4 changes: 0 additions & 4 deletions HashLib/src/Crypto/HlpMD2.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ interface

uses
HlpHashLibTypes,
{$IFDEF DELPHI}
HlpHashBuffer,
HlpHash,
{$ENDIF DELPHI}
HlpIHash,
HlpIHashInfo,
HlpArrayUtils,
Expand Down
Loading