diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs
index dd2b082973..17170bb10e 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs
@@ -10,95 +10,95 @@ namespace BizHawk.Client.Common
{
return new[]
{
- "band",
- "bnot",
- "bor",
- "bxor",
- "lshift",
- "rol",
- "ror",
- "rshift",
- "check",
- "set",
- "clear",
- "byteswap_16",
- "byteswap_32",
- "byteswap_64",
+ "Band",
+ "Bnot",
+ "Bor",
+ "Bxor",
+ "Lshift",
+ "Rol",
+ "Ror",
+ "Rshift",
+ "Check",
+ "Set",
+ "Clear",
+ "Byteswap_16",
+ "Byteswap_32",
+ "Byteswap_64"
};
}
}
- public static uint bit_band(object val, object amt)
+ public static uint Band(object val, object amt)
{
return (uint)(LuaInt(val) & LuaInt(amt));
}
- public static uint bit_bnot(object val)
+ public static uint Bnot(object val)
{
return (uint)(~LuaInt(val));
}
- public static uint bit_bor(object val, object amt)
+ public static uint Bor(object val, object amt)
{
return (uint)(LuaInt(val) | LuaInt(amt));
}
- public static uint bit_bxor(object val, object amt)
+ public static uint Bxor(object val, object amt)
{
return (uint)(LuaInt(val) ^ LuaInt(amt));
}
- public static uint bit_lshift(object val, object amt)
+ public static uint Lshift(object val, object amt)
{
return (uint)(LuaInt(val) << LuaInt(amt));
}
- public static uint bit_rol(object val, object amt)
+ public static uint Rol(object val, object amt)
{
return (uint)((LuaInt(val) << LuaInt(amt))
| (LuaInt(val) >> (32 - LuaInt(amt))));
}
- public static uint bit_ror(object val, object amt)
+ public static uint Ror(object val, object amt)
{
return (uint)((LuaInt(val) >> LuaInt(amt))
| (LuaInt(val) << (32 - LuaInt(amt))));
}
- public static uint bit_rshift(object val, object amt)
+ public static uint Rshift(object val, object amt)
{
return (uint)(LuaInt(val) >> LuaInt(amt));
}
- public static bool bit_check(object num, object pos)
+ public static bool Check(object num, object pos)
{
- return (LuaLong(num) & (1 << (LuaInt(pos)))) != 0;
+ return (LuaLong(num) & (1 << LuaInt(pos))) != 0;
}
- public static uint bit_set(object num, object pos)
+ public static uint Set(object num, object pos)
{
- return (uint) (LuaInt(num) | 1 << LuaInt(pos));
+ return (uint)(LuaInt(num) | 1 << LuaInt(pos));
}
- public static uint bit_clear(object num, object pos)
+ public static uint Clear(object num, object pos)
{
- return (uint) (LuaInt(num) & ~(1 << LuaInt(pos)));
+ return (uint)(LuaInt(num) & ~(1 << LuaInt(pos)));
}
- public static uint bit_byteswap_16(object short_)
+ public static uint Byteswap_16(object _short)
{
- return (UInt16)((LuaInt(short_) & 0xFFU) << 8 | (LuaInt(short_) & 0xFF00U) >> 8);
+ return (UInt16)((LuaInt(_short) & 0xFFU) << 8 | (LuaInt(_short) & 0xFF00U) >> 8);
}
- public static uint bit_byteswap_32(object word_)
+ public static uint Byteswap_32(object _dword)
{
- return (LuaUInt(word_) & 0x000000FFU) << 24 | (LuaUInt(word_) & 0x0000FF00U) << 8 |
- (LuaUInt(word_) & 0x00FF0000U) >> 8 | (LuaUInt(word_) & 0xFF000000U) >> 24;
+ return (LuaUInt(_dword) & 0x000000FFU) << 24 | (LuaUInt(_dword) & 0x0000FF00U) << 8 |
+ (LuaUInt(_dword) & 0x00FF0000U) >> 8 | (LuaUInt(_dword) & 0xFF000000U) >> 24;
}
- public static UInt64 bit_byteswap_64(object long_)
+ public static UInt64 Byteswap_64(object _long)
{
- UInt64 value = (UInt64)LuaLong(long_);
+ UInt64 value = (UInt64)LuaLong(_long);
return (value & 0x00000000000000FFUL) << 56 | (value & 0x000000000000FF00UL) << 40 |
(value & 0x0000000000FF0000UL) << 24 | (value & 0x00000000FF000000UL) << 8 |
(value & 0x000000FF00000000UL) >> 8 | (value & 0x0000FF0000000000UL) >> 24 |
diff --git a/BizHawk.Client.Common/lua/LuaLibraryBase.cs b/BizHawk.Client.Common/lua/LuaLibraryBase.cs
index c5ccace66b..a56cc2bc52 100644
--- a/BizHawk.Client.Common/lua/LuaLibraryBase.cs
+++ b/BizHawk.Client.Common/lua/LuaLibraryBase.cs
@@ -1,5 +1,7 @@
using System;
+using System.Reflection;
+using BizHawk.Common;
using LuaInterface;
namespace BizHawk.Client.Common
@@ -25,6 +27,24 @@ namespace BizHawk.Client.Common
}
}
+ // TODO: eventually only use this, and rename it
+ public virtual void LuaRegisterNew(Lua lua, ILuaDocumentation docs = null)
+ {
+ lua.NewTable(Name);
+
+ foreach (var nameLookup in Functions)
+ {
+ var luaMethodName = Name + "." + nameLookup.ToLower();
+ var actualMethodName = GetType().GetMethod(nameLookup);
+ lua.RegisterFunction(luaMethodName, this, actualMethodName);
+
+ if (docs != null)
+ {
+ docs.Add(Name, nameLookup, actualMethodName);
+ }
+ }
+ }
+
protected static int LuaInt(object luaArg)
{
return (int)(double)luaArg;
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
index a5dd40b680..53688d6529 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
@@ -80,7 +80,7 @@ namespace BizHawk.Client.EmuHawk
{
lua.RegisterFunction("print", this, GetType().GetMethod("Print"));
- new BitLuaLibrary().LuaRegister(lua, Docs);
+ new BitLuaLibrary().LuaRegisterNew(lua, Docs);
new MultiClientLuaLibrary(ConsoleLuaLibrary.console_log).LuaRegister(lua, Docs);
new ConsoleLuaLibrary().LuaRegister(lua, Docs);
diff --git a/BizHawk.Common/BizHawk.Common.csproj b/BizHawk.Common/BizHawk.Common.csproj
index 848a4819e0..943c018036 100644
--- a/BizHawk.Common/BizHawk.Common.csproj
+++ b/BizHawk.Common/BizHawk.Common.csproj
@@ -52,7 +52,8 @@
-
+
+
diff --git a/BizHawk.Common/Extensions.cs b/BizHawk.Common/Extensions/Extensions.cs
similarity index 83%
rename from BizHawk.Common/Extensions.cs
rename to BizHawk.Common/Extensions/Extensions.cs
index 7aca8894d1..038605935c 100644
--- a/BizHawk.Common/Extensions.cs
+++ b/BizHawk.Common/Extensions/Extensions.cs
@@ -150,12 +150,6 @@ namespace BizHawk.Common
src.CopyTo(dest);
}
-
- public static bool IsBinary(this string str)
- {
- return str.All(c => c == '0' || c == '1');
- }
-
public static bool Bit(this byte b, int index)
{
return (b & (1 << index)) != 0;
@@ -171,49 +165,6 @@ namespace BizHawk.Common
return (b & (1 << index)) != 0;
}
- public static string GetPrecedingString(this string str, string value)
- {
- int index = str.IndexOf(value);
-
- if (index < 0)
- {
- return null;
- }
- else if (index == 0)
- {
- return String.Empty;
- }
- else
- {
- return str.Substring(0, index);
- }
- }
-
- public static bool In(this string str, params string[] options)
- {
- return options.Any(opt => opt.Equals(str, StringComparison.CurrentCultureIgnoreCase));
- }
-
- public static bool In(this string str, IEnumerable options)
- {
- return options.Any(opt => opt.Equals(str, StringComparison.CurrentCultureIgnoreCase));
- }
-
- public static bool In(this string str, IEnumerable options, Func eval)
- {
- return options.Any(opt => eval(opt, str));
- }
-
- public static bool NotIn(this string str, params string[] options)
- {
- return options.All(opt => opt.ToLower() != str.ToLower());
- }
-
- public static bool NotIn(this string str, IEnumerable options)
- {
- return options.All(opt => opt.ToLower() != str.ToLower());
- }
-
public static bool In(this int i, params int[] options)
{
return options.Any(j => i == j);
@@ -240,12 +191,6 @@ namespace BizHawk.Common
return null;
}
- public static bool IsValidRomExtentsion(this string str, params string[] romExtensions)
- {
- string strUpper = str.ToUpper();
- return romExtensions.Any(ext => strUpper.EndsWith(ext.ToUpper()));
- }
-
public static void SaveAsHex(this byte[] buffer, TextWriter writer)
{
foreach (byte b in buffer)
diff --git a/BizHawk.Common/Extensions/StringExtensions.cs b/BizHawk.Common/Extensions/StringExtensions.cs
new file mode 100644
index 0000000000..9902242a61
--- /dev/null
+++ b/BizHawk.Common/Extensions/StringExtensions.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BizHawk.Common
+{
+ public static class StringExtensions
+ {
+ public static bool IsBinary(this string str)
+ {
+ return str.All(c => c == '0' || c == '1');
+ }
+
+ public static string GetPrecedingString(this string str, string value)
+ {
+ int index = str.IndexOf(value);
+
+ if (index < 0)
+ {
+ return null;
+ }
+ else if (index == 0)
+ {
+ return String.Empty;
+ }
+ else
+ {
+ return str.Substring(0, index);
+ }
+ }
+
+ public static bool IsValidRomExtentsion(this string str, params string[] romExtensions)
+ {
+ var strUpper = str.ToUpper();
+ return romExtensions.Any(ext => strUpper.EndsWith(ext.ToUpper()));
+ }
+
+ public static bool In(this string str, params string[] options)
+ {
+ return options.Any(opt => opt.Equals(str, StringComparison.CurrentCultureIgnoreCase));
+ }
+
+ public static bool In(this string str, IEnumerable options)
+ {
+ return options.Any(opt => opt.Equals(str, StringComparison.CurrentCultureIgnoreCase));
+ }
+
+ public static bool In(this string str, IEnumerable options, Func eval)
+ {
+ return options.Any(opt => eval(opt, str));
+ }
+
+ public static bool NotIn(this string str, params string[] options)
+ {
+ return options.All(opt => opt.ToLower() != str.ToLower());
+ }
+
+ public static bool NotIn(this string str, IEnumerable options)
+ {
+ return options.All(opt => opt.ToLower() != str.ToLower());
+ }
+ }
+}