cache float format (#270)

SimonCropp · Oct 8, 2023 · 9f9248c · 9f9248c
1 parent c65c886
commit 9f9248c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 21 deletions.
diff --git a/src/Argon/JsonConvert.cs b/src/Argon/JsonConvert.cs
@@ -143,23 +143,12 @@ public static string ToString(DateTimeOffset value)
     public static string ToString(float value) =>
         EnsureDecimalPlace(value, value.ToString("R", InvariantCulture));
 
-    internal static string ToString(float value, FloatFormatHandling floatFormatHandling, char quoteChar, bool nullable, byte? precision)
+    internal static string ToString(float value, FloatFormatHandling floatFormatHandling, char quoteChar, bool nullable, string format)
     {
-        var format = GetFormat(precision);
         var text = value.ToString(format, InvariantCulture);
         return EnsureFloatFormat(value, EnsureDecimalPlace(value, text), floatFormatHandling, quoteChar, nullable);
     }
 
-    static string GetFormat(byte? precision)
-    {
-        if (precision.HasValue)
-        {
-            return $"0.{new string('#', precision.Value)}";
-        }
-
-        return "R";
-    }
-
     static string EnsureFloatFormat(double value, string text, FloatFormatHandling floatFormatHandling, char quoteChar, bool nullable)
     {
         if (floatFormatHandling == FloatFormatHandling.Symbol ||
@@ -188,9 +177,8 @@ static string EnsureFloatFormat(double value, string text, FloatFormatHandling f
     public static string ToString(double value) =>
         EnsureDecimalPlace(value, value.ToString("R", InvariantCulture));
 
-    internal static string ToString(double value, FloatFormatHandling floatFormatHandling, char quoteChar, bool nullable, byte? precision)
+    internal static string ToString(double value, FloatFormatHandling floatFormatHandling, char quoteChar, bool nullable, string format)
     {
-        var format = GetFormat(precision);
         var text = value.ToString(format, InvariantCulture);
         var ensureDecimalPlace = EnsureDecimalPlace(value, text);
         return EnsureFloatFormat(value, ensureDecimalPlace, floatFormatHandling, quoteChar, nullable);

diff --git a/src/Argon/JsonTextWriter.Async.cs b/src/Argon/JsonTextWriter.Async.cs
@@ -874,7 +874,7 @@ public override Task WriteValueAsync(double value, Cancel cancel = default)
 
     Task WriteValueAsync(double value, bool nullable, Cancel cancel)
     {
-        var convertedValue = JsonConvert.ToString(value, FloatFormatHandling, QuoteChar, nullable, FloatPrecision);
+        var convertedValue = JsonConvert.ToString(value, FloatFormatHandling, QuoteChar, nullable, FloatFormat);
         return WriteValueInternalAsync(JsonToken.Float, convertedValue, cancel);
     }
 
@@ -920,7 +920,7 @@ public override Task WriteValueAsync(float value, Cancel cancel = default)
     Task WriteValueAsync(float value, bool nullable, Cancel cancel) =>
         WriteValueInternalAsync(
             JsonToken.Float,
-            JsonConvert.ToString(value, FloatFormatHandling, QuoteChar, nullable, FloatPrecision),
+            JsonConvert.ToString(value, FloatFormatHandling, QuoteChar, nullable, FloatFormat),
             cancel);
 
     /// <summary>

diff --git a/src/Argon/JsonTextWriter.cs b/src/Argon/JsonTextWriter.cs
@@ -325,7 +325,7 @@ public override void WriteValue(ulong value)
     public override void WriteValue(float value)
     {
         InternalWriteValue(JsonToken.Float);
-        WriteValueInternal(JsonConvert.ToString(value, FloatFormatHandling, QuoteChar, false, FloatPrecision));
+        WriteValueInternal(JsonConvert.ToString(value, FloatFormatHandling, QuoteChar, false, FloatFormat));
     }
 
     /// <summary>
@@ -340,7 +340,7 @@ public override void WriteValue(float? value)
         else
         {
             InternalWriteValue(JsonToken.Float);
-            WriteValueInternal(JsonConvert.ToString(value.GetValueOrDefault(), FloatFormatHandling, QuoteChar, true, FloatPrecision));
+            WriteValueInternal(JsonConvert.ToString(value.GetValueOrDefault(), FloatFormatHandling, QuoteChar, true, FloatFormat));
         }
     }
 
@@ -350,7 +350,7 @@ public override void WriteValue(float? value)
     public override void WriteValue(double value)
     {
         InternalWriteValue(JsonToken.Float);
-        WriteValueInternal(JsonConvert.ToString(value, FloatFormatHandling, QuoteChar, false, FloatPrecision));
+        WriteValueInternal(JsonConvert.ToString(value, FloatFormatHandling, QuoteChar, false, FloatFormat));
     }
 
     /// <summary>
@@ -365,7 +365,7 @@ public override void WriteValue(double? value)
         else
         {
             InternalWriteValue(JsonToken.Float);
-            WriteValueInternal(JsonConvert.ToString(value.GetValueOrDefault(), FloatFormatHandling, QuoteChar, true, FloatPrecision));
+            WriteValueInternal(JsonConvert.ToString(value.GetValueOrDefault(), FloatFormatHandling, QuoteChar, true, FloatFormat));
         }
     }
 

diff --git a/src/Argon/JsonWriter.cs b/src/Argon/JsonWriter.cs
@@ -201,10 +201,29 @@ protected virtual void OnEscapeHandlingChanged()
     /// </summary>
     public FloatFormatHandling FloatFormatHandling { get; set; }
 
+    byte? floatPrecision;
+
     /// <summary>
     /// Gets or sets how many decimal points to use when serializing floats and doubles.
     /// </summary>
-    public byte? FloatPrecision { get; set; }
+    public byte? FloatPrecision
+    {
+        get => floatPrecision;
+        set
+        {
+            floatPrecision = value;
+            if (floatPrecision.HasValue)
+            {
+                FloatFormat = $"0.{new string('#', floatPrecision.Value)}";
+            }
+            else
+            {
+                FloatFormat = "R";
+            }
+        }
+    }
+
+    protected string FloatFormat { get; private set; } = "R";
 
     /// <summary>
     /// Initializes a new instance of the <see cref="JsonWriter" /> class.