ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lua: Update print and console.log to take variable arguments.

This commit is contained in:
gochaism 2014-04-29 05:07:43 +00:00
parent b82495fed4
commit 38a0a3593e
2 changed files with 48 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
View File

@ -39,50 +39,60 @@ namespace BizHawk.Client.EmuHawk
"log", "log",
"Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable" "Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable"
)] )]
public static void Log(object output) public static void Log(params object[] outputs)
{ {
if (output == null) foreach (var output in outputs)
{ {
GlobalWin.Tools.LuaConsole.WriteToOutputWindow("NULL"); if (output == null)
}
else
{
if (output is LuaTable)
{ {
var sb = new StringBuilder(); GlobalWin.Tools.LuaConsole.WriteToOutputWindow("NULL");
var lti = output as LuaTable;
var keys = (from object key in lti.Keys select key.ToString()).ToList();
var values = (from object value in lti.Values select value.ToString()).ToList();
var kvps = new List<KeyValuePair<string, string>>();
for (var i = 0; i < keys.Count; i++)
{
if (i < values.Count)
{
kvps.Add(new KeyValuePair<string, string>(keys[i], values[i]));
}
}
kvps = kvps.OrderBy(x => x.Key).ToList();
foreach (var kvp in kvps)
{
sb
.Append("\"")
.Append(kvp.Key)
.Append("\": \"")
.Append(kvp.Value)
.Append("\"")
.AppendLine();
}
GlobalWin.Tools.LuaConsole.WriteToOutputWindow(sb.ToString());
} }
else else
{ {
GlobalWin.Tools.LuaConsole.WriteToOutputWindow(output.ToString()); if (output is LuaTable)
{
var sb = new StringBuilder();
var lti = output as LuaTable;
var keys = (from object key in lti.Keys select key.ToString()).ToList();
var values = (from object value in lti.Values select value.ToString()).ToList();
var kvps = new List<KeyValuePair<string, string>>();
for (var i = 0; i < keys.Count; i++)
{
if (i < values.Count)
{
kvps.Add(new KeyValuePair<string, string>(keys[i], values[i]));
}
}
kvps = kvps.OrderBy(x => x.Key).ToList();
foreach (var kvp in kvps)
{
sb
.Append("\"")
.Append(kvp.Key)
.Append("\": \"")
.Append(kvp.Value)
.Append("\"")
.AppendLine();
}
GlobalWin.Tools.LuaConsole.WriteToOutputWindow(sb.ToString());
}
else
{
GlobalWin.Tools.LuaConsole.WriteToOutputWindow(output.ToString());
}
} }
} }
} }
// Single param version is used by logOutputCallback of some libraries.
public static void Log(string output)
{
var outputs = new[] { output };
Log(outputs);
}
} }
} }

4
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
View File

@ -136,9 +136,9 @@ namespace BizHawk.Client.EmuHawk
return result; return result;
} }
public static void Print(string s) public static void Print(params object[] outputs)
{ {
ConsoleLuaLibrary.Log(s); ConsoleLuaLibrary.Log(outputs);
} }
private void Frameadvance() private void Frameadvance()