Add String.Equals with StringComparison (#93)

Handlebars-Net · May 11, 2024 · 588ef30 · 588ef30
1 parent 63ec144
commit 588ef30
Show file tree

Hide file tree

Showing 6 changed files with 568 additions and 446 deletions.
diff --git a/src/Handlebars.Net.Helpers.Core/Parsers/ArgumentsParser.cs b/src/Handlebars.Net.Helpers.Core/Parsers/ArgumentsParser.cs
@@ -45,9 +45,9 @@ public static class ArgumentsParser
         return argument;
     }
 
-    public static object ParseAsIntLongOrDouble(IHandlebars context, object value)
+    public static object ParseAsIntLongOrDouble(IHandlebars context, object? value)
     {
-        var parsedValue = StringValueParser.Parse(context, value as string ?? value.ToString() ?? string.Empty);
+        var parsedValue = StringValueParser.Parse(context, value as string ?? value?.ToString() ?? string.Empty);
 
         if (SupportedTypes.Contains(parsedValue.GetType()))
         {

diff --git a/src/Handlebars.Net.Helpers.Core/Utils/EnumUtils.cs b/src/Handlebars.Net.Helpers.Core/Utils/EnumUtils.cs
@@ -0,0 +1,35 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace HandlebarsDotNet.Helpers.Utils;
+
+public static class EnumUtils
+{
+    public static bool TryParse<TEnum>(object? value, [NotNullWhen(true)] out TEnum? comparisonType) where TEnum : struct, Enum
+    {
+        switch (value)
+        {
+            case TEnum valueAsEnum:
+                comparisonType = valueAsEnum;
+                return true;
+
+            case int valueAsInt when Enum.IsDefined(typeof(TEnum), valueAsInt):
+                comparisonType = IntToEnum<TEnum>(valueAsInt);
+                return true;
+
+            case string stringValue when Enum.TryParse<TEnum>(stringValue, out var parsedAsEnum):
+                comparisonType = parsedAsEnum;
+                return true;
+
+            case string stringValue when int.TryParse(stringValue, out var parsedAsInt) && Enum.IsDefined(typeof(TEnum), parsedAsInt):
+                comparisonType = IntToEnum<TEnum>(parsedAsInt);
+                return true;
+
+            default:
+                comparisonType = default;
+                return false;
+        }
+    }
+
+    public static TEnum IntToEnum<TEnum>(int value) where TEnum : struct, Enum
+        => (TEnum)Enum.ToObject(typeof(TEnum), value);
+}
diff --git a/src/Handlebars.Net.Helpers/Helpers/MathHelpers.cs b/src/Handlebars.Net.Helpers/Helpers/MathHelpers.cs
@@ -7,6 +7,8 @@ namespace HandlebarsDotNet.Helpers.Helpers;
 
 internal class MathHelpers : BaseHelpers, IHelpers
 {
+    private const double Tolerance = 1e-20; // 20 Digits of precision
+
     [HandlebarsWriter(WriterType.Value)]
     public object Add(object value1, object value2)
     {
@@ -40,7 +42,7 @@ public double Divide(object value1, object value2)
     [HandlebarsWriter(WriterType.Value)]
     public bool Equal(object value1, object value2)
     {
-        return ExecuteUtils.Execute(Context, value1, value2, (x1, x2) => x1 == x2, (x1, x2) => x1 == x2, (x1, x2) => x1 == x2);
+        return ExecuteUtils.Execute(Context, value1, value2, (x1, x2) => x1 == x2, (x1, x2) => x1 == x2, (x1, x2) => Math.Abs(x1 - x2) < Tolerance);
     }
 
     [HandlebarsWriter(WriterType.Value)]
@@ -106,7 +108,7 @@ public object Multiply(object value1, object value2)
     [HandlebarsWriter(WriterType.Value)]
     public bool NotEqual(object value1, object value2)
     {
-        return ExecuteUtils.Execute(Context, value1, value2, (x1, x2) => x1 != x2, (x1, x2) => x1 != x2, (x1, x2) => x1 != x2);
+        return ExecuteUtils.Execute(Context, value1, value2, (x1, x2) => x1 != x2, (x1, x2) => x1 != x2, (x1, x2) => Math.Abs(x1 - x2) > Tolerance);
     }
 
     [HandlebarsWriter(WriterType.Value)]