big endian related fixes

Author: Xor-el

SimpleBaseLib.Tests/Delphi.Tests/SimpleBaseLib.Tests.dpr

@@ -72,7 +72,6 @@ uses
   SbpBase45 in '..\..\SimpleBaseLib\src\Bases\SbpBase45.pas',
   SbpIBase45Alphabet in '..\..\SimpleBaseLib\src\Interfaces\Alphabets\SbpIBase45Alphabet.pas',
   SbpIBase45 in '..\..\SimpleBaseLib\src\Interfaces\Bases\SbpIBase45.pas',
-  SbpPlatformUtilities in '..\..\SimpleBaseLib\src\Utilities\SbpPlatformUtilities.pas',
   SbpAliasedBase32Alphabet in '..\..\SimpleBaseLib\src\Alphabets\SbpAliasedBase32Alphabet.pas',
   SbpBase32Alphabet in '..\..\SimpleBaseLib\src\Alphabets\SbpBase32Alphabet.pas',
   SbpBase32 in '..\..\SimpleBaseLib\src\Bases\SbpBase32.pas',

SimpleBaseLib.Tests/src/Base32/Base32Tests.pas

@@ -21,7 +21,6 @@ interface
   SbpIBase32,
   SbpBase32,
   SbpBase32Alphabet,
-  SbpBitOperations,
   SimpleBaseLibTestBase;
 
 type
@@ -52,8 +51,6 @@   TTestBase32 = class(TSimpleBaseLibTestCase)
     procedure Test_Rfc4648_DecodeUInt64_ReturnsExpectedValues;
     procedure Test_Rfc4648_TryDecodeUInt64_ReturnsExpectedValues;
     procedure Test_Rfc4648_TryDecodeUInt64_InvalidInput_ReturnsFalse;
-    procedure Test_Rfc4648_Encode_BigEndianUInt64_ReturnsExpectedValues;
-    procedure Test_Rfc4648_DecodeUInt64_BigEndian_ReturnsExpectedValues;
     procedure Test_Rfc4648_EncodeInt64_Negative_Throws;
     procedure Test_Rfc4648_DecodeInt64_ReturnsExpectedValues;
     procedure Test_Rfc4648_DecodeInt64_OutOfRange_Throws;
@@ -239,26 +236,6 @@ procedure TTestBase32.Test_Rfc4648_TryDecodeUInt64_InvalidInput_ReturnsFalse;
   CheckFalse(TBase32.Rfc4648.TryDecodeUInt64('!@#!@#invalid alphabet!@#!@#', LValue));
 end;
 
-procedure TTestBase32.Test_Rfc4648_Encode_BigEndianUInt64_ReturnsExpectedValues;
-var
-  LBigEndian: IBase32;
-  LValue: UInt64;
-begin
-  LBigEndian := TBase32.Create(TBase32Alphabet.Rfc4648, True);
-  LValue := TBitOperations.ReverseBytesUInt64($1122334455667788);
-  CheckEquals('RB3WMVKEGMRBC', LBigEndian.EncodeUInt64(LValue));
-end;
-
-procedure TTestBase32.Test_Rfc4648_DecodeUInt64_BigEndian_ReturnsExpectedValues;
-var
-  LBigEndian: IBase32;
-  LExpected: UInt64;
-begin
-  LBigEndian := TBase32.Create(TBase32Alphabet.Rfc4648, True);
-  LExpected := TBitOperations.ReverseBytesUInt64($1122334455667788);
-  CheckEquals(LExpected, LBigEndian.DecodeUInt64('RB3WMVKEGMRBC'));
-end;
-
 procedure TTestBase32.Test_Rfc4648_EncodeInt64_Negative_Throws;
 begin
   try

SimpleBaseLib/src/Bases/SbpBase32.pas

@@ -18,7 +18,6 @@ interface
   SbpStreamUtilities,
   SbpCodingAlphabet,
   SbpBitOperations,
-  SbpPlatformUtilities,
   SbpBinaryPrimitives;
 
 type
@@ -39,7 +38,6 @@   TBase32 = class(TInterfacedObject, IBase32, IBaseStreamCoder, INonAllocatingBa
 
     var
     FAlphabet: IBase32Alphabet;
-    FIsBigEndian: Boolean;
 
     class var FCrockford: IBase32;
     class var FRfc4648: IBase32;
@@ -77,8 +75,7 @@   TBase32 = class(TInterfacedObject, IBase32, IBaseStreamCoder, INonAllocatingBa
   public
     class constructor Create;
 
-    constructor Create(const AAlphabet: IBase32Alphabet); overload;
-    constructor Create(const AAlphabet: IBase32Alphabet; AIsBigEndian: Boolean); overload;
+    constructor Create(const AAlphabet: IBase32Alphabet);
 
     class property Crockford: IBase32 read GetCrockford;
     class property Rfc4648: IBase32 read GetRfc4648;
@@ -139,11 +136,6 @@ implementation
 end;
 
 constructor TBase32.Create(const AAlphabet: IBase32Alphabet);
-begin
-  Create(AAlphabet, not TPlatformUtilities.IsLittleEndian);
-end;
-
-constructor TBase32.Create(const AAlphabet: IBase32Alphabet; AIsBigEndian: Boolean);
 begin
   inherited Create;
   if AAlphabet.PaddingPosition <> TPaddingPosition.&End then
@@ -153,7 +145,6 @@ constructor TBase32.Create(const AAlphabet: IBase32Alphabet; AIsBigEndian: Boole
   end;
 
   FAlphabet := AAlphabet;
-  FIsBigEndian := AIsBigEndian;
 end;
 
 function TBase32.GetAlphabet: IBase32Alphabet;
@@ -327,9 +318,8 @@ function TBase32.EncodeUInt64(const ANumber: UInt64): String;
 const
   NumBytes = 8;
 var
-  LBuffer, LSpan: TSimpleBaseLibByteArray;
+  LBuffer: TSimpleBaseLibByteArray;
   LI: Int32;
-  LTmp: Byte;
 begin
   if ANumber = 0 then
   begin
@@ -340,24 +330,6 @@ function TBase32.EncodeUInt64(const ANumber: UInt64): String;
   System.SetLength(LBuffer, NumBytes);
   TBinaryPrimitives.WriteUInt64LittleEndian(LBuffer, 0, ANumber);
 
-  if FIsBigEndian then
-  begin
-    LI := 0;
-    while (LI < NumBytes) and (LBuffer[LI] = 0) do
-    begin
-      Inc(LI);
-    end;
-    LSpan := System.Copy(LBuffer, LI, NumBytes - LI);
-    for LI := 0 to (System.Length(LSpan) div 2) - 1 do
-    begin
-      LTmp := LSpan[LI];
-      LSpan[LI] := LSpan[System.Length(LSpan) - 1 - LI];
-      LSpan[System.Length(LSpan) - 1 - LI] := LTmp;
-    end;
-    Result := Encode(LSpan);
-    Exit;
-  end;
-
   LI := NumBytes - 1;
   while (LI > 0) and (LBuffer[LI] = 0) do
   begin
@@ -369,8 +341,6 @@ function TBase32.EncodeUInt64(const ANumber: UInt64): String;
 function TBase32.DecodeUInt64(const AText: String): UInt64;
 var
   LBuffer, LNewSpan: TSimpleBaseLibByteArray;
-  LI: Int32;
-  LTmp: Byte;
 begin
   LBuffer := Decode(AText);
   if System.Length(LBuffer) = 0 then
@@ -388,24 +358,13 @@ function TBase32.DecodeUInt64(const AText: String): UInt64;
   TArrayUtilities.Fill<Byte>(LNewSpan, 0, 8, Byte(0));
   Move(LBuffer[0], LNewSpan[0], System.Length(LBuffer));
 
-  if FIsBigEndian then
-  begin
-    for LI := 0 to 3 do
-    begin
-      LTmp := LNewSpan[LI];
-      LNewSpan[LI] := LNewSpan[7 - LI];
-      LNewSpan[7 - LI] := LTmp;
-    end;
-  end;
-
   Result := TBinaryPrimitives.ReadUInt64LittleEndian(LNewSpan, 0);
 end;
 
 function TBase32.TryDecodeUInt64(const AText: String; out ANumber: UInt64): Boolean;
 var
   LOutput: TSimpleBaseLibByteArray;
-  LBytesWritten, LI: Int32;
-  LTmp: Byte;
+  LBytesWritten: Int32;
 begin
   System.SetLength(LOutput, 8);
   TArrayUtilities.Fill<Byte>(LOutput, 0, 8, Byte(0));
@@ -416,16 +375,6 @@ function TBase32.TryDecodeUInt64(const AText: String; out ANumber: UInt64): Bool
     Exit;
   end;
 
-  if FIsBigEndian then
-  begin
-    for LI := 0 to 3 do
-    begin
-      LTmp := LOutput[LI];
-      LOutput[LI] := LOutput[7 - LI];
-      LOutput[7 - LI] := LTmp;
-    end;
-  end;
-
   ANumber := TBinaryPrimitives.ReadUInt64LittleEndian(LOutput, 0);
   Result := True;
 end;

SimpleBaseLib/src/Packages/Delphi/SimpleBaseLib4PascalPackage.dpk

@@ -79,7 +79,6 @@ contains
   SbpBase45 in '..\..\Bases\SbpBase45.pas',
   SbpIBase45Alphabet in '..\..\Interfaces\Alphabets\SbpIBase45Alphabet.pas',
   SbpIBase45 in '..\..\Interfaces\Bases\SbpIBase45.pas',
-  SbpPlatformUtilities in '..\..\Utilities\SbpPlatformUtilities.pas',
   SbpAliasedBase32Alphabet in '..\..\Alphabets\SbpAliasedBase32Alphabet.pas',
   SbpBase32Alphabet in '..\..\Alphabets\SbpBase32Alphabet.pas',
   SbpBase32 in '..\..\Bases\SbpBase32.pas',