Skip to content

Commit 8554145

Browse files
Xor-elXor-el
authored
some code cleanup (#39)
* remove unneeded defines * remover some more unneeded compiler special casing * refactor away from HlpNullable * merge dunit & test insight test projects as one * add missing changes * remove unneeded GetHashCode in THashResult * disable compilation on fpc big endian * clean up unused define
1 parent 618a4dd commit 8554145

60 files changed

Lines changed: 120 additions & 877 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎HashLib.Benchmark/Delphi/PerformanceBenchmarkConsole.dpr‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ uses
7474
HlpMurmurHash3_x86_32 in '..\..\HashLib\src\Hash32\HlpMurmurHash3_x86_32.pas',
7575
HlpMurmurHash3_x86_128 in '..\..\HashLib\src\Hash128\HlpMurmurHash3_x86_128.pas',
7676
HlpSipHash128 in '..\..\HashLib\src\Hash128\HlpSipHash128.pas',
77-
HlpNullable in '..\..\HashLib\src\Nullable\HlpNullable.pas',
7877
HlpNullDigest in '..\..\HashLib\src\NullDigest\HlpNullDigest.pas',
7978
HlpOneAtTime in '..\..\HashLib\src\Hash32\HlpOneAtTime.pas',
8079
HlpPJW in '..\..\HashLib\src\Hash32\HlpPJW.pas',

‎HashLib.Benchmark/Delphi/PerformanceBenchmarkFMX.dpr‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ uses
7373
HlpMurmurHash3_x86_32 in '..\..\HashLib\src\Hash32\HlpMurmurHash3_x86_32.pas',
7474
HlpMurmurHash3_x86_128 in '..\..\HashLib\src\Hash128\HlpMurmurHash3_x86_128.pas',
7575
HlpSipHash128 in '..\..\HashLib\src\Hash128\HlpSipHash128.pas',
76-
HlpNullable in '..\..\HashLib\src\Nullable\HlpNullable.pas',
7776
HlpNullDigest in '..\..\HashLib\src\NullDigest\HlpNullDigest.pas',
7877
HlpOneAtTime in '..\..\HashLib\src\Hash32\HlpOneAtTime.pas',
7978
HlpPJW in '..\..\HashLib\src\Hash32\HlpPJW.pas',

‎HashLib.Tests/Delphi.Tests/HashLib.Tests.TestInsight.dpr‎

Lines changed: 0 additions & 140 deletions
This file was deleted.

‎HashLib.Tests/Delphi.Tests/HashLib.Tests.dpr‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,22 @@ program HashLib.Tests;
1111
}
1212

1313
{$WARN DUPLICATE_CTOR_DTOR OFF}
14-
{$IFDEF CONSOLE_TESTRUNNER}
15-
{$APPTYPE CONSOLE}
14+
15+
{$IFNDEF TESTINSIGHT}
16+
{$IFDEF CONSOLE_TESTRUNNER}
17+
{$APPTYPE CONSOLE}
18+
{$ENDIF}
1619
{$ENDIF}
1720

1821
uses
19-
Forms,
20-
TestFramework,
21-
GUITestRunner,
22-
TextTestRunner,
22+
{$IFDEF TESTINSIGHT}
23+
TestInsight.DUnit,
24+
{$ELSE}
25+
Forms,
26+
TestFramework,
27+
GUITestRunner,
28+
TextTestRunner,
29+
{$ENDIF}
2330
HlpHash in '..\..\HashLib\src\Base\HlpHash.pas',
2431
HlpKDF in '..\..\HashLib\src\Base\HlpKDF.pas',
2532
HlpHashBuffer in '..\..\HashLib\src\Base\HlpHashBuffer.pas',
@@ -117,7 +124,6 @@ uses
117124
HlpPBKDF_Argon2NotBuildInAdapter in '..\..\HashLib\src\KDF\HlpPBKDF_Argon2NotBuildInAdapter.pas',
118125
HlpArgon2TypeAndVersion in '..\..\HashLib\src\KDF\HlpArgon2TypeAndVersion.pas',
119126
HlpPBKDF_ScryptNotBuildInAdapter in '..\..\HashLib\src\KDF\HlpPBKDF_ScryptNotBuildInAdapter.pas',
120-
HlpNullable in '..\..\HashLib\src\Nullable\HlpNullable.pas',
121127
HlpConverters in '..\..\HashLib\src\Utils\HlpConverters.pas',
122128
HlpBitConverter in '..\..\HashLib\src\Utils\HlpBitConverter.pas',
123129
HlpBits in '..\..\HashLib\src\Utils\HlpBits.pas',
@@ -139,10 +145,14 @@ uses
139145

140146
begin
141147

148+
{$IFDEF TESTINSIGHT}
149+
TestInsight.DUnit.RunRegisteredTests;
150+
{$ELSE}
142151
Application.Initialize;
143152
if IsConsole then
144153
TextTestRunner.RunRegisteredTests
145154
else
146155
GUITestRunner.RunRegisteredTests;
156+
{$ENDIF}
147157

148158
end.

‎HashLib.Tests/src/CRCTests.pas‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
interface
44

55
uses
6-
Classes,
76
SysUtils,
87
{$IFDEF FPC}
98
fpcunit,

‎HashLib/src/Base/HlpHashResult.pas‎

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,6 @@ interface
66

77
uses
88
SysUtils,
9-
{$IFDEF FPC}
10-
base64,
11-
{$ELSE}
12-
{$IFDEF HAS_DELPHI_NET_ENCODING}
13-
System.NetEncoding,
14-
{$ELSE}
15-
Classes,
16-
EncdDecd,
17-
{$ENDIF HAS_DELPHI_NET_ENCODING}
18-
{$ENDIF FPC}
199
HlpBits,
2010
HlpHashLibTypes,
2111
HlpIHashResult,
@@ -49,8 +39,6 @@ THashResult = class sealed(TInterfacedObject, IHashResult)
4939
function GetUInt64(): UInt64;
5040
function ToString(AGroup: Boolean = False): String; reintroduce;
5141
function Equals(const AHashResult: IHashResult): Boolean; reintroduce;
52-
function GetHashCode(): {$IFDEF DELPHI}Int32; {$ELSE}PtrInt;
53-
{$ENDIF DELPHI}override;
5442

5543
end;
5644

@@ -107,68 +95,6 @@ function THashResult.GetBytes: THashLibByteArray;
10795
result := FHash;
10896
end;
10997

110-
function THashResult.GetHashCode: {$IFDEF DELPHI}Int32; {$ELSE}PtrInt;
111-
{$ENDIF DELPHI}
112-
113-
var
114-
LResult: UInt32;
115-
LIdx, LTop: Int32;
116-
LTemp: String;
117-
{$IFDEF HAS_DELPHI_NET_ENCODING}
118-
LTempHolder: THashLibByteArray;
119-
{$ELSE}
120-
{$IFDEF DELPHI}
121-
LTempHolder: TBytesStream;
122-
{$ENDIF DELPHI}
123-
{$ENDIF HAS_DELPHI_NET_ENCODING}
124-
{$IFDEF FPC}
125-
LTempHolder: String;
126-
{$ENDIF FPC}
127-
begin
128-
129-
{$IFDEF HAS_DELPHI_NET_ENCODING}
130-
LTempHolder := Self.FHash;
131-
{$ELSE}
132-
{$IFDEF DELPHI}
133-
LTempHolder := TBytesStream.Create(Self.FHash);
134-
{$ENDIF DELPHI}
135-
{$ENDIF HAS_DELPHI_NET_ENCODING}
136-
{$IFDEF FPC}
137-
LTempHolder := EncodeStringBase64(TConverters.ConvertBytesToString(Self.FHash,
138-
TEncoding.UTF8));
139-
{$ENDIF FPC}
140-
{$IFDEF HAS_DELPHI_NET_ENCODING}
141-
LTemp := StringReplace(TNetEncoding.base64.EncodeBytesToString(LTempHolder),
142-
sLineBreak, '', [rfReplaceAll]);
143-
{$ELSE}
144-
{$IFDEF DELPHI}
145-
try
146-
LTemp := StringReplace(String(EncodeBase64(LTempHolder.Memory,
147-
LTempHolder.Size)), sLineBreak, '', [rfReplaceAll]);
148-
finally
149-
LTempHolder.Free;
150-
end;
151-
{$ENDIF DELPHI}
152-
{$ENDIF HAS_DELPHI_NET_ENCODING}
153-
{$IFDEF FPC}
154-
LTemp := LTempHolder;
155-
{$ENDIF FPC}
156-
LTemp := AnsiUpperCase(LTemp);
157-
158-
LResult := 0;
159-
LIdx := 1;
160-
LTop := System.Length(LTemp);
161-
162-
while LIdx <= LTop do
163-
begin
164-
LResult := TBits.RotateLeft32(LResult, 5);
165-
LResult := LResult xor UInt32(LTemp[LIdx]);
166-
System.Inc(LIdx);
167-
end;
168-
169-
result := LResult;
170-
end;
171-
17298
function THashResult.GetInt32: Int32;
17399
begin
174100
if System.Length(FHash) <> sizeof(Int32) then

‎HashLib/src/Crypto/HlpGost.pas‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ interface
66

77
uses
88
HlpHashLibTypes,
9-
{$IFDEF DELPHI}
10-
HlpHash,
11-
HlpHashBuffer,
12-
{$ENDIF DELPHI}
139
HlpBits,
1410
HlpConverters,
1511
HlpIHash,

‎HashLib/src/Crypto/HlpGrindahl256.pas‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@
55
interface
66

77
uses
8-
{$IFDEF DELPHI2010}
9-
SysUtils, // to get rid of compiler hint "not inlined" on Delphi 2010.
10-
{$ENDIF DELPHI2010}
118
HlpHashLibTypes,
12-
{$IFDEF DELPHI}
13-
HlpHash,
14-
HlpHashBuffer,
15-
{$ENDIF DELPHI}
169
HlpConverters,
1710
HlpIHash,
1811
HlpIHashInfo,

‎HashLib/src/Crypto/HlpGrindahl512.pas‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@
55
interface
66

77
uses
8-
{$IFDEF DELPHI2010}
9-
SysUtils, // to get rid of compiler hint "not inlined" on Delphi 2010.
10-
{$ENDIF DELPHI2010}
118
HlpHashLibTypes,
12-
{$IFDEF DELPHI}
13-
HlpHash,
14-
HlpHashBuffer,
15-
{$ENDIF DELPHI}
169
HlpBits,
1710
HlpConverters,
1811
HlpIHash,

‎HashLib/src/Crypto/HlpHAS160.pas‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@
55
interface
66

77
uses
8-
{$IFDEF DELPHI2010}
9-
SysUtils, // to get rid of compiler hint "not inlined" on Delphi 2010.
10-
{$ENDIF DELPHI2010}
118
HlpHashLibTypes,
12-
{$IFDEF DELPHI}
13-
HlpHash,
14-
HlpHashBuffer,
15-
{$ENDIF DELPHI}
169
HlpConverters,
1710
HlpIHash,
1811
HlpIHashInfo,

0 commit comments

Comments
 (0)