Improve how simple (number-indexed) Lua tables are printed

YoshiRulz · YoshiRulz · commit 631e5c37b4df · 2025-05-25T00:40:29.000+10:00
also might change sort order for associative tables in some edge cases
diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ConsoleLuaLibrary.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ConsoleLuaLibrary.cs
@@ -69,7 +69,12 @@ static string SerializeTable(LuaTable lti)
 			{
 				var entries = ((IEnumerator<KeyValuePair<object, object/*?*/>>) lti.GetEnumerator()).AsEnumerable()
 					.ToArray();
-				return string.Concat(entries.Select(static kvp => $"\"{kvp.Key}\": \"{kvp.Value}\"\n").Order());
+				Console.WriteLine(entries[0].Key.GetType().FullName);
+				return string.Concat(entries.All(static kvp => kvp.Key is long)
+					? entries.OrderBy(static kvp => (long) kvp.Key, Comparer<long>.Default)
+						.Select(static kvp => $"{kvp.Key}: \"{kvp.Value}\"\n")
+					: entries.OrderBy(static kvp => kvp.Key)
+						.Select(static kvp => $"\"{kvp.Key}\": \"{kvp.Value}\"\n"));
 			}
 
 			if (!Tools.Has<LuaConsole>())

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,12 @@ static string SerializeTable(LuaTable lti)`
`69`	`69`	`{`
`70`	`70`	`var entries = ((IEnumerator<KeyValuePair<object, object/?/>>) lti.GetEnumerator()).AsEnumerable()`
`71`	`71`	`.ToArray();`
`72`		`- return string.Concat(entries.Select(static kvp => $"\"{kvp.Key}\": \"{kvp.Value}\"\n").Order());`
	`72`	`+ Console.WriteLine(entries[0].Key.GetType().FullName);`
	`73`	`+ return string.Concat(entries.All(static kvp => kvp.Key is long)`
	`74`	`+ ? entries.OrderBy(static kvp => (long) kvp.Key, Comparer<long>.Default)`
	`75`	`+ .Select(static kvp => $"{kvp.Key}: \"{kvp.Value}\"\n")`
	`76`	`+ : entries.OrderBy(static kvp => kvp.Key)`
	`77`	`+ .Select(static kvp => $"\"{kvp.Key}\": \"{kvp.Value}\"\n"));`
`73`	`78`	`}`
`74`	`79`
`75`	`80`	`if (!Tools.Has<LuaConsole>())`