implement IComparisonOperators and IEqualityOperators

Author: smdn

src/Smdn.Fundamental.Uuid/Smdn.Formats.UniversallyUniqueIdentifiers/Node.IComparable.cs

@@ -7,8 +7,12 @@ namespace Smdn.Formats.UniversallyUniqueIdentifiers;
 #pragma warning disable IDE0040
 partial struct Node :
 #pragma warning restore IDE0040
+#if FEATURE_GENERIC_MATH
+  IComparisonOperators<Node, Node>
+#else
   IComparable<Node>,
   IComparable
+#endif
 {
   public static bool operator <(Node x, Node y) => x.CompareTo(y) < 0;
   public static bool operator <=(Node x, Node y) => x.CompareTo(y) <= 0;

src/Smdn.Fundamental.Uuid/Smdn.Formats.UniversallyUniqueIdentifiers/Node.IEquatable.cs

@@ -7,7 +7,11 @@ namespace Smdn.Formats.UniversallyUniqueIdentifiers;
 #pragma warning disable IDE0040
 partial struct Node :
 #pragma warning restore IDE0040
+#if FEATURE_GENERIC_MATH
+  IEqualityOperators<Node, Node>
+#else
   IEquatable<Node>
+#endif
 {
   public static bool operator ==(Node x, Node y) => x.Equals(y);
   public static bool operator !=(Node x, Node y) => !x.Equals(y);

src/Smdn.Fundamental.Uuid/Smdn.Fundamental.Uuid.csproj

@@ -26,6 +26,16 @@ SPDX-License-Identifier: MIT
     <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" Condition="($(TargetFramework.StartsWith('net46')) and '$(TargetFramework)' != 'net46') or $(TargetFramework.StartsWith('netstandard2.0'))" />
   </ItemGroup>
 
+  <PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '7.0.0'))">
+    <TargetFrameworks>net7.0;$(TargetFrameworks)</TargetFrameworks>
+    <DefineConstants Condition="$(TargetFramework.StartsWith('net7'))">FEATURE_GENERIC_MATH;$(DefineConstants)</DefineConstants>
+    <EnablePreviewFeatures Condition="$(TargetFramework.StartsWith('net7'))">true</EnablePreviewFeatures>
+  </PropertyGroup>
+
+  <ItemGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '7.0.0'))">
+    <PackageReference Include="System.Runtime.Experimental" Version="7.0.0-preview.2.22152.2" Condition="$(TargetFramework.StartsWith('net7'))" />
+  </ItemGroup>
+
   <Target Name="AddExtraDefineConstants" AfterTargets="AddNETSdkApiDefineConstants">
     <PropertyGroup>
       <DefineConstants Condition="

tests/Smdn.Fundamental.Uuid/Smdn.Formats.UniversallyUniqueIdentifiers/Node.IComparable.cs

@@ -24,6 +24,14 @@ public void TestOpLessThan_OpLessThanOrEqual(string x, string y, bool lessThan,
   {
     Assert.AreEqual(lessThan, Node.Parse(x) < Node.Parse(y), "op <");
     Assert.AreEqual(lessThanOrEqual, Node.Parse(x) <= Node.Parse(y), "op <=");
+
+#if FEATURE_GENERIC_MATH
+    Assert.AreEqual(lessThan, OpLessThan(Node.Parse(x), Node.Parse(y)), "IComparisonOperators <");
+    Assert.AreEqual(lessThanOrEqual, OpLessThanOrEqual(Node.Parse(x), Node.Parse(y)), "IComparisonOperators <=");
+
+    static bool OpLessThan<T>(T x, T y) where T : IComparisonOperators<T, T> => x < y;
+    static bool OpLessThanOrEqual<T>(T x, T y) where T : IComparisonOperators<T, T> => x <= y;
+#endif
   }
 
   [TestCase("00:00:00:00:00:00", "00:00:00:00:00:00", false,  true)]
@@ -44,6 +52,14 @@ public void TestOpGreaterThan_OpGreaterThanOrEqual(string x, string y, bool grea
   {
     Assert.AreEqual(greaterThan, Node.Parse(x) > Node.Parse(y), "op >");
     Assert.AreEqual(greaterThanOrEqual, Node.Parse(x) >= Node.Parse(y), "op >=");
+
+#if FEATURE_GENERIC_MATH
+    Assert.AreEqual(greaterThan, OpGreaterThan(Node.Parse(x), Node.Parse(y)), "IComparisonOperators >");
+    Assert.AreEqual(greaterThanOrEqual, OpGreaterThanOrEqual(Node.Parse(x), Node.Parse(y)), "IComparisonOperators >=");
+
+    static bool OpGreaterThan<T>(T x, T y) where T : IComparisonOperators<T, T> => x > y;
+    static bool OpGreaterThanOrEqual<T>(T x, T y) where T : IComparisonOperators<T, T> => x >= y;
+#endif
   }
 
   [TestCase("00:00:00:00:00:00", "00:00:00:00:00:00",  0)]

tests/Smdn.Fundamental.Uuid/Smdn.Formats.UniversallyUniqueIdentifiers/Node.IEquatable.cs

@@ -24,6 +24,14 @@ public void TestOpEquality_OpInequality(string x, string y, bool isEqual)
   {
     Assert.AreEqual(isEqual, Node.Parse(x) == Node.Parse(y), "op ==");
     Assert.AreEqual(!isEqual, Node.Parse(x) != Node.Parse(y), "op !=");
+
+#if FEATURE_GENERIC_MATH
+    Assert.AreEqual(isEqual, OpEquality(Node.Parse(x), Node.Parse(y)), "IEqualityOperators ==");
+    Assert.AreEqual(!isEqual, OpInequality(Node.Parse(x), Node.Parse(y)), "IEqualityOperators !=");
+
+    static bool OpEquality<T>(T x, T y) where T : IEqualityOperators<T, T> => x == y;
+    static bool OpInequality<T>(T x, T y) where T : IEqualityOperators<T, T> => x != y;
+#endif
   }
 
   [TestCase("00:00:00:00:00:00", "00:00:00:00:00:00",  true)]

tests/Smdn.Fundamental.Uuid/Smdn.Fundamental.Uuid.Tests.csproj

@@ -7,4 +7,14 @@ SPDX-License-Identifier: MIT
     <TargetFrameworks>net6.0;net5.0;net48;net461;net45;netcoreapp3.1</TargetFrameworks>
     <RootNamespace>Smdn</RootNamespace>
   </PropertyGroup>
+
+  <PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '7.0.0'))">
+    <TargetFrameworks>net7.0;$(TargetFrameworks)</TargetFrameworks>
+    <DefineConstants Condition="$(TargetFramework.StartsWith('net7'))">FEATURE_GENERIC_MATH;$(DefineConstants)</DefineConstants>
+    <EnablePreviewFeatures Condition="$(TargetFramework.StartsWith('net7'))">true</EnablePreviewFeatures>
+  </PropertyGroup>
+
+  <ItemGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '7.0.0'))">
+    <PackageReference Include="System.Runtime.Experimental" Version="7.0.0-preview.2.22152.2" Condition="$(TargetFramework.StartsWith('net7'))" />
+  </ItemGroup>
 </Project>