diff --git a/src/Lua/Internal/HexConverter.cs b/src/Lua/Internal/HexConverter.cs index 453ee396..ff9609de 100644 --- a/src/Lua/Internal/HexConverter.cs +++ b/src/Lua/Internal/HexConverter.cs @@ -154,7 +154,8 @@ bool upperCase string text; if (double.IsNaN(value) || double.IsInfinity(value)) { - text = value.ToString(CultureInfo.InvariantCulture); + var sign = BitConverter.DoubleToInt64Bits(value) < 0 ? "-" : ""; + text = sign + (double.IsNaN(value) ? "nan" : "inf"); } else { diff --git a/src/Lua/LuaValue.cs b/src/Lua/LuaValue.cs index ae3e4e89..fadf5201 100644 --- a/src/Lua/LuaValue.cs +++ b/src/Lua/LuaValue.cs @@ -677,6 +677,16 @@ public override string ToString() }; } + internal string ToLuaString() + { + if (Type != LuaValueType.Number) + return ToString(); + if (MathEx.IsFinite(value)) + return value.ToString("g14", CultureInfo.InvariantCulture); + return (BitConverter.DoubleToInt64Bits(value) < 0 ? "-" : "") + + (double.IsNaN(value) ? "nan" : "inf"); + } + public string TypeToString() { return ToString(Type); @@ -759,7 +769,7 @@ CancellationToken cancellationToken } else { - context.State.Stack.Push(ToString()); + context.State.Stack.Push(ToLuaString()); return new(1); } @@ -782,7 +792,9 @@ CancellationToken cancellationToken stack.SetTop(top + 1); // Lua 5.2 converts a numeric __tostring result to text. stack.FastGet(top) = - result.Type == LuaValueType.Number ? new LuaValue(result.ToString()) : result; + result.Type == LuaValueType.Number + ? new LuaValue(result.ToLuaString()) + : result; return 1; } catch diff --git a/src/Lua/Runtime/LuaVirtualMachine.cs b/src/Lua/Runtime/LuaVirtualMachine.cs index 54b4a946..17e056e2 100644 --- a/src/Lua/Runtime/LuaVirtualMachine.cs +++ b/src/Lua/Runtime/LuaVirtualMachine.cs @@ -1263,7 +1263,7 @@ static bool ToString(ref LuaValue v) if (v.Type == LuaValueType.Number) { - v = v.ToString(); + v = v.ToLuaString(); return true; } diff --git a/src/Lua/Standard/BasicLibrary.cs b/src/Lua/Standard/BasicLibrary.cs index 542ee7bd..c070a120 100644 --- a/src/Lua/Standard/BasicLibrary.cs +++ b/src/Lua/Standard/BasicLibrary.cs @@ -569,7 +569,7 @@ CancellationToken cancellationToken if (value.Type == LuaValueType.String) text = value.UnsafeReadString(); else if (value.Type == LuaValueType.Number) - text = value.ToString(); + text = value.ToLuaString(); else { LuaRuntimeException.BadArgument(context.State, 1, LuaValueType.String, value.Type); diff --git a/src/Lua/Standard/StringLibrary.cs b/src/Lua/Standard/StringLibrary.cs index bf2b9696..74685928 100644 --- a/src/Lua/Standard/StringLibrary.cs +++ b/src/Lua/Standard/StringLibrary.cs @@ -302,7 +302,7 @@ CancellationToken cancellationToken { case LuaValueType.String: case LuaValueType.Number: - formattedValue = StringHelper.Quote(parameter.ToString()); + formattedValue = StringHelper.Quote(parameter.ToLuaString()); break; default: LuaRuntimeException.BadArgument( @@ -608,8 +608,7 @@ or LuaValueType.Function StringBuilder builder = new(); var replacementText = repl.Type == LuaValueType.String ? repl.UnsafeReadString() - : repl.Type == LuaValueType.Number - ? repl.UnsafeReadDouble().ToString(default, CultureInfo.InvariantCulture) + : repl.Type == LuaValueType.Number ? repl.ToLuaString() : null; var replacedBuilder = replacementText != null && replacementText.IndexOf('%') >= 0 @@ -1034,8 +1033,13 @@ static int ReadStringIndex(in LuaFunctionExecutionContext context, int index) static void AppendNumber(StringBuilder builder, double value) { + if (!MathEx.IsFinite(value)) + { + builder.Append(new LuaValue(value).ToLuaString()); + return; + } Span buffer = stackalloc char[32]; - value.TryFormat(buffer, out var written, default, CultureInfo.InvariantCulture); + value.TryFormat(buffer, out var written, "g14", CultureInfo.InvariantCulture); builder.Append(buffer[..written]); } @@ -1043,8 +1047,10 @@ static string FormatFloat(double value, char specifier, int precision, bool alte { if (double.IsNaN(value) || double.IsInfinity(value)) { - var special = value.ToString(CultureInfo.InvariantCulture); - return specifier is 'E' or 'G' ? special.ToUpperInvariant() : special; + var special = double.IsNaN(value) ? "nan" : "inf"; + if (specifier is 'E' or 'G') + special = special.ToUpperInvariant(); + return (BitConverter.DoubleToInt64Bits(value) < 0 ? "-" : "") + special; } var general = specifier is 'g' or 'G'; precision = diff --git a/src/Lua/Standard/TableLibrary.cs b/src/Lua/Standard/TableLibrary.cs index 5362163d..313c36c0 100644 --- a/src/Lua/Standard/TableLibrary.cs +++ b/src/Lua/Standard/TableLibrary.cs @@ -107,7 +107,7 @@ CancellationToken cancellationToken && number.TryFormat( numberBuffer, out var written, - default, + "g14", provider: CultureInfo.InvariantCulture ) ) @@ -116,7 +116,7 @@ CancellationToken cancellationToken } else { - builder.AddRange(value.ToString()); + builder.AddRange(value.ToLuaString()); } } else diff --git a/tests/Lua.Tests/ManagedNumericTextTests.cs b/tests/Lua.Tests/ManagedNumericTextTests.cs deleted file mode 100644 index 905be6e1..00000000 --- a/tests/Lua.Tests/ManagedNumericTextTests.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System.Globalization; -using Lua.Standard; - -namespace Lua.Tests; - -public class ManagedNumericTextTests -{ - [TestCase("f")] - [TestCase("e")] - [TestCase("E")] - [TestCase("g")] - [TestCase("G")] - [TestCase("a")] - [TestCase("A")] - public async Task ExplicitSpecialValuesKeepManagedWords(string specifier) - { - using var state = LuaState.Create(); - state.OpenStandardLibraries(); - state.Environment["nan"] = double.NaN; - var values = await state.DoStringAsync( - $"return string.format('%{specifier}',math.huge),string.format('%{specifier}',-math.huge),string.format('%{specifier}',nan)" - ); - var expected = new[] { "Infinity", "-Infinity", "NaN" }; - if (specifier is "E" or "G" or "A") - expected = expected.Select(s => s.ToUpperInvariant()).ToArray(); - Assert.That(values.Select(v => v.Read()), Is.EqualTo(expected)); - } - - [TestCase(1d / 3)] - [TestCase(1e20)] - [TestCase(double.Epsilon)] - [TestCase(double.PositiveInfinity)] - [TestCase(double.NegativeInfinity)] - [TestCase(double.NaN)] - public async Task ImplicitTextKeepsInvariantManagedDefault(double number) - { - using var state = LuaState.Create(); - state.OpenStandardLibraries(); - state.Environment["number"] = number; - var culture = CultureInfo.CurrentCulture; - try - { - CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo("fr-FR"); - var values = await state.DoStringAsync( - "return tostring(number),string.format('%s',number),number..'',table.concat({number})" - ); - Assert.That( - values.Select(v => v.Read()), - Is.All.EqualTo(number.ToString(CultureInfo.InvariantCulture)) - ); - } - finally - { - CultureInfo.CurrentCulture = culture; - } - } -} diff --git a/tests/Lua.Tests/NumericConversionTests.cs b/tests/Lua.Tests/NumericConversionTests.cs index 0f5a859c..d5fcbbdf 100644 --- a/tests/Lua.Tests/NumericConversionTests.cs +++ b/tests/Lua.Tests/NumericConversionTests.cs @@ -64,7 +64,7 @@ await state.DoStringAsync( assert(tonumber(math.huge)==math.huge) assert(tonumber(123,16)==291) assert(tonumber(123,2)==nil) - assert(tonumber(1e14,10)==1e14) -- retains the managed numeric-text policy + assert(tonumber(1e14,10)==nil) -- g14 produces scientific notation assert(tonumber('+12',10.9)==12) assert(tonumber('0x10',nil)==16) assert(tonumber(false)==nil) diff --git a/tests/Lua.Tests/NumericQuotingTests.cs b/tests/Lua.Tests/NumericQuotingTests.cs index 082e2b1c..0e634ce0 100644 --- a/tests/Lua.Tests/NumericQuotingTests.cs +++ b/tests/Lua.Tests/NumericQuotingTests.cs @@ -1,17 +1,16 @@ -using System.Globalization; using Lua.Standard; namespace Lua.Tests; public class NumericQuotingTests { - [TestCase(12d)] - [TestCase(1d / 3)] - [TestCase(-0d)] - [TestCase(double.Epsilon)] - [TestCase(double.PositiveInfinity)] - [TestCase(double.NaN)] - public async Task NumericQuoteReturnsAQuotedStringUsingManagedText(double number) + [TestCase(12d, "12")] + [TestCase(1d / 3, "0.33333333333333")] + [TestCase(-0d, "-0")] + [TestCase(double.Epsilon, "4.9406564584125e-324")] + [TestCase(double.PositiveInfinity, "inf")] + [TestCase(double.NaN, "-nan")] + public async Task NumericQuoteReturnsAQuotedStringUsingProposedText(double number, string text) { using var state = LuaState.Create(); state.OpenStandardLibraries(); @@ -21,7 +20,6 @@ public async Task NumericQuoteReturnsAQuotedStringUsingManagedText(double number var values = await state.DoStringAsync( $"local q=string.format('{format}',number); return q,assert(load('return '..q))()" ); - var text = number.ToString(CultureInfo.InvariantCulture); Assert.That(values[0].Read(), Is.EqualTo('"' + text + '"')); Assert.That(values[1].Type, Is.EqualTo(LuaValueType.String)); Assert.That(values[1].Read(), Is.EqualTo(text)); diff --git a/tests/Lua.Tests/NumericTextPolicyTests.cs b/tests/Lua.Tests/NumericTextPolicyTests.cs new file mode 100644 index 00000000..04604044 --- /dev/null +++ b/tests/Lua.Tests/NumericTextPolicyTests.cs @@ -0,0 +1,69 @@ +using System.Globalization; +using Lua.Standard; + +namespace Lua.Tests; + +public class NumericTextPolicyTests +{ + [TestCase("f")] + [TestCase("e")] + [TestCase("E")] + [TestCase("g")] + [TestCase("G")] + [TestCase("a")] + [TestCase("A")] + public async Task ExplicitSpecialValuesUseCanonicalWords(string specifier) + { + using var state = LuaState.Create(); + state.OpenStandardLibraries(); + state.Environment["nan"] = double.NaN; + var values = await state.DoStringAsync( + $"return string.format('%{specifier}',math.huge),string.format('%{specifier}',-math.huge),string.format('%{specifier}',nan)" + ); + var expected = new[] { "inf", "-inf", "-nan" }; + if (specifier is "E" or "G" or "A") + expected = expected.Select(s => s.ToUpperInvariant()).ToArray(); + Assert.That(values.Select(v => v.Read()), Is.EqualTo(expected)); + } + + [TestCase(1d / 3, "0.33333333333333")] + [TestCase(1e20, "1e+20")] + [TestCase(double.Epsilon, "4.9406564584125e-324")] + [TestCase(double.PositiveInfinity, "inf")] + [TestCase(double.NegativeInfinity, "-inf")] + [TestCase(double.NaN, "-nan")] + public async Task LuaFacingPathsUseTheProposedInvariantText(double number, string expected) + { + using var state = LuaState.Create(); + state.OpenStandardLibraries(); + state.Environment["number"] = number; + var culture = CultureInfo.CurrentCulture; + try + { + CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo("fr-FR"); + var values = await state.DoStringAsync( + """ + local x=setmetatable({}, {__tostring=function() return number end}) + local direct=string.gsub('x','x',number) + local callback=string.gsub('x','x',function() return number end) + local lookup=string.gsub('x','x',{x=number}) + return tostring(number),string.format('%s',number),number..'', + table.concat({number}),tostring(x),direct,callback,lookup + """ + ); + Assert.That(values.Select(v => v.Read()), Is.All.EqualTo(expected)); + } + finally + { + CultureInfo.CurrentCulture = culture; + } + } + + [Test] + public void HostToStringRetainsManagedPrecisionAndSpecialWords() + { + Assert.That(new LuaValue(1d / 3).ToString(), Is.EqualTo("0.3333333333333333")); + Assert.That(new LuaValue(double.PositiveInfinity).ToString(), Is.EqualTo("Infinity")); + Assert.That(new LuaValue(double.NaN).ToString(), Is.EqualTo("NaN")); + } +} diff --git a/tests/Lua.Tests/StringFormatTests.cs b/tests/Lua.Tests/StringFormatTests.cs index 593ed679..f8626a28 100644 --- a/tests/Lua.Tests/StringFormatTests.cs +++ b/tests/Lua.Tests/StringFormatTests.cs @@ -76,9 +76,9 @@ await state.DoStringAsync( [TestCase("%-20.1a", "0x1.ffp0", "0x2.0p+0 ")] [TestCase("%.14a", "1.5", "0x1.80000000000000p+0")] [TestCase("%#.a", "1", "0x1.p+0")] - [TestCase("%a", "math.huge", "Infinity")] - [TestCase("%+A", "math.huge", "+INFINITY")] - [TestCase("%010a", "-math.huge", " -Infinity")] + [TestCase("%a", "math.huge", "inf")] + [TestCase("%+A", "math.huge", "+INF")] + [TestCase("%010a", "-math.huge", " -inf")] [TestCase("%o", "8", "10")] [TestCase("%o", "1.5", "1")] [TestCase("%o", "-0.5", "0")]