Skip to content

Fix: invariant culture in not used in string.format #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 16, 2025
Merged

Fix: invariant culture in not used in string.format #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fe0e59
Fix: invariant culture in not used in string.format
Akeit0 Apr 16, 2025
365f352
Add: test of string.format with noninvariant culture
Akeit0 Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/Lua/Standard/StringLibrary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Text.RegularExpressions;
using Lua.Internal;
using Lua.Runtime;
using System.Globalization;

namespace Lua.Standard;

Expand Down Expand Up @@ -259,23 +260,23 @@ public async ValueTask<int> Format(LuaFunctionExecutionContext context, Memory<L
{
case 'f':
formattedValue = precision < 0
? f.ToString()
: f.ToString($"F{precision}");
? f.ToString(CultureInfo.InvariantCulture)
: f.ToString($"F{precision}",CultureInfo.InvariantCulture);
break;
case 'e':
formattedValue = precision < 0
? f.ToString()
: f.ToString($"E{precision}");
? f.ToString(CultureInfo.InvariantCulture)
: f.ToString($"E{precision}",CultureInfo.InvariantCulture);
break;
case 'g':
formattedValue = precision < 0
? f.ToString()
: f.ToString($"G{precision}");
? f.ToString(CultureInfo.InvariantCulture)
: f.ToString($"G{precision}",CultureInfo.InvariantCulture);
break;
case 'G':
formattedValue = precision < 0
? f.ToString().ToUpper()
: f.ToString($"G{precision}").ToUpper();
? f.ToString(CultureInfo.InvariantCulture).ToUpper()
: f.ToString($"G{precision}",CultureInfo.InvariantCulture).ToUpper();
break;
}

Expand Down Expand Up @@ -310,7 +311,7 @@ public async ValueTask<int> Format(LuaFunctionExecutionContext context, Memory<L
break;
case LuaValueType.Number:
// TODO: floating point numbers must be in hexadecimal notation
formattedValue = parameter.Read<double>().ToString();
formattedValue = parameter.Read<double>().ToString(CultureInfo.InvariantCulture);
break;
default:
using (var strBuffer = new PooledArray<LuaValue>(1))
Expand Down
14 changes: 14 additions & 0 deletions tests/Lua.Tests/StringTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using Lua.CodeAnalysis.Syntax;
using Lua.CodeAnalysis.Syntax.Nodes;
using Lua.Standard;
using System.Globalization;

namespace Lua.Tests;

Expand All @@ -14,4 +16,16 @@ public async Task Test_ShortString_RealNewLine(string newLine)
Assert.That(result, Has.Length.EqualTo(1));
Assert.That(result[0], Is.EqualTo(new LuaValue("\n")));
}

[TestCase("fr-FR")]
public async Task Test_StringFormat_Culture(string newLine)
{
var state = LuaState.Create();
state.OpenBasicLibrary();
state.OpenStringLibrary();
var culture = CultureInfo.CurrentCulture;
CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo(newLine);
await state.DoStringAsync($"""assert(tonumber(string.format("%f", 10.3)) == 10.3)""");
CultureInfo.CurrentCulture = culture;
}
}