Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cpp/Platform.Data.Tests/LinksConstantsTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using namespace Platform::Data;

auto constants = LinksConstants<std::uint64_t>(true);
ASSERT_EQ(Hybrid<std::uint64_t>::ExternalZero, constants.ExternalReferencesRange.Minimum);
ASSERT_EQ(std::uint64_t{0}, constants.ExternalReferencesRange.Minimum);
ASSERT_EQ(std::numeric_limits<std::uint64_t>::max(), constants.ExternalReferencesRange.Maximum);
}

Expand Down
9 changes: 4 additions & 5 deletions cpp/Platform.Data/Hybrid.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@
class Hybrid
{
public: static constexpr TLinkAddress HalfOfNumberValuesRange = std::numeric_limits<TLinkAddress>::max() / 2;
public: static constexpr TLinkAddress ExternalZero = static_cast<TLinkAddress>(HalfOfNumberValuesRange + 1);

public: const TLinkAddress Value = 0;

public: [[nodiscard]] bool IsNothing() const noexcept
{
return (Value == ExternalZero) || (SignedValue() == 0);
return Value == 0;
}

public: [[nodiscard]] bool IsInternal() const noexcept
Expand All @@ -29,7 +28,7 @@

public: [[nodiscard]] bool IsExternal() const noexcept
{
return (Value == ExternalZero) || (SignedValue() < 0);
return (Value == 0) || (SignedValue() < 0);
}

public: [[nodiscard]] auto SignedValue() const noexcept -> decltype(Internal::smart_to_signed(Value))
Expand All @@ -39,7 +38,7 @@

public: [[nodiscard]] TLinkAddress AbsoluteValue() const noexcept
{
return (Value == ExternalZero) ? 0 : std::abs(SignedValue());
return (Value == 0) ? 0 : std::abs(SignedValue());
}

public: explicit Hybrid(TLinkAddress value) noexcept : Value(value) { }
Expand All @@ -58,7 +57,7 @@
{
if (value == 0 && isExternal)
{
return ExternalZero;
return 0;
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion cpp/Platform.Data/LinksConstants.h
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
{
if (enableExternalReferencesSupport)
{
return Ranges::Range{Hybrid<TLinkAddress>::ExternalZero, std::numeric_limits<TLinkAddress>::max()};
return Ranges::Range{TLinkAddress{0}, std::numeric_limits<TLinkAddress>::max()};
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion csharp/Platform.Data.Tests/LinksConstantsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static class LinksConstantsTests
public static void ConstructorTest()
{
var constants = new LinksConstants<ulong>(enableExternalReferencesSupport: true);
Assert.Equal(Hybrid<ulong>.ExternalZero, constants.ExternalReferencesRange.Value.Minimum);
Assert.Equal((ulong)0, constants.ExternalReferencesRange.Value.Minimum);
Assert.Equal(ulong.MaxValue, constants.ExternalReferencesRange.Value.Maximum);
}

Expand Down
17 changes: 5 additions & 12 deletions csharp/Platform.Data/Hybrid.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,6 @@ public struct Hybrid<TLinkAddress> : IEquatable<Hybrid<TLinkAddress>> where TLin
/// <para></para>
/// </summary>
public static readonly TLinkAddress HalfOfNumberValuesRange = (NumericType<TLinkAddress>.MaxValue) / TLinkAddress.CreateTruncating(2);
/// <summary>
/// <para>
/// The half of number values range.
/// </para>
/// <para></para>
/// </summary>
public static readonly TLinkAddress ExternalZero = (HalfOfNumberValuesRange + TLinkAddress.CreateTruncating(1));

/// <summary>
/// <para>
Expand All @@ -55,7 +48,7 @@ public struct Hybrid<TLinkAddress> : IEquatable<Hybrid<TLinkAddress>> where TLin
public bool IsNothing
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get => (Value == ExternalZero) || SignedValue == 0;
get => Value == default;
}

/// <summary>
Expand All @@ -79,7 +72,7 @@ public bool IsInternal
public bool IsExternal
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get => (Value == ExternalZero) || SignedValue < 0;
get => (Value == default) || SignedValue < 0;
}

/// <summary>
Expand All @@ -103,7 +96,7 @@ public long SignedValue
public long AbsoluteValue
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get => (Value == ExternalZero) ? 0 : System.Math.Abs(SignedValue);
get => (Value == default) ? 0 : System.Math.Abs(SignedValue);
}

/// <summary>
Expand Down Expand Up @@ -142,7 +135,7 @@ public Hybrid(TLinkAddress value, bool isExternal)
{
if ((value == default) && isExternal)
{
Value = ExternalZero;
Value = default;
}
else
{
Expand Down Expand Up @@ -190,7 +183,7 @@ public Hybrid(object value, bool isExternal)
var signedValue = value == null ? 0 : _objectToInt64Converter.Convert(value);
if (signedValue == 0 && isExternal)
{
Value = ExternalZero;
Value = default;
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion csharp/Platform.Data/LinksConstants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ public static Range<TLinkAddress> GetDefaultInternalReferencesRange(bool enableE
{
if (enableExternalReferencesSupport)
{
return (Hybrid<TLinkAddress>.ExternalZero, NumericType<TLinkAddress>.MaxValue);
return (TLinkAddress.CreateTruncating(0), NumericType<TLinkAddress>.MaxValue);
}
else
{
Expand Down
Loading