Fix string output for TomlDateTime and TomlFloat

src/Tomlyn.Tests/ModelHelper.cs

@@ -35,16 +35,32 @@ public static JToken ToJson(TomlObject obj)
                         { "value", tomlBoolean.Value.ToString(CultureInfo.InvariantCulture).ToLowerInvariant()}
                     };
                 case TomlDateTime tomlDateTime:
+                    string kindStr = "";
+                    switch (tomlDateTime.Kind)
+                    {
+                        case ObjectKind.OffsetDateTime:
+                            kindStr = "datetime";
+                            break;
+                        case ObjectKind.LocalDateTime:
+                            kindStr = "datetime-local";
+                            break;
+                        case ObjectKind.LocalDate:
+                            kindStr = "date";
+                            break;
+                        case ObjectKind.LocalTime:
+                            kindStr = "time";
+                            break;
+                    }
                     return new JObject
                     {
-                        {"type", "datetime"},
+                        {"type", kindStr},
                         { "value", tomlDateTime.ToString()}
                     };
                 case TomlFloat tomlFloat:
                     return new JObject
                     {
                         {"type", "float"},
-                        { "value", AppendDecimalPoint(tomlFloat.Value.ToString("g16", CultureInfo.InvariantCulture), true)}
+                        { "value", tomlFloat.ToString()}
                     };
                 case TomlInteger tomlInteger:
                     return new JObject
@@ -80,32 +96,5 @@ public static JToken ToJson(TomlObject obj)
             }
             throw new NotSupportedException($"The type element `{obj.GetType()}` is not supported");
         }
-
-        private static string DateTimeToString(DateTime time)
-        {
-            time = time.ToUniversalTime();
-            if (time.Millisecond == 0) return time.ToString("yyyy-MM-dd'T'HH:mm:ssK", CultureInfo.InvariantCulture);
-            return time.ToString("yyyy-MM-dd'T'HH:mm:ss.fffK", CultureInfo.InvariantCulture);
-        }
-
-        private static string AppendDecimalPoint(string text, bool hasNaN)
-        {
-            for (var i = 0; i < text.Length; i++)
-            {
-                var c = text[i];
-                // Do not append a decimal point if floating point type value
-                // - is in exponential form, or
-                // - already has a decimal point
-                if (c == 'e' || c == 'E' || c == '.')
-                {
-                    return text;
-                }
-            }
-            // Special cases for floating point type supporting NaN and Infinity
-            if (hasNaN && (string.Equals(text, "NaN") || text.Contains("Infinity")))
-                return text;
-
-            return text + ".0";
-        }
     }
 }

src/Tomlyn/Model/TomlFloat.cs

@@ -1,6 +1,10 @@
 // Copyright (c) Alexandre Mutel. All rights reserved.
 // Licensed under the BSD-Clause 2 license. 
 // See license.txt file in the project root for full license information.
+
+using System;
+using System.Globalization;
+
 namespace Tomlyn.Model
 {
     /// <summary>
@@ -11,5 +15,38 @@ public sealed class TomlFloat : TomlValue<double>
         public TomlFloat(double value) : base(ObjectKind.Float, value)
         {
         }
+
+        public override string ToString()
+        {
+            if (double.IsNaN(Value))
+            {
+                return BitConverter.DoubleToInt64Bits(Value) > 0 ? "+nan" : "nan";
+            }
+            if (double.IsPositiveInfinity(Value))
+            {
+                return "+inf";
+            }
+            if (double.IsNegativeInfinity(Value))
+            {
+                return "-inf";
+            }
+            return AppendDecimalPoint(Value.ToString("g16", CultureInfo.InvariantCulture));
+        }
+
+        private static string AppendDecimalPoint(string text)
+        {
+            for (var i = 0; i < text.Length; i++)
+            {
+                var c = text[i];
+                // Do not append a decimal point if floating point type value
+                // - is in exponential form, or
+                // - already has a decimal point
+                if (c == 'e' || c == 'E' || c == '.')
+                {
+                    return text;
+                }
+            }
+            return text + ".0";
+        }
     }
 }