From a84b4126f23cd7a6996db800eb083def2ace703d Mon Sep 17 00:00:00 2001
From: gochaism <gochaism@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Thu, 1 May 2014 00:25:14 +0000
Subject: [PATCH] Lua: Make console.log(...) a little more prettier.

---
 .../Lua/Libraries/EmuLuaLibrary.Console.cs    | 66 +++++++++++--------
 output/Lua/UnitTests/Console.lua              | 16 ++---
 2 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
index 3287438c76..a3e7dc2c09 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
@@ -41,8 +41,45 @@ namespace BizHawk.Client.EmuHawk
 		)]
 		public static void Log(params object[] outputs)
 		{
-			foreach (var output in outputs)
+			LogWithSeparator("\t", "\n", outputs);
+		}
+
+		// Single param version is used by logOutputCallback of some libraries.
+		public static void Log(string output)
+		{
+			Log((object)output);
+		}
+
+		[LuaMethodAttributes(
+			"writeline",
+			"Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable"
+		)]
+		public static void WriteLine(params object[] outputs)
+		{
+			LogWithSeparator("\n", "\n", outputs);
+		}
+
+		[LuaMethodAttributes(
+			"write",
+			"Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable"
+		)]
+		public static void Write(params object[] outputs)
+		{
+			LogWithSeparator(string.Empty, string.Empty, outputs);
+		}
+
+		// Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable
+		private static void LogWithSeparator(string separator, string terminator, params object[] outputs)
+		{
+			for (var outIndex = 0; outIndex < outputs.Length; outIndex++)
 			{
+				var output = outputs[outIndex];
+
+				if (outIndex != 0)
+				{
+					GlobalWin.Tools.LuaConsole.WriteToOutputWindow(separator);
+				}
+
 				if (output == null)
 				{
 					GlobalWin.Tools.LuaConsole.WriteToOutputWindow("NULL");
@@ -86,32 +123,7 @@ namespace BizHawk.Client.EmuHawk
 					}
 				}
 			}
-		}
-
-		[LuaMethodAttributes(
-			"writeline",
-			"Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable"
-		)]
-		public static void WriteLine(params object[] outputs)
-		{
-			Log(outputs);
-			Log('\n');
-		}
-
-		[LuaMethodAttributes(
-			"write",
-			"Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable"
-		)]
-		public static void Write(params object[] outputs)
-		{
-			Log(outputs);
-		}
-
-		// Single param version is used by logOutputCallback of some libraries.
-		public static void Log(string output)
-		{
-			var outputs = new[] { output };
-			Log(outputs);
+			GlobalWin.Tools.LuaConsole.WriteToOutputWindow(terminator);
 		}
 	}
 }
diff --git a/output/Lua/UnitTests/Console.lua b/output/Lua/UnitTests/Console.lua
index 1e1433d6b5..3a5c7b01ca 100644
--- a/output/Lua/UnitTests/Console.lua
+++ b/output/Lua/UnitTests/Console.lua
@@ -1,9 +1,9 @@
---console.clear()
---console.writeline("--cleared previous output")
---console.log("--Logging ", "multiple ", "values ", "in one ", "call", "\n")
---console.write("--console.write does not include a new line")
---console.writeline("--but console.writeline does")
---console.writeline("--next line")
---print("--Print Single value\n")
---console.writeline("--Log a lua table:")
+console.clear()
+console.writeline("--cleared previous output")
+console.log("--Logging", "multiple", "values", "in one", "call")
+console.write("--console.write does not include a new line")
+console.writeline("--but console.writeline does")
+console.writeline("--next line", "--next line")
+print("--Print Single value")
+console.writeline("--Log a lua table:")
 console.log(joypad.get())