From 059952f0a403f1305792f76a273e7fe388675ac8 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Mon, 19 May 2014 01:06:44 +0000
Subject: [PATCH] Change memory.getmemorydomainlist() to return a lua table
 instead of a string

---
 .../lua/EmuLuaLibrary.Memory.cs                | 18 ++++++++++++++++--
 .../tools/Lua/Libraries/EmuLuaLibrary.cs       |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs
index 2bd0225235..efa3317484 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs
@@ -1,12 +1,20 @@
 using System;
 using System.Linq;
 
+using LuaInterface;
+
 namespace BizHawk.Client.Common
 {
 	public class MemoryLuaLibrary : LuaLibraryBase
 	{
+		private readonly Lua _lua;
 		private int _currentMemoryDomain; // Main memory by default
 
+		public MemoryLuaLibrary(Lua lua)
+		{
+			_lua = lua;
+		}
+
 		public override string Name { get { return "memory"; } }
 
 		#region Memory Library Helpers
@@ -93,9 +101,15 @@ namespace BizHawk.Client.Common
 			"getmemorydomainlist",
 			"Returns a string of the memory domains for the loaded platform core. List will be a single string delimited by line feeds"
 		)]
-		public string GetMemoryDomainList()
+		public LuaTable GetMemoryDomainList()
 		{
-			return Global.Emulator.MemoryDomains.Aggregate(string.Empty, (current, t) => current + (t.Name + '\n'));
+			var table = _lua.NewTable();
+			for (int i = 0; i < Global.Emulator.MemoryDomains.Count; i++)
+			{
+				table[i] = Global.Emulator.MemoryDomains[i].Name;
+			}
+
+			return table;
 		}
 
 		[LuaMethodAttributes(
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
index f0745defe8..a316bdfa90 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
@@ -95,7 +95,7 @@ namespace BizHawk.Client.EmuHawk
 			_guiLibrary.LuaRegister(lua, Docs);
 			new InputLuaLibrary(_lua).LuaRegister(lua, Docs);
 			new JoypadLuaLibrary(_lua).LuaRegister(lua, Docs);
-			new MemoryLuaLibrary().LuaRegister(lua, Docs);
+			new MemoryLuaLibrary(_lua).LuaRegister(lua, Docs);
 			new MainMemoryLuaLibrary(_lua).LuaRegister(lua, Docs);
 			new MovieLuaLibrary(_lua).LuaRegister(lua, Docs);
 			new NesLuaLibrary().LuaRegister(lua, Docs);