Commit 2e501577 authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

Fixed gendarme warnings.

parent c84425fd
...@@ -45,7 +45,7 @@ namespace NLua ...@@ -45,7 +45,7 @@ namespace NLua
* Author: Fabio Mascarenhas * Author: Fabio Mascarenhas
* Version: 1.0 * Version: 1.0
*/ */
class CheckType sealed class CheckType
{ {
#if SILVERLIGHT #if SILVERLIGHT
private Dictionary<Type, ExtractValue> extractValues = new Dictionary<Type, ExtractValue>(); private Dictionary<Type, ExtractValue> extractValues = new Dictionary<Type, ExtractValue>();
...@@ -58,48 +58,48 @@ namespace NLua ...@@ -58,48 +58,48 @@ namespace NLua
public CheckType (ObjectTranslator translator) public CheckType (ObjectTranslator translator)
{ {
this.translator = translator; this.translator = translator;
extractValues.Add(getExtractDictionaryKey(typeof(object)), new ExtractValue(getAsObject)); extractValues.Add(GetExtractDictionaryKey(typeof(object)), new ExtractValue(GetAsObject));
extractValues.Add(getExtractDictionaryKey(typeof(sbyte)), new ExtractValue(getAsSbyte)); extractValues.Add(GetExtractDictionaryKey(typeof(sbyte)), new ExtractValue(GetAsSbyte));
extractValues.Add(getExtractDictionaryKey(typeof(byte)), new ExtractValue(getAsByte)); extractValues.Add(GetExtractDictionaryKey(typeof(byte)), new ExtractValue(GetAsByte));
extractValues.Add(getExtractDictionaryKey(typeof(short)), new ExtractValue(getAsShort)); extractValues.Add(GetExtractDictionaryKey(typeof(short)), new ExtractValue(GetAsShort));
extractValues.Add(getExtractDictionaryKey(typeof(ushort)), new ExtractValue(getAsUshort)); extractValues.Add(GetExtractDictionaryKey(typeof(ushort)), new ExtractValue(GetAsUshort));
extractValues.Add(getExtractDictionaryKey(typeof(int)), new ExtractValue(getAsInt)); extractValues.Add(GetExtractDictionaryKey(typeof(int)), new ExtractValue(GetAsInt));
extractValues.Add(getExtractDictionaryKey(typeof(uint)), new ExtractValue(getAsUint)); extractValues.Add(GetExtractDictionaryKey(typeof(uint)), new ExtractValue(GetAsUint));
extractValues.Add(getExtractDictionaryKey(typeof(long)), new ExtractValue(getAsLong)); extractValues.Add(GetExtractDictionaryKey(typeof(long)), new ExtractValue(GetAsLong));
extractValues.Add(getExtractDictionaryKey(typeof(ulong)), new ExtractValue(getAsUlong)); extractValues.Add(GetExtractDictionaryKey(typeof(ulong)), new ExtractValue(GetAsUlong));
extractValues.Add(getExtractDictionaryKey(typeof(double)), new ExtractValue(getAsDouble)); extractValues.Add(GetExtractDictionaryKey(typeof(double)), new ExtractValue(GetAsDouble));
extractValues.Add(getExtractDictionaryKey(typeof(char)), new ExtractValue(getAsChar)); extractValues.Add(GetExtractDictionaryKey(typeof(char)), new ExtractValue(GetAsChar));
extractValues.Add(getExtractDictionaryKey(typeof(float)), new ExtractValue(getAsFloat)); extractValues.Add(GetExtractDictionaryKey(typeof(float)), new ExtractValue(GetAsFloat));
extractValues.Add(getExtractDictionaryKey(typeof(decimal)), new ExtractValue(getAsDecimal)); extractValues.Add(GetExtractDictionaryKey(typeof(decimal)), new ExtractValue(GetAsDecimal));
extractValues.Add(getExtractDictionaryKey(typeof(bool)), new ExtractValue(getAsBoolean)); extractValues.Add(GetExtractDictionaryKey(typeof(bool)), new ExtractValue(GetAsBoolean));
extractValues.Add(getExtractDictionaryKey(typeof(string)), new ExtractValue(getAsString)); extractValues.Add(GetExtractDictionaryKey(typeof(string)), new ExtractValue(GetAsString));
extractValues.Add(getExtractDictionaryKey(typeof(LuaFunction)), new ExtractValue(getAsFunction)); extractValues.Add(GetExtractDictionaryKey(typeof(LuaFunction)), new ExtractValue(GetAsFunction));
extractValues.Add(getExtractDictionaryKey(typeof(LuaTable)), new ExtractValue(getAsTable)); extractValues.Add(GetExtractDictionaryKey(typeof(LuaTable)), new ExtractValue(GetAsTable));
extractValues.Add(getExtractDictionaryKey(typeof(LuaUserData)), new ExtractValue(getAsUserdata)); extractValues.Add(GetExtractDictionaryKey(typeof(LuaUserData)), new ExtractValue(GetAsUserdata));
extractNetObject = new ExtractValue (getAsNetObject); extractNetObject = new ExtractValue (GetAsNetObject);
} }
/* /*
* Checks if the value at Lua stack index stackPos matches paramType, * Checks if the value at Lua stack index stackPos matches paramType,
* returning a conversion function if it does and null otherwise. * returning a conversion function if it does and null otherwise.
*/ */
internal ExtractValue getExtractor (IReflect paramType) internal ExtractValue GetExtractor (IReflect paramType)
{ {
return getExtractor (paramType.UnderlyingSystemType); return GetExtractor (paramType.UnderlyingSystemType);
} }
internal ExtractValue getExtractor (Type paramType) internal ExtractValue GetExtractor (Type paramType)
{ {
if (paramType.IsByRef) if (paramType.IsByRef)
paramType = paramType.GetElementType (); paramType = paramType.GetElementType ();
var extractKey = getExtractDictionaryKey(paramType); var extractKey = GetExtractDictionaryKey(paramType);
return extractValues.ContainsKey(extractKey) ? extractValues[extractKey] : extractNetObject; return extractValues.ContainsKey(extractKey) ? extractValues[extractKey] : extractNetObject;
} }
internal ExtractValue checkType (LuaState luaState, int stackPos, Type paramType) internal ExtractValue CheckLuaType (LuaState luaState, int stackPos, Type paramType)
{ {
var luatype = LuaLib.lua_type (luaState, stackPos); var luatype = LuaLib.LuaType (luaState, stackPos);
if (paramType.IsByRef) if (paramType.IsByRef)
paramType = paramType.GetElementType (); paramType = paramType.GetElementType ();
...@@ -109,7 +109,7 @@ namespace NLua ...@@ -109,7 +109,7 @@ namespace NLua
if (!underlyingType.IsNull ()) if (!underlyingType.IsNull ())
paramType = underlyingType; // Silently convert nullable types to their non null requics paramType = underlyingType; // Silently convert nullable types to their non null requics
var extractKey = getExtractDictionaryKey (paramType); var extractKey = GetExtractDictionaryKey (paramType);
if (paramType.Equals (typeof(object))) if (paramType.Equals (typeof(object)))
return extractValues [extractKey]; return extractValues [extractKey];
...@@ -117,27 +117,27 @@ namespace NLua ...@@ -117,27 +117,27 @@ namespace NLua
//CP: Added support for generic parameters //CP: Added support for generic parameters
if (paramType.IsGenericParameter) { if (paramType.IsGenericParameter) {
if (luatype == LuaTypes.Boolean) if (luatype == LuaTypes.Boolean)
return extractValues [getExtractDictionaryKey (typeof(bool))]; return extractValues [GetExtractDictionaryKey (typeof(bool))];
else if (luatype == LuaTypes.String) else if (luatype == LuaTypes.String)
return extractValues[getExtractDictionaryKey (typeof(string))]; return extractValues[GetExtractDictionaryKey (typeof(string))];
else if (luatype == LuaTypes.Table) else if (luatype == LuaTypes.Table)
return extractValues [getExtractDictionaryKey (typeof(LuaTable))]; return extractValues [GetExtractDictionaryKey (typeof(LuaTable))];
else if (luatype == LuaTypes.UserData) else if (luatype == LuaTypes.UserData)
return extractValues [getExtractDictionaryKey (typeof(object))]; return extractValues [GetExtractDictionaryKey (typeof(object))];
else if (luatype == LuaTypes.Function) else if (luatype == LuaTypes.Function)
return extractValues [getExtractDictionaryKey (typeof(LuaFunction))]; return extractValues [GetExtractDictionaryKey (typeof(LuaFunction))];
else if (luatype == LuaTypes.Number) else if (luatype == LuaTypes.Number)
return extractValues [getExtractDictionaryKey (typeof(double))]; return extractValues [GetExtractDictionaryKey (typeof(double))];
} }
if (LuaLib.lua_isnumber (luaState, stackPos)) if (LuaLib.LuaIsNumber (luaState, stackPos))
return extractValues [extractKey]; return extractValues [extractKey];
if (paramType == typeof(bool)) { if (paramType == typeof(bool)) {
if (LuaLib.lua_isboolean (luaState, stackPos)) if (LuaLib.LuaIsBoolean (luaState, stackPos))
return extractValues [extractKey]; return extractValues [extractKey];
} else if (paramType == typeof(string)) { } else if (paramType == typeof(string)) {
if (LuaLib.lua_isstring (luaState, stackPos)) if (LuaLib.LuaIsString (luaState, stackPos))
return extractValues [extractKey]; return extractValues [extractKey];
else if (luatype == LuaTypes.Nil) else if (luatype == LuaTypes.Nil)
return extractNetObject; // kevinh - silently convert nil to a null string pointer return extractNetObject; // kevinh - silently convert nil to a null string pointer
...@@ -151,22 +151,22 @@ namespace NLua ...@@ -151,22 +151,22 @@ namespace NLua
if (luatype == LuaTypes.Function) if (luatype == LuaTypes.Function)
return extractValues [extractKey]; return extractValues [extractKey];
} else if (typeof(Delegate).IsAssignableFrom (paramType) && luatype == LuaTypes.Function) } else if (typeof(Delegate).IsAssignableFrom (paramType) && luatype == LuaTypes.Function)
return new ExtractValue (new DelegateGenerator (translator, paramType).extractGenerated); return new ExtractValue (new DelegateGenerator (translator, paramType).ExtractGenerated);
else if (paramType.IsInterface && luatype == LuaTypes.Table) else if (paramType.IsInterface && luatype == LuaTypes.Table)
return new ExtractValue (new ClassGenerator (translator, paramType).extractGenerated); return new ExtractValue (new ClassGenerator (translator, paramType).ExtractGenerated);
else if ((paramType.IsInterface || paramType.IsClass) && luatype == LuaTypes.Nil) { else if ((paramType.IsInterface || paramType.IsClass) && luatype == LuaTypes.Nil) {
// kevinh - allow nil to be silently converted to null - extractNetObject will return null when the item ain't found // kevinh - allow nil to be silently converted to null - extractNetObject will return null when the item ain't found
return extractNetObject; return extractNetObject;
} else if (LuaLib.lua_type (luaState, stackPos) == LuaTypes.Table) { } else if (LuaLib.LuaType (luaState, stackPos) == LuaTypes.Table) {
if (LuaLib.luaL_getmetafield (luaState, stackPos, "__index")) { if (LuaLib.LuaLGetMetafield (luaState, stackPos, "__index")) {
object obj = translator.getNetObject (luaState, -1); object obj = translator.GetNetObject (luaState, -1);
LuaLib.lua_settop (luaState, -2); LuaLib.LuaSetTop (luaState, -2);
if (!obj.IsNull () && paramType.IsAssignableFrom (obj.GetType ())) if (!obj.IsNull () && paramType.IsAssignableFrom (obj.GetType ()))
return extractNetObject; return extractNetObject;
} else } else
return null; return null;
} else { } else {
object obj = translator.getNetObject (luaState, stackPos); object obj = translator.GetNetObject (luaState, stackPos);
if (!obj.IsNull () && paramType.IsAssignableFrom (obj.GetType ())) if (!obj.IsNull () && paramType.IsAssignableFrom (obj.GetType ()))
return extractNetObject; return extractNetObject;
} }
...@@ -175,12 +175,12 @@ namespace NLua ...@@ -175,12 +175,12 @@ namespace NLua
} }
#if SILVERLIGHT #if SILVERLIGHT
private Type getExtractDictionaryKey(Type targetType) private Type GetExtractDictionaryKey(Type targetType)
{ {
return targetType; return targetType;
} }
#else #else
private long getExtractDictionaryKey(Type targetType) private long GetExtractDictionaryKey(Type targetType)
{ {
return targetType.TypeHandle.Value.ToInt64(); return targetType.TypeHandle.Value.ToInt64();
} }
...@@ -191,171 +191,171 @@ namespace NLua ...@@ -191,171 +191,171 @@ namespace NLua
* index stackPos as the desired type if it can, or null * index stackPos as the desired type if it can, or null
* otherwise. * otherwise.
*/ */
private object getAsSbyte (LuaState luaState, int stackPos) private object GetAsSbyte (LuaState luaState, int stackPos)
{ {
sbyte retVal = (sbyte)LuaLib.lua_tonumber (luaState, stackPos); sbyte retVal = (sbyte)LuaLib.LuaToNumber (luaState, stackPos);
if (retVal == 0 && !LuaLib.lua_isnumber (luaState, stackPos)) if (retVal == 0 && !LuaLib.LuaIsNumber (luaState, stackPos))
return null; return null;
return retVal; return retVal;
} }
private object getAsByte (LuaState luaState, int stackPos) private object GetAsByte (LuaState luaState, int stackPos)
{ {
byte retVal = (byte)LuaLib.lua_tonumber (luaState, stackPos); byte retVal = (byte)LuaLib.LuaToNumber (luaState, stackPos);
if (retVal == 0 && !LuaLib.lua_isnumber (luaState, stackPos)) if (retVal == 0 && !LuaLib.LuaIsNumber (luaState, stackPos))
return null; return null;
return retVal; return retVal;
} }
private object getAsShort (LuaState luaState, int stackPos) private object GetAsShort (LuaState luaState, int stackPos)
{ {
short retVal = (short)LuaLib.lua_tonumber (luaState, stackPos); short retVal = (short)LuaLib.LuaToNumber (luaState, stackPos);
if (retVal == 0 && !LuaLib.lua_isnumber (luaState, stackPos)) if (retVal == 0 && !LuaLib.LuaIsNumber (luaState, stackPos))
return null; return null;
return retVal; return retVal;
} }
private object getAsUshort (LuaState luaState, int stackPos) private object GetAsUshort (LuaState luaState, int stackPos)
{ {
ushort retVal = (ushort)LuaLib.lua_tonumber (luaState, stackPos); ushort retVal = (ushort)LuaLib.LuaToNumber (luaState, stackPos);
if (retVal == 0 && !LuaLib.lua_isnumber (luaState, stackPos)) if (retVal == 0 && !LuaLib.LuaIsNumber (luaState, stackPos))
return null; return null;
return retVal; return retVal;
} }
private object getAsInt (LuaState luaState, int stackPos) private object GetAsInt (LuaState luaState, int stackPos)
{ {
int retVal = (int)LuaLib.lua_tonumber (luaState, stackPos); int retVal = (int)LuaLib.LuaToNumber (luaState, stackPos);
if (retVal == 0 && !LuaLib.lua_isnumber (luaState, stackPos)) if (retVal == 0 && !LuaLib.LuaIsNumber (luaState, stackPos))
return null; return null;
return retVal; return retVal;
} }
private object getAsUint (LuaState luaState, int stackPos) private object GetAsUint (LuaState luaState, int stackPos)
{ {
uint retVal = (uint)LuaLib.lua_tonumber (luaState, stackPos); uint retVal = (uint)LuaLib.LuaToNumber (luaState, stackPos);
if (retVal == 0 && !LuaLib.lua_isnumber (luaState, stackPos)) if (retVal == 0 && !LuaLib.LuaIsNumber (luaState, stackPos))
return null; return null;
return retVal; return retVal;
} }
private object getAsLong (LuaState luaState, int stackPos) private object GetAsLong (LuaState luaState, int stackPos)
{ {
long retVal = (long)LuaLib.lua_tonumber (luaState, stackPos); long retVal = (long)LuaLib.LuaToNumber (luaState, stackPos);
if (retVal == 0 && !LuaLib.lua_isnumber (luaState, stackPos)) if (retVal == 0 && !LuaLib.LuaIsNumber (luaState, stackPos))
return null; return null;
return retVal; return retVal;
} }
private object getAsUlong (LuaState luaState, int stackPos) private object GetAsUlong (LuaState luaState, int stackPos)
{ {
ulong retVal = (ulong)LuaLib.lua_tonumber (luaState, stackPos); ulong retVal = (ulong)LuaLib.LuaToNumber (luaState, stackPos);
if (retVal == 0 && !LuaLib.lua_isnumber (luaState, stackPos)) if (retVal == 0 && !LuaLib.LuaIsNumber (luaState, stackPos))
return null; return null;
return retVal; return retVal;
} }
private object getAsDouble (LuaState luaState, int stackPos) private object GetAsDouble (LuaState luaState, int stackPos)
{ {
double retVal = LuaLib.lua_tonumber (luaState, stackPos); double retVal = LuaLib.LuaToNumber (luaState, stackPos);
if (retVal == 0 && !LuaLib.lua_isnumber (luaState, stackPos)) if (retVal == 0 && !LuaLib.LuaIsNumber (luaState, stackPos))
return null; return null;
return retVal; return retVal;
} }
private object getAsChar (LuaState luaState, int stackPos) private object GetAsChar (LuaState luaState, int stackPos)
{ {
char retVal = (char)LuaLib.lua_tonumber (luaState, stackPos); char retVal = (char)LuaLib.LuaToNumber (luaState, stackPos);
if (retVal == 0 && !LuaLib.lua_isnumber (luaState, stackPos)) if (retVal == 0 && !LuaLib.LuaIsNumber (luaState, stackPos))
return null; return null;
return retVal; return retVal;
} }
private object getAsFloat (LuaState luaState, int stackPos) private object GetAsFloat (LuaState luaState, int stackPos)
{ {
float retVal = (float)LuaLib.lua_tonumber (luaState, stackPos); float retVal = (float)LuaLib.LuaToNumber (luaState, stackPos);
if (retVal == 0 && !LuaLib.lua_isnumber (luaState, stackPos)) if (retVal == 0 && !LuaLib.LuaIsNumber (luaState, stackPos))
return null; return null;
return retVal; return retVal;
} }
private object getAsDecimal (LuaState luaState, int stackPos) private object GetAsDecimal (LuaState luaState, int stackPos)
{ {
decimal retVal = (decimal)LuaLib.lua_tonumber (luaState, stackPos); decimal retVal = (decimal)LuaLib.LuaToNumber (luaState, stackPos);
if (retVal == 0 && !LuaLib.lua_isnumber (luaState, stackPos)) if (retVal == 0 && !LuaLib.LuaIsNumber (luaState, stackPos))
return null; return null;
return retVal; return retVal;
} }
private object getAsBoolean (LuaState luaState, int stackPos) private object GetAsBoolean (LuaState luaState, int stackPos)
{ {
return LuaLib.lua_toboolean (luaState, stackPos); return LuaLib.LuaToBoolean (luaState, stackPos);
} }
private object getAsString (LuaState luaState, int stackPos) private object GetAsString (LuaState luaState, int stackPos)
{ {
string retVal = LuaLib.lua_tostring (luaState, stackPos).ToString (); string retVal = LuaLib.LuaToString (luaState, stackPos).ToString ();
if (retVal == string.Empty && !LuaLib.lua_isstring (luaState, stackPos)) if (string.IsNullOrEmpty(retVal) && !LuaLib.LuaIsString (luaState, stackPos))
return null; return null;
return retVal; return retVal;
} }
private object getAsTable (LuaState luaState, int stackPos) private object GetAsTable (LuaState luaState, int stackPos)
{ {
return translator.getTable (luaState, stackPos); return translator.GetTable (luaState, stackPos);
} }
private object getAsFunction (LuaState luaState, int stackPos) private object GetAsFunction (LuaState luaState, int stackPos)
{ {
return translator.getFunction (luaState, stackPos); return translator.GetFunction (luaState, stackPos);
} }
private object getAsUserdata (LuaState luaState, int stackPos) private object GetAsUserdata (LuaState luaState, int stackPos)
{ {
return translator.getUserData (luaState, stackPos); return translator.GetUserData (luaState, stackPos);
} }
public object getAsObject (LuaState luaState, int stackPos) public object GetAsObject (LuaState luaState, int stackPos)
{ {
if (LuaLib.lua_type (luaState, stackPos) == LuaTypes.Table) { if (LuaLib.LuaType (luaState, stackPos) == LuaTypes.Table) {
if (LuaLib.luaL_getmetafield (luaState, stackPos, "__index")) { if (LuaLib.LuaLGetMetafield (luaState, stackPos, "__index")) {
if (LuaLib.luaL_checkmetatable (luaState, -1)) { if (LuaLib.LuaLCheckMetatable (luaState, -1)) {
LuaLib.lua_insert (luaState, stackPos); LuaLib.LuaInsert (luaState, stackPos);
LuaLib.lua_remove (luaState, stackPos + 1); LuaLib.LuaRemove (luaState, stackPos + 1);
} else } else
LuaLib.lua_settop (luaState, -2); LuaLib.LuaSetTop (luaState, -2);
} }
} }
object obj = translator.getObject (luaState, stackPos); object obj = translator.GetObject (luaState, stackPos);
return obj; return obj;
} }
public object getAsNetObject (LuaState luaState, int stackPos) public object GetAsNetObject (LuaState luaState, int stackPos)
{ {
object obj = translator.getNetObject (luaState, stackPos); object obj = translator.GetNetObject (luaState, stackPos);
if (obj.IsNull () && LuaLib.lua_type (luaState, stackPos) == LuaTypes.Table) { if (obj.IsNull () && LuaLib.LuaType (luaState, stackPos) == LuaTypes.Table) {
if (LuaLib.luaL_getmetafield (luaState, stackPos, "__index")) { if (LuaLib.LuaLGetMetafield (luaState, stackPos, "__index")) {
if (LuaLib.luaL_checkmetatable (luaState, -1)) { if (LuaLib.LuaLCheckMetatable (luaState, -1)) {
LuaLib.lua_insert (luaState, stackPos); LuaLib.LuaInsert (luaState, stackPos);
LuaLib.lua_remove (luaState, stackPos + 1); LuaLib.LuaRemove (luaState, stackPos + 1);
obj = translator.getNetObject (luaState, stackPos); obj = translator.GetNetObject (luaState, stackPos);
} else } else
LuaLib.lua_settop (luaState, -2); LuaLib.LuaSetTop (luaState, -2);
} }
} }
......
...@@ -46,15 +46,15 @@ namespace NLua ...@@ -46,15 +46,15 @@ namespace NLua
private ObjectTranslator translator; private ObjectTranslator translator;
private Type klass; private Type klass;
public ClassGenerator (ObjectTranslator translator, Type klass) public ClassGenerator (ObjectTranslator objTranslator, Type typeClass)
{ {
this.translator = translator; translator = objTranslator;
this.klass = klass; klass = typeClass;
} }
public object extractGenerated (LuaState luaState, int stackPos) public object ExtractGenerated (LuaState luaState, int stackPos)
{ {
return CodeGeneration.Instance.GetClassInstance (klass, translator.getTable (luaState, stackPos)); return CodeGeneration.Instance.GetClassInstance (klass, translator.GetTable (luaState, stackPos));
} }
} }
} }
\ No newline at end of file
...@@ -67,9 +67,6 @@ namespace NLua ...@@ -67,9 +67,6 @@ namespace NLua
private CodeGeneration () private CodeGeneration ()
{ {
// Create an assembly name // Create an assembly name
assemblyName = new AssemblyName (); assemblyName = new AssemblyName ();
assemblyName.Name = "NLua_generatedcode"; assemblyName.Name = "NLua_generatedcode";
...@@ -78,7 +75,6 @@ namespace NLua ...@@ -78,7 +75,6 @@ namespace NLua
newAssembly = Thread.GetDomain ().DefineDynamicAssembly (assemblyName, AssemblyBuilderAccess.Run); newAssembly = Thread.GetDomain ().DefineDynamicAssembly (assemblyName, AssemblyBuilderAccess.Run);
newModule = newAssembly.DefineDynamicModule ("NLua_generatedcode"); newModule = newAssembly.DefineDynamicModule ("NLua_generatedcode");
#endif #endif
} }
/* /*
......
...@@ -47,15 +47,15 @@ namespace NLua ...@@ -47,15 +47,15 @@ namespace NLua
private Type delegateType; private Type delegateType;
public DelegateGenerator (ObjectTranslator translator, Type delegateType) public DelegateGenerator (ObjectTranslator objectTranslator, Type type)
{ {
this.translator = translator; translator = objectTranslator;
this.delegateType = delegateType; delegateType = type;
} }
public object extractGenerated (LuaState luaState, int stackPos) public object ExtractGenerated (LuaState luaState, int stackPos)
{ {
return CodeGeneration.Instance.GetDelegate (delegateType, translator.getFunction (luaState, stackPos)); return CodeGeneration.Instance.GetDelegate (delegateType, translator.GetFunction (luaState, stackPos));
} }
} }
} }
\ No newline at end of file
...@@ -87,7 +87,7 @@ namespace NLua ...@@ -87,7 +87,7 @@ namespace NLua
private readonly List<string> globals = new List<string> (); private readonly List<string> globals = new List<string> ();
private bool globalsSorted; private bool globalsSorted;
#endregion #endregion
private /*readonly */ LuaState luaState; private LuaState luaState;
/// <summary> /// <summary>
/// True while a script is being executed /// True while a script is being executed
/// </summary> /// </summary>
...@@ -101,7 +101,7 @@ namespace NLua ...@@ -101,7 +101,7 @@ namespace NLua
//private object luaLock = new object(); //private object luaLock = new object();
private bool _StatePassed; private bool _StatePassed;
private bool executing; private bool executing;
static string init_luanet = static string initLuanet =
"local metatable = {} \n" + "local metatable = {} \n" +
"local import_type = luanet.import_type \n" + "local import_type = luanet.import_type \n" +
"local load_assembly = luanet.load_assembly \n" + "local load_assembly = luanet.load_assembly \n" +
...@@ -269,12 +269,12 @@ end ...@@ -269,12 +269,12 @@ end
public Lua () public Lua ()
{ {
luaState = LuaLib.luaL_newstate (); // steffenj: Lua 5.1.1 API change (lua_open is gone) luaState = LuaLib.LuaLNewState (); // steffenj: Lua 5.1.1 API change (lua_open is gone)
LuaLib.luaL_openlibs (luaState); // steffenj: Lua 5.1.1 API change (luaopen_base is gone, just open all libs right here) LuaLib.LuaLOpenLibs (luaState); // steffenj: Lua 5.1.1 API change (luaopen_base is gone, just open all libs right here)
Init (luaState); Init ();
// We need to keep this in a managed reference so the delegate doesn't get garbage collected // We need to keep this in a managed reference so the delegate doesn't get garbage collected
panicCallback = new LuaCore.LuaNativeFunction (PanicCallback); panicCallback = new LuaCore.LuaNativeFunction (PanicCallback);
LuaLib.lua_atpanic (luaState, panicCallback); LuaLib.LuaAtPanic (luaState, panicCallback);
} }
/* /*
...@@ -282,39 +282,39 @@ end ...@@ -282,39 +282,39 @@ end
*/ */
public Lua (LuaState lState) public Lua (LuaState lState)
{ {
LuaLib.lua_pushstring (lState, "LUAINTERFACE LOADED"); LuaLib.LuaPushString (lState, "LUAINTERFACE LOADED");
LuaLib.lua_gettable (lState, (int)LuaIndexes.Registry); LuaLib.LuaGetTable (lState, (int)LuaIndexes.Registry);
if (LuaLib.lua_toboolean (lState, -1)) { if (LuaLib.LuaToBoolean (lState, -1)) {
LuaLib.lua_settop (lState, -2); LuaLib.LuaSetTop (lState, -2);
throw new LuaException ("There is already a NLua.Lua instance associated with this Lua state"); throw new LuaException ("There is already a NLua.Lua instance associated with this Lua state");
} else { } else {
luaState = lState; luaState = lState;
_StatePassed = true; _StatePassed = true;
LuaLib.lua_settop (luaState, -2); LuaLib.LuaSetTop (luaState, -2);
Init (luaState); Init ();
} }
} }
void Init (LuaState luaState) void Init ()
{ {
LuaLib.lua_pushstring (luaState, "LUAINTERFACE LOADED"); LuaLib.LuaPushString (luaState, "LUAINTERFACE LOADED");
LuaLib.lua_pushboolean (luaState, true); LuaLib.LuaPushBoolean (luaState, true);
LuaLib.lua_settable (luaState, (int)LuaIndexes.Registry); LuaLib.LuaSetTable (luaState, (int)LuaIndexes.Registry);
if (_StatePassed == false) { if (_StatePassed == false) {
LuaLib.lua_newtable (luaState); LuaLib.LuaNewTable (luaState);
LuaLib.lua_setglobal (luaState, "luanet"); LuaLib.LuaSetGlobal (luaState, "luanet");
} }
LuaLib.luanet_pushglobaltable (luaState); LuaLib.LuaNetPushGlobalTable (luaState);
LuaLib.lua_getglobal (luaState, "luanet"); LuaLib.LuaGetGlobal (luaState, "luanet");
LuaLib.lua_pushstring (luaState, "getmetatable"); LuaLib.LuaPushString (luaState, "getmetatable");
LuaLib.lua_getglobal (luaState, "getmetatable"); LuaLib.LuaGetGlobal (luaState, "getmetatable");
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
LuaLib.luanet_popglobaltable (luaState); LuaLib.LuaNetPopGlobalTable (luaState);
translator = new ObjectTranslator (this, luaState); translator = new ObjectTranslator (this, luaState);
ObjectTranslatorPool.Instance.Add (luaState, translator); ObjectTranslatorPool.Instance.Add (luaState, translator);
LuaLib.luanet_popglobaltable (luaState); LuaLib.LuaNetPopGlobalTable (luaState);
LuaLib.luaL_dostring (luaState, Lua.init_luanet); LuaLib.LuaLDoString (luaState, Lua.initLuanet);
} }
public void Close () public void Close ()
...@@ -326,7 +326,6 @@ end ...@@ -326,7 +326,6 @@ end
LuaCore.LuaClose (luaState); LuaCore.LuaClose (luaState);
ObjectTranslatorPool.Instance.Remove (luaState); ObjectTranslatorPool.Instance.Remove (luaState);
} }
//luaState = LuaState.Zero; <- suggested by Christopher Cebulski http://luaforge.net/forum/forum.php?thread_id = 44593&forum_id = 146
} }
#if MONOTOUCH #if MONOTOUCH
...@@ -335,7 +334,7 @@ end ...@@ -335,7 +334,7 @@ end
[System.Runtime.InteropServices.AllowReversePInvokeCalls] [System.Runtime.InteropServices.AllowReversePInvokeCalls]
static int PanicCallback (LuaState luaState) static int PanicCallback (LuaState luaState)
{ {
string reason = string.Format ("unprotected error in call to Lua API ({0})", LuaLib.lua_tostring (luaState, -1)); string reason = string.Format ("unprotected error in call to Lua API ({0})", LuaLib.LuaToString (luaState, -1));
throw new LuaException (reason); throw new LuaException (reason);
} }
...@@ -345,8 +344,8 @@ end ...@@ -345,8 +344,8 @@ end
/// <exception cref = "LuaScriptException">Thrown if the script caused an exception</exception> /// <exception cref = "LuaScriptException">Thrown if the script caused an exception</exception>
private void ThrowExceptionFromError (int oldTop) private void ThrowExceptionFromError (int oldTop)
{ {
object err = translator.getObject (luaState, -1); object err = translator.GetObject (luaState, -1);
LuaLib.lua_settop (luaState, oldTop); LuaLib.LuaSetTop (luaState, oldTop);
// A pre-wrapped exception - just rethrow it (stack trace of InnerException will be preserved) // A pre-wrapped exception - just rethrow it (stack trace of InnerException will be preserved)
var luaEx = err as LuaScriptException; var luaEx = err as LuaScriptException;
...@@ -371,8 +370,8 @@ end ...@@ -371,8 +370,8 @@ end
var caughtExcept = e; var caughtExcept = e;
if (!caughtExcept.IsNull ()) { if (!caughtExcept.IsNull ()) {
translator.throwError (luaState, caughtExcept); translator.ThrowError (luaState, caughtExcept);
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
return 1; return 1;
} else } else
return 0; return 0;
...@@ -386,18 +385,18 @@ end ...@@ -386,18 +385,18 @@ end
/// <returns></returns> /// <returns></returns>
public LuaFunction LoadString (string chunk, string name) public LuaFunction LoadString (string chunk, string name)
{ {
int oldTop = LuaLib.lua_gettop (luaState); int oldTop = LuaLib.LuaGetTop (luaState);
executing = true; executing = true;
try { try {
if (LuaLib.luaL_loadbuffer (luaState, chunk, name) != 0) if (LuaLib.LuaLLoadBuffer (luaState, chunk, name) != 0)
ThrowExceptionFromError (oldTop); ThrowExceptionFromError (oldTop);
} finally { } finally {
executing = false; executing = false;
} }
var result = translator.getFunction (luaState, -1); var result = translator.GetFunction (luaState, -1);
translator.popValues (luaState, oldTop); translator.PopValues (luaState, oldTop);
return result; return result;
} }
...@@ -409,18 +408,18 @@ end ...@@ -409,18 +408,18 @@ end
/// <returns></returns> /// <returns></returns>
public LuaFunction LoadString (byte[] chunk, string name) public LuaFunction LoadString (byte[] chunk, string name)
{ {
int oldTop = LuaLib.lua_gettop (luaState); int oldTop = LuaLib.LuaGetTop (luaState);
executing = true; executing = true;
try { try {
if (LuaLib.luaL_loadbuffer (luaState, chunk, name) != 0) if (LuaLib.LuaLLoadBuffer (luaState, chunk, name) != 0)
ThrowExceptionFromError (oldTop); ThrowExceptionFromError (oldTop);
} finally { } finally {
executing = false; executing = false;
} }
var result = translator.getFunction (luaState, -1); var result = translator.GetFunction (luaState, -1);
translator.popValues (luaState, oldTop); translator.PopValues (luaState, oldTop);
return result; return result;
} }
...@@ -431,13 +430,13 @@ end ...@@ -431,13 +430,13 @@ end
/// <returns></returns> /// <returns></returns>
public LuaFunction LoadFile (string fileName) public LuaFunction LoadFile (string fileName)
{ {
int oldTop = LuaLib.lua_gettop (luaState); int oldTop = LuaLib.LuaGetTop (luaState);
if (LuaLib.luaL_loadfile (luaState, fileName) != 0) if (LuaLib.LuaLLoadFile (luaState, fileName) != 0)
ThrowExceptionFromError (oldTop); ThrowExceptionFromError (oldTop);
var result = translator.getFunction (luaState, -1); var result = translator.GetFunction (luaState, -1);
translator.popValues (luaState, oldTop); translator.PopValues (luaState, oldTop);
return result; return result;
} }
...@@ -447,17 +446,17 @@ end ...@@ -447,17 +446,17 @@ end
/// <param name = "chunk">Chunk to execute</param> /// <param name = "chunk">Chunk to execute</param>
/// <param name = "chunkName">Name to associate with the chunk. Defaults to "chunk".</param> /// <param name = "chunkName">Name to associate with the chunk. Defaults to "chunk".</param>
/// <returns></returns> /// <returns></returns>
public object[] DoString(byte[] chunk, string chunkName = "chunk") public object[] DoString (byte[] chunk, string chunkName = "chunk")
{ {
int oldTop = LuaLib.lua_gettop(luaState); int oldTop = LuaLib.LuaGetTop(luaState);
executing = true; executing = true;
if (LuaLib.luaL_loadbuffer(luaState, chunk, chunkName) == 0) if (LuaLib.LuaLLoadBuffer(luaState, chunk, chunkName) == 0)
{ {
try try
{ {
if (LuaLib.lua_pcall(luaState, 0, -1, 0) == 0) if (LuaLib.LuaPCall(luaState, 0, -1, 0) == 0)
return translator.popValues(luaState, oldTop); return translator.PopValues(luaState, oldTop);
else else
ThrowExceptionFromError(oldTop); ThrowExceptionFromError(oldTop);
} }
...@@ -478,17 +477,17 @@ end ...@@ -478,17 +477,17 @@ end
/// <param name = "chunk">Chunk to execute</param> /// <param name = "chunk">Chunk to execute</param>
/// <param name = "chunkName">Name to associate with the chunk. Defaults to "chunk".</param> /// <param name = "chunkName">Name to associate with the chunk. Defaults to "chunk".</param>
/// <returns></returns> /// <returns></returns>
public object[] DoString(string chunk, string chunkName = "chunk") public object[] DoString (string chunk, string chunkName = "chunk")
{ {
int oldTop = LuaLib.lua_gettop(luaState); int oldTop = LuaLib.LuaGetTop(luaState);
executing = true; executing = true;
if (LuaLib.luaL_loadbuffer(luaState, chunk, chunkName) == 0) if (LuaLib.LuaLLoadBuffer(luaState, chunk, chunkName) == 0)
{ {
try try
{ {
if (LuaLib.lua_pcall(luaState, 0, -1, 0) == 0) if (LuaLib.LuaPCall(luaState, 0, -1, 0) == 0)
return translator.popValues(luaState, oldTop); return translator.PopValues(luaState, oldTop);
else else
ThrowExceptionFromError(oldTop); ThrowExceptionFromError(oldTop);
} }
...@@ -509,14 +508,14 @@ end ...@@ -509,14 +508,14 @@ end
*/ */
public object[] DoFile (string fileName) public object[] DoFile (string fileName)
{ {
int oldTop = LuaLib.lua_gettop (luaState); int oldTop = LuaLib.LuaGetTop (luaState);
if (LuaLib.luaL_loadfile (luaState, fileName) == 0) { if (LuaLib.LuaLLoadFile (luaState, fileName) == 0) {
executing = true; executing = true;
try { try {
if (LuaLib.lua_pcall (luaState, 0, -1, 0) == 0) if (LuaLib.LuaPCall (luaState, 0, -1, 0) == 0)
return translator.popValues (luaState, oldTop); return translator.PopValues (luaState, oldTop);
else else
ThrowExceptionFromError (oldTop); ThrowExceptionFromError (oldTop);
} finally { } finally {
...@@ -536,35 +535,35 @@ end ...@@ -536,35 +535,35 @@ end
public object this [string fullPath] { public object this [string fullPath] {
get { get {
object returnValue = null; object returnValue = null;
int oldTop = LuaLib.lua_gettop (luaState); int oldTop = LuaLib.LuaGetTop (luaState);
string[] path = fullPath.Split (new char[] { '.' }); string[] path = fullPath.Split (new char[] { '.' });
LuaLib.lua_getglobal (luaState, path [0]); LuaLib.LuaGetGlobal (luaState, path [0]);
returnValue = translator.getObject (luaState, -1); returnValue = translator.GetObject (luaState, -1);
if (path.Length > 1) { if (path.Length > 1) {
string[] remainingPath = new string[path.Length - 1]; string[] remainingPath = new string[path.Length - 1];
Array.Copy (path, 1, remainingPath, 0, path.Length - 1); Array.Copy (path, 1, remainingPath, 0, path.Length - 1);
returnValue = getObject (remainingPath); returnValue = GetObject (remainingPath);
} }
LuaLib.lua_settop (luaState, oldTop); LuaLib.LuaSetTop (luaState, oldTop);
return returnValue; return returnValue;
} }
set { set {
int oldTop = LuaLib.lua_gettop (luaState); int oldTop = LuaLib.LuaGetTop (luaState);
string[] path = fullPath.Split (new char[] { '.' }); string[] path = fullPath.Split (new char[] { '.' });
if (path.Length == 1) { if (path.Length == 1) {
translator.push (luaState, value); translator.Push (luaState, value);
LuaLib.lua_setglobal (luaState, fullPath); LuaLib.LuaSetGlobal (luaState, fullPath);
} else { } else {
LuaLib.lua_getglobal (luaState, path [0]); LuaLib.LuaGetGlobal (luaState, path [0]);
string[] remainingPath = new string[path.Length - 1]; string[] remainingPath = new string[path.Length - 1];
Array.Copy (path, 1, remainingPath, 0, path.Length - 1); Array.Copy (path, 1, remainingPath, 0, path.Length - 1);
setObject (remainingPath, value); SetObject (remainingPath, value);
} }
LuaLib.lua_settop (luaState, oldTop); LuaLib.LuaSetTop (luaState, oldTop);
// Globals auto-complete // Globals auto-complete
if (value.IsNull ()) { if (value.IsNull ()) {
...@@ -573,7 +572,7 @@ end ...@@ -573,7 +572,7 @@ end
} else { } else {
// Add new entries // Add new entries
if (!globals.Contains (fullPath)) if (!globals.Contains (fullPath))
registerGlobal (fullPath, value.GetType (), 0); RegisterGlobal (fullPath, value.GetType (), 0);
} }
} }
} }
...@@ -585,7 +584,7 @@ end ...@@ -585,7 +584,7 @@ end
/// <param name = "path">The index accessor path ot the entry</param> /// <param name = "path">The index accessor path ot the entry</param>
/// <param name = "type">The type of the entry</param> /// <param name = "type">The type of the entry</param>
/// <param name = "recursionCounter">How deep have we gone with recursion?</param> /// <param name = "recursionCounter">How deep have we gone with recursion?</param>
private void registerGlobal (string path, Type type, int recursionCounter) private void RegisterGlobal (string path, Type type, int recursionCounter)
{ {
// If the type is a global method, list it directly // If the type is a global method, list it directly
if (type == typeof(LuaCore.LuaNativeFunction)) { if (type == typeof(LuaCore.LuaNativeFunction)) {
...@@ -625,7 +624,7 @@ end ...@@ -625,7 +624,7 @@ end
(field.GetCustomAttributes (typeof(LuaHideAttribute), false).Length == 0) && (field.GetCustomAttributes (typeof(LuaHideAttribute), false).Length == 0) &&
(field.GetCustomAttributes (typeof(LuaGlobalAttribute), false).Length == 0)) { (field.GetCustomAttributes (typeof(LuaGlobalAttribute), false).Length == 0)) {
// Go into recursion for members // Go into recursion for members
registerGlobal (path + "." + field.Name, field.FieldType, recursionCounter + 1); RegisterGlobal (path + "." + field.Name, field.FieldType, recursionCounter + 1);
} }
} }
#endregion #endregion
...@@ -639,7 +638,7 @@ end ...@@ -639,7 +638,7 @@ end
// Exclude some generic .NET properties that wouldn't be very usefull in Lua // Exclude some generic .NET properties that wouldn't be very usefull in Lua
&& property.Name != "Item") { && property.Name != "Item") {
// Go into recursion for members // Go into recursion for members
registerGlobal (path + "." + property.Name, property.PropertyType, recursionCounter + 1); RegisterGlobal (path + "." + property.Name, property.PropertyType, recursionCounter + 1);
} }
} }
#endregion #endregion
...@@ -655,14 +654,14 @@ end ...@@ -655,14 +654,14 @@ end
* Navigates a table in the top of the stack, returning * Navigates a table in the top of the stack, returning
* the value of the specified field * the value of the specified field
*/ */
internal object getObject (string[] remainingPath) internal object GetObject (string[] remainingPath)
{ {
object returnValue = null; object returnValue = null;
for (int i = 0; i < remainingPath.Length; i++) { for (int i = 0; i < remainingPath.Length; i++) {
LuaLib.lua_pushstring (luaState, remainingPath [i]); LuaLib.LuaPushString (luaState, remainingPath [i]);
LuaLib.lua_gettable (luaState, -2); LuaLib.LuaGetTable (luaState, -2);
returnValue = translator.getObject (luaState, -1); returnValue = translator.GetObject (luaState, -1);
if (returnValue.IsNull ()) if (returnValue.IsNull ())
break; break;
...@@ -729,7 +728,7 @@ end ...@@ -729,7 +728,7 @@ end
public void LoadCLRPackage () public void LoadCLRPackage ()
{ {
LuaLib.luaL_dostring (luaState, Lua.clr_package); LuaLib.LuaLDoString (luaState, Lua.clr_package);
} }
/* /*
* Gets a function global variable as a delegate of * Gets a function global variable as a delegate of
...@@ -744,9 +743,9 @@ end ...@@ -744,9 +743,9 @@ end
* Calls the object as a function with the provided arguments, * Calls the object as a function with the provided arguments,
* returning the function's returned values inside an array * returning the function's returned values inside an array
*/ */
internal object[] callFunction (object function, object[] args) internal object[] CallFunction (object function, object[] args)
{ {
return callFunction (function, args, null); return CallFunction (function, args, null);
} }
/* /*
...@@ -754,49 +753,49 @@ end ...@@ -754,49 +753,49 @@ end
* casting returned values to the types in returnTypes before returning * casting returned values to the types in returnTypes before returning
* them in an array * them in an array
*/ */
internal object[] callFunction (object function, object[] args, Type[] returnTypes) internal object[] CallFunction (object function, object[] args, Type[] returnTypes)
{ {
int nArgs = 0; int nArgs = 0;
int oldTop = LuaLib.lua_gettop (luaState); int oldTop = LuaLib.LuaGetTop (luaState);
if (!LuaLib.lua_checkstack (luaState, args.Length + 6)) if (!LuaLib.LuaCheckStack (luaState, args.Length + 6))
throw new LuaException ("Lua stack overflow"); throw new LuaException ("Lua stack overflow");
translator.push (luaState, function); translator.Push (luaState, function);
if (!args.IsNull ()) { if (!args.IsNull ()) {
nArgs = args.Length; nArgs = args.Length;
for (int i = 0; i < args.Length; i++) for (int i = 0; i < args.Length; i++)
translator.push (luaState, args [i]); translator.Push (luaState, args [i]);
} }
executing = true; executing = true;
try { try {
int error = LuaLib.lua_pcall (luaState, nArgs, -1, 0); int error = LuaLib.LuaPCall (luaState, nArgs, -1, 0);
if (error != 0) if (error != 0)
ThrowExceptionFromError (oldTop); ThrowExceptionFromError (oldTop);
} finally { } finally {
executing = false; executing = false;
} }
return !returnTypes.IsNull () ? translator.popValues (luaState, oldTop, returnTypes) : translator.popValues (luaState, oldTop); return !returnTypes.IsNull () ? translator.PopValues (luaState, oldTop, returnTypes) : translator.PopValues (luaState, oldTop);
} }
/* /*
* Navigates a table to set the value of one of its fields * Navigates a table to set the value of one of its fields
*/ */
internal void setObject (string[] remainingPath, object val) internal void SetObject (string[] remainingPath, object val)
{ {
for (int i = 0; i < remainingPath.Length-1; i++) { for (int i = 0; i < remainingPath.Length-1; i++) {
LuaLib.lua_pushstring (luaState, remainingPath [i]); LuaLib.LuaPushString (luaState, remainingPath [i]);
LuaLib.lua_gettable (luaState, -2); LuaLib.LuaGetTable (luaState, -2);
} }
LuaLib.lua_pushstring (luaState, remainingPath [remainingPath.Length - 1]); LuaLib.LuaPushString (luaState, remainingPath [remainingPath.Length - 1]);
translator.push (luaState, val); translator.Push (luaState, val);
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
} }
/* /*
...@@ -806,40 +805,40 @@ end ...@@ -806,40 +805,40 @@ end
public void NewTable (string fullPath) public void NewTable (string fullPath)
{ {
string[] path = fullPath.Split (new char[] { '.' }); string[] path = fullPath.Split (new char[] { '.' });
int oldTop = LuaLib.lua_gettop (luaState); int oldTop = LuaLib.LuaGetTop (luaState);
if (path.Length == 1) { if (path.Length == 1) {
LuaLib.lua_newtable (luaState); LuaLib.LuaNewTable (luaState);
LuaLib.lua_setglobal (luaState, fullPath); LuaLib.LuaSetGlobal (luaState, fullPath);
} else { } else {
LuaLib.lua_getglobal (luaState, path [0]); LuaLib.LuaGetGlobal (luaState, path [0]);
for (int i = 1; i < path.Length-1; i++) { for (int i = 1; i < path.Length-1; i++) {
LuaLib.lua_pushstring (luaState, path [i]); LuaLib.LuaPushString (luaState, path [i]);
LuaLib.lua_gettable (luaState, -2); LuaLib.LuaGetTable (luaState, -2);
} }
LuaLib.lua_pushstring (luaState, path [path.Length - 1]); LuaLib.LuaPushString (luaState, path [path.Length - 1]);
LuaLib.lua_newtable (luaState); LuaLib.LuaNewTable (luaState);
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
} }
LuaLib.lua_settop (luaState, oldTop); LuaLib.LuaSetTop (luaState, oldTop);
} }
public Dictionary<object, object> GetTableDict (LuaTable table) public Dictionary<object, object> GetTableDict (LuaTable table)
{ {
var dict = new Dictionary<object, object> (); var dict = new Dictionary<object, object> ();
int oldTop = LuaLib.lua_gettop (luaState); int oldTop = LuaLib.LuaGetTop (luaState);
translator.push (luaState, table); translator.Push (luaState, table);
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
while (LuaLib.lua_next(luaState, -2) != 0) { while (LuaLib.LuaNext(luaState, -2) != 0) {
dict [translator.getObject (luaState, -2)] = translator.getObject (luaState, -1); dict [translator.GetObject (luaState, -2)] = translator.GetObject (luaState, -1);
LuaLib.lua_settop (luaState, -2); LuaLib.LuaSetTop (luaState, -2);
} }
LuaLib.lua_settop (luaState, oldTop); LuaLib.LuaSetTop (luaState, oldTop);
return dict; return dict;
} }
...@@ -1034,8 +1033,8 @@ end ...@@ -1034,8 +1033,8 @@ end
/// <author>Reinhard Ostermeier</author> /// <author>Reinhard Ostermeier</author>
public object Pop () public object Pop ()
{ {
int top = LuaLib.lua_gettop (luaState); int top = LuaLib.LuaGetTop (luaState);
return translator.popValues (luaState, top - 1) [0]; return translator.PopValues (luaState, top - 1) [0];
} }
/// <summary> /// <summary>
...@@ -1045,40 +1044,40 @@ end ...@@ -1045,40 +1044,40 @@ end
/// <author>Reinhard Ostermeier</author> /// <author>Reinhard Ostermeier</author>
public void Push (object value) public void Push (object value)
{ {
translator.push (luaState, value); translator.Push (luaState, value);
} }
#endregion #endregion
internal void dispose (int reference) internal void DisposeInternal (int reference)
{ {
if (!luaState.IsNull ()) //Fix submitted by Qingrui Li if (!luaState.IsNull ()) //Fix submitted by Qingrui Li
LuaLib.lua_unref (luaState, reference); LuaLib.LuaUnref (luaState, reference);
} }
/* /*
* Gets a field of the table corresponding to the provided reference * Gets a field of the table corresponding to the provided reference
* using rawget (do not use metatables) * using rawget (do not use metatables)
*/ */
internal object rawGetObject (int reference, string field) internal object RawGetObject (int reference, string field)
{ {
int oldTop = LuaLib.lua_gettop (luaState); int oldTop = LuaLib.LuaGetTop (luaState);
LuaLib.lua_getref (luaState, reference); LuaLib.LuaGetRef (luaState, reference);
LuaLib.lua_pushstring (luaState, field); LuaLib.LuaPushString (luaState, field);
LuaLib.lua_rawget (luaState, -2); LuaLib.LuaRawGet (luaState, -2);
object obj = translator.getObject (luaState, -1); object obj = translator.GetObject (luaState, -1);
LuaLib.lua_settop (luaState, oldTop); LuaLib.LuaSetTop (luaState, oldTop);
return obj; return obj;
} }
/* /*
* Gets a field of the table or userdata corresponding to the provided reference * Gets a field of the table or userdata corresponding to the provided reference
*/ */
internal object getObject (int reference, string field) internal object GetObject (int reference, string field)
{ {
int oldTop = LuaLib.lua_gettop (luaState); int oldTop = LuaLib.LuaGetTop (luaState);
LuaLib.lua_getref (luaState, reference); LuaLib.LuaGetRef (luaState, reference);
object returnValue = getObject (field.Split (new char[] {'.'})); object returnValue = GetObject (field.Split (new char[] {'.'}));
LuaLib.lua_settop (luaState, oldTop); LuaLib.LuaSetTop (luaState, oldTop);
return returnValue; return returnValue;
} }
...@@ -1086,14 +1085,14 @@ end ...@@ -1086,14 +1085,14 @@ end
* Gets a numeric field of the table or userdata corresponding the the provided reference * Gets a numeric field of the table or userdata corresponding the the provided reference
*/ */
internal object getObject (int reference, object field) internal object GetObject (int reference, object field)
{ {
int oldTop = LuaLib.lua_gettop (luaState); int oldTop = LuaLib.LuaGetTop (luaState);
LuaLib.lua_getref (luaState, reference); LuaLib.LuaGetRef (luaState, reference);
translator.push (luaState, field); translator.Push (luaState, field);
LuaLib.lua_gettable (luaState, -2); LuaLib.LuaGetTable (luaState, -2);
object returnValue = translator.getObject (luaState, -1); object returnValue = translator.GetObject (luaState, -1);
LuaLib.lua_settop (luaState, oldTop); LuaLib.LuaSetTop (luaState, oldTop);
return returnValue; return returnValue;
} }
...@@ -1101,26 +1100,26 @@ end ...@@ -1101,26 +1100,26 @@ end
* Sets a field of the table or userdata corresponding the the provided reference * Sets a field of the table or userdata corresponding the the provided reference
* to the provided value * to the provided value
*/ */
internal void setObject (int reference, string field, object val) internal void SetObject (int reference, string field, object val)
{ {
int oldTop = LuaLib.lua_gettop (luaState); int oldTop = LuaLib.LuaGetTop (luaState);
LuaLib.lua_getref (luaState, reference); LuaLib.LuaGetRef (luaState, reference);
setObject (field.Split (new char[] {'.'}), val); SetObject (field.Split (new char[] {'.'}), val);
LuaLib.lua_settop (luaState, oldTop); LuaLib.LuaSetTop (luaState, oldTop);
} }
/* /*
* Sets a numeric field of the table or userdata corresponding the the provided reference * Sets a numeric field of the table or userdata corresponding the the provided reference
* to the provided value * to the provided value
*/ */
internal void setObject (int reference, object field, object val) internal void SetObject (int reference, object field, object val)
{ {
int oldTop = LuaLib.lua_gettop (luaState); int oldTop = LuaLib.LuaGetTop (luaState);
LuaLib.lua_getref (luaState, reference); LuaLib.LuaGetRef (luaState, reference);
translator.push (luaState, field); translator.Push (luaState, field);
translator.push (luaState, val); translator.Push (luaState, val);
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
LuaLib.lua_settop (luaState, oldTop); LuaLib.LuaSetTop (luaState, oldTop);
} }
public LuaFunction RegisterFunction (string path,MethodBase function /*MethodInfo function*/) public LuaFunction RegisterFunction (string path,MethodBase function /*MethodInfo function*/)
...@@ -1135,31 +1134,31 @@ end ...@@ -1135,31 +1134,31 @@ end
public LuaFunction RegisterFunction (string path, object target, MethodBase function /*MethodInfo function*/) //CP: Fix for struct constructor by Alexander Kappner (link: http://luaforge.net/forum/forum.php?thread_id = 2859&forum_id = 145) public LuaFunction RegisterFunction (string path, object target, MethodBase function /*MethodInfo function*/) //CP: Fix for struct constructor by Alexander Kappner (link: http://luaforge.net/forum/forum.php?thread_id = 2859&forum_id = 145)
{ {
// We leave nothing on the stack when we are done // We leave nothing on the stack when we are done
int oldTop = LuaLib.lua_gettop (luaState); int oldTop = LuaLib.LuaGetTop (luaState);
var wrapper = new LuaMethodWrapper (translator, target, function.DeclaringType, function); var wrapper = new LuaMethodWrapper (translator, target, function.DeclaringType, function);
translator.push (luaState, new LuaCore.LuaNativeFunction (wrapper.invokeFunction)); translator.Push (luaState, new LuaCore.LuaNativeFunction (wrapper.invokeFunction));
this [path] = translator.getObject (luaState, -1); this [path] = translator.GetObject (luaState, -1);
var f = GetFunction (path); var f = GetFunction (path);
LuaLib.lua_settop (luaState, oldTop); LuaLib.LuaSetTop (luaState, oldTop);
return f; return f;
} }
/* /*
* Compares the two values referenced by ref1 and ref2 for equality * Compares the two values referenced by ref1 and ref2 for equality
*/ */
internal bool compareRef (int ref1, int ref2) internal bool CompareRef (int ref1, int ref2)
{ {
int top = LuaLib.lua_gettop (luaState); int top = LuaLib.LuaGetTop (luaState);
LuaLib.lua_getref (luaState, ref1); LuaLib.LuaGetRef (luaState, ref1);
LuaLib.lua_getref (luaState, ref2); LuaLib.LuaGetRef (luaState, ref2);
int equal = LuaLib.lua_equal (luaState, -1, -2); int equal = LuaLib.LuaEqual (luaState, -1, -2);
LuaLib.lua_settop (luaState, top); LuaLib.LuaSetTop (luaState, top);
return (equal != 0); return (equal != 0);
} }
internal void pushCSFunction (LuaCore.LuaNativeFunction function) internal void PushCSFunction (LuaCore.LuaNativeFunction function)
{ {
translator.pushFunction (luaState, function); translator.PushFunction (luaState, function);
} }
#region IDisposable Members #region IDisposable Members
......
...@@ -58,7 +58,7 @@ namespace NLua ...@@ -58,7 +58,7 @@ namespace NLua
if (!_Disposed) { if (!_Disposed) {
if (disposeManagedResources) { if (disposeManagedResources) {
if (_Reference != 0) if (_Reference != 0)
_Interpreter.dispose (_Reference); _Interpreter.DisposeInternal (_Reference);
} }
_Interpreter = null; _Interpreter = null;
...@@ -70,7 +70,7 @@ namespace NLua ...@@ -70,7 +70,7 @@ namespace NLua
{ {
if (o is LuaBase) { if (o is LuaBase) {
var l = (LuaBase)o; var l = (LuaBase)o;
return _Interpreter.compareRef (l._Reference, _Reference); return _Interpreter.CompareRef (l._Reference, _Reference);
} else } else
return false; return false;
} }
......
...@@ -59,9 +59,9 @@ namespace NLua ...@@ -59,9 +59,9 @@ namespace NLua
* Calls the function casting return values to the types * Calls the function casting return values to the types
* in returnTypes * in returnTypes
*/ */
internal object[] call (object[] args, Type[] returnTypes) internal object[] Call (object[] args, Type[] returnTypes)
{ {
return _Interpreter.callFunction (this, args, returnTypes); return _Interpreter.CallFunction (this, args, returnTypes);
} }
/* /*
...@@ -70,18 +70,18 @@ namespace NLua ...@@ -70,18 +70,18 @@ namespace NLua
*/ */
public object[] Call (params object[] args) public object[] Call (params object[] args)
{ {
return _Interpreter.callFunction (this, args); return _Interpreter.CallFunction (this, args);
} }
/* /*
* Pushes the function into the Lua stack * Pushes the function into the Lua stack
*/ */
internal void push (LuaState luaState) internal void Push (LuaState luaState)
{ {
if (_Reference != 0) if (_Reference != 0)
LuaLib.lua_getref (luaState, _Reference); LuaLib.LuaGetRef (luaState, _Reference);
else else
_Interpreter.pushCSFunction (function); _Interpreter.PushCSFunction (function);
} }
public override string ToString () public override string ToString ()
...@@ -95,7 +95,7 @@ namespace NLua ...@@ -95,7 +95,7 @@ namespace NLua
var l = (LuaFunction)o; var l = (LuaFunction)o;
if (this._Reference != 0 && l._Reference != 0) if (this._Reference != 0 && l._Reference != 0)
return _Interpreter.compareRef (l._Reference, this._Reference); return _Interpreter.CompareRef (l._Reference, this._Reference);
else else
return this.function == l.function; return this.function == l.function;
} else } else
......
...@@ -39,6 +39,7 @@ namespace NLua ...@@ -39,6 +39,7 @@ namespace NLua
public class LuaIndexes public class LuaIndexes
{ {
static int registryIndex = 0; static int registryIndex = 0;
public static int Registry { public static int Registry {
get get
{ {
......
...@@ -42,95 +42,80 @@ namespace NLua ...@@ -42,95 +42,80 @@ namespace NLua
public class LuaLib public class LuaLib
{ {
// steffenj: BEGIN additional Lua API functions new in Lua 5.1 public static int LuaGC (LuaState luaState, GCOptions what, int data)
public static int lua_gc (LuaState luaState, GCOptions what, int data)
{ {
return LuaCore.LuaGC (luaState, (int)what, data); return LuaCore.LuaGC (luaState, (int)what, data);
} }
public static string lua_typename (LuaState luaState, LuaTypes type) public static string LuaTypeName (LuaState luaState, LuaTypes type)
{ {
return LuaCore.LuaTypeName (luaState, (int)type).ToString (); return LuaCore.LuaTypeName (luaState, (int)type).ToString ();
} }
public static string luaL_typename (LuaState luaState, int stackPos) public static string LuaLTypeName (LuaState luaState, int stackPos)
{ {
return lua_typename (luaState, lua_type (luaState, stackPos)); return LuaTypeName (luaState, LuaType (luaState, stackPos));
} }
public static void luaL_error (LuaState luaState, string message) public static void LuaLError (LuaState luaState, string message)
{ {
LuaCore.LuaLError (luaState, message); LuaCore.LuaLError (luaState, message);
} }
public static void luaL_where (LuaState luaState, int level) public static void LuaLWhere (LuaState luaState, int level)
{ {
LuaCore.LuaLWhere (luaState, level); LuaCore.LuaLWhere (luaState, level);
} }
// steffenj: BEGIN Lua 5.1.1 API change (lua_open replaced by luaL_newstate) public static LuaState LuaLNewState ()
public static LuaState luaL_newstate ()
{ {
return LuaCore.LuaLNewState (); return LuaCore.LuaLNewState ();
} }
// steffenj: BEGIN Lua 5.1.1 API change (new function luaL_openlibs) public static void LuaLOpenLibs (LuaState luaState)
public static void luaL_openlibs (LuaState luaState)
{ {
LuaCore.LuaLOpenLibs (luaState); LuaCore.LuaLOpenLibs (luaState);
} }
// steffenj: END Lua 5.1.1 API change (lua_strlen is now lua_objlen) public static int LuaLLoadString (LuaState luaState, string chunk)
// steffenj: BEGIN Lua 5.1.1 API change (lua_dostring is now a macro luaL_dostring)
public static int luaL_loadstring (LuaState luaState, string chunk)
{ {
return LuaCore.LuaLLoadString (luaState, chunk); return LuaCore.LuaLLoadString (luaState, chunk);
} }
public static int luaL_loadstring (LuaState luaState, byte[] chunk) public static int LuaLLoadString (LuaState luaState, byte[] chunk)
{ {
return LuaCore.LuaLLoadString (luaState, chunk); return LuaCore.LuaLLoadString (luaState, chunk);
} }
public static int luaL_dostring (LuaState luaState, string chunk) public static int LuaLDoString (LuaState luaState, string chunk)
{ {
int result = luaL_loadstring (luaState, chunk); int result = LuaLLoadString (luaState, chunk);
if (result != 0) if (result != 0)
return result; return result;
return lua_pcall (luaState, 0, -1, 0); return LuaPCall (luaState, 0, -1, 0);
} }
public static int luaL_dostring (LuaState luaState, byte[] chunk) public static int LuaLDoString (LuaState luaState, byte[] chunk)
{ {
int result = luaL_loadstring (luaState, chunk); int result = LuaLLoadString (luaState, chunk);
if (result != 0) if (result != 0)
return result; return result;
return lua_pcall (luaState, 0, -1, 0); return LuaPCall (luaState, 0, -1, 0);
} }
/// <summary>DEPRECATED - use luaL_dostring(LuaState luaState, string chunk) instead!</summary> public static void LuaCreateTable (LuaState luaState, int narr, int nrec)
public static int lua_dostring (LuaState luaState, string chunk)
{
return luaL_dostring (luaState, chunk);
}
// steffenj: END Lua 5.1.1 API change (lua_dostring is now a macro luaL_dostring)
// steffenj: BEGIN Lua 5.1.1 API change (lua_newtable is gone, lua_createtable is new)
public static void lua_createtable (LuaState luaState, int narr, int nrec)
{ {
LuaCore.LuaCreateTable (luaState, narr, nrec); LuaCore.LuaCreateTable (luaState, narr, nrec);
} }
public static void lua_newtable (LuaState luaState) public static void LuaNewTable (LuaState luaState)
{ {
lua_createtable (luaState, 0, 0); LuaCreateTable (luaState, 0, 0);
} }
// steffenj: END Lua 5.1.1 API change (lua_newtable is gone, lua_createtable is new) public static int LuaLDoFile (LuaState luaState, string fileName)
// steffenj: BEGIN Lua 5.1.1 API change (lua_dofile now in LuaLib as luaL_dofile macro)
public static int luaL_dofile (LuaState luaState, string fileName)
{ {
int result = LuaCore.LuaNetLoadFile (luaState, fileName); int result = LuaCore.LuaNetLoadFile (luaState, fileName);
if (result != 0) if (result != 0)
...@@ -139,199 +124,198 @@ namespace NLua ...@@ -139,199 +124,198 @@ namespace NLua
return LuaCore.LuaNetPCall (luaState, 0, -1, 0); return LuaCore.LuaNetPCall (luaState, 0, -1, 0);
} }
public static void lua_getglobal (LuaState luaState, string name) public static void LuaGetGlobal (LuaState luaState, string name)
{ {
LuaCore.LuaNetGetGlobal (luaState, name); LuaCore.LuaNetGetGlobal (luaState, name);
} }
public static void lua_setglobal (LuaState luaState, string name) public static void LuaSetGlobal (LuaState luaState, string name)
{ {
LuaCore.LuaNetSetGlobal (luaState, name); LuaCore.LuaNetSetGlobal (luaState, name);
} }
public static void lua_settop (LuaState luaState, int newTop) public static void LuaSetTop (LuaState luaState, int newTop)
{ {
LuaCore.LuaSetTop (luaState, newTop); LuaCore.LuaSetTop (luaState, newTop);
} }
public static void lua_pop (LuaState luaState, int amount) public static void LuaPop (LuaState luaState, int amount)
{ {
lua_settop (luaState, -(amount) - 1); LuaSetTop (luaState, -(amount) - 1);
} }
public static void lua_insert (LuaState luaState, int newTop) public static void LuaInsert (LuaState luaState, int newTop)
{ {
LuaCore.LuaInsert (luaState, newTop); LuaCore.LuaInsert (luaState, newTop);
} }
public static void lua_remove (LuaState luaState, int index) public static void LuaRemove (LuaState luaState, int index)
{ {
LuaCore.LuaRemove (luaState, index); LuaCore.LuaRemove (luaState, index);
} }
public static void lua_gettable (LuaState luaState, int index) public static void LuaGetTable (LuaState luaState, int index)
{ {
LuaCore.LuaGetTable (luaState, index); LuaCore.LuaGetTable (luaState, index);
} }
public static void lua_rawget (LuaState luaState, int index) public static void LuaRawGet (LuaState luaState, int index)
{ {
LuaCore.LuaRawGet (luaState, index); LuaCore.LuaRawGet (luaState, index);
} }
public static void lua_settable (LuaState luaState, int index) public static void LuaSetTable (LuaState luaState, int index)
{ {
LuaCore.LuaSetTable (luaState, index); LuaCore.LuaSetTable (luaState, index);
} }
public static void lua_rawset (LuaState luaState, int index) public static void LuaRawSet (LuaState luaState, int index)
{ {
LuaCore.LuaRawSet (luaState, index); LuaCore.LuaRawSet (luaState, index);
} }
public static void lua_setmetatable (LuaState luaState, int objIndex) public static void LuaSetMetatable (LuaState luaState, int objIndex)
{ {
LuaCore.LuaSetMetatable (luaState, objIndex); LuaCore.LuaSetMetatable (luaState, objIndex);
} }
public static int lua_getmetatable (LuaState luaState, int objIndex) public static int LuaGetMetatable (LuaState luaState, int objIndex)
{ {
return LuaCore.LuaGetMetatable (luaState, objIndex); return LuaCore.LuaGetMetatable (luaState, objIndex);
} }
public static int lua_equal (LuaState luaState, int index1, int index2) public static int LuaEqual (LuaState luaState, int index1, int index2)
{ {
return LuaCore.LuaNetEqual (luaState, index1, index2); return LuaCore.LuaNetEqual (luaState, index1, index2);
} }
public static void lua_pushvalue (LuaState luaState, int index) public static void LuaPushValue (LuaState luaState, int index)
{ {
LuaCore.LuaPushValue (luaState, index); LuaCore.LuaPushValue (luaState, index);
} }
public static void lua_replace (LuaState luaState, int index) public static void LuaReplace (LuaState luaState, int index)
{ {
LuaCore.LuaReplace (luaState, index); LuaCore.LuaReplace (luaState, index);
} }
public static int lua_gettop (LuaState luaState) public static int LuaGetTop (LuaState luaState)
{ {
return LuaCore.LuaGetTop (luaState); return LuaCore.LuaGetTop (luaState);
} }
public static LuaTypes lua_type (LuaState luaState, int index) public static LuaTypes LuaType (LuaState luaState, int index)
{ {
return (LuaTypes)LuaCore.LuaType (luaState, index); return (LuaTypes)LuaCore.LuaType (luaState, index);
} }
public static bool lua_isnil (LuaState luaState, int index) public static bool LuaIsNil (LuaState luaState, int index)
{ {
return lua_type (luaState, index) == LuaTypes.Nil; return LuaType (luaState, index) == LuaTypes.Nil;
} }
public static bool lua_isnumber (LuaState luaState, int index) public static bool LuaIsNumber (LuaState luaState, int index)
{ {
return lua_type (luaState, index) == LuaTypes.Number; return LuaType (luaState, index) == LuaTypes.Number;
} }
public static bool lua_isboolean (LuaState luaState, int index) public static bool LuaIsBoolean (LuaState luaState, int index)
{ {
return lua_type (luaState, index) == LuaTypes.Boolean; return LuaType (luaState, index) == LuaTypes.Boolean;
} }
public static int luaL_ref (LuaState luaState, int registryIndex) public static int LuaLRef (LuaState luaState, int registryIndex)
{ {
return LuaCore.LuaLRef (luaState, registryIndex); return LuaCore.LuaLRef (luaState, registryIndex);
} }
public static int lua_ref (LuaState luaState, int lockRef) public static int LuaRef (LuaState luaState, int lockRef)
{ {
return lockRef != 0 ? luaL_ref (luaState, (int)LuaIndexes.Registry) : 0; return lockRef != 0 ? LuaLRef (luaState, (int)LuaIndexes.Registry) : 0;
} }
public static void lua_rawgeti (LuaState luaState, int tableIndex, int index) public static void LuaRawGetI (LuaState luaState, int tableIndex, int index)
{ {
LuaCore.LuaRawGetI (luaState, tableIndex, index); LuaCore.LuaRawGetI (luaState, tableIndex, index);
} }
public static void lua_rawseti (LuaState luaState, int tableIndex, int index) public static void LuaRawSetI (LuaState luaState, int tableIndex, int index)
{ {
LuaCore.LuaRawSetI (luaState, tableIndex, index); LuaCore.LuaRawSetI (luaState, tableIndex, index);
} }
public static object lua_newuserdata (LuaState luaState, int size) public static object LuaNewUserData (LuaState luaState, int size)
{ {
return LuaCore.LuaNewUserData (luaState, (uint)size); return LuaCore.LuaNewUserData (luaState, (uint)size);
} }
public static object lua_touserdata (LuaState luaState, int index) public static object LuaToUserData (LuaState luaState, int index)
{ {
return LuaCore.LuaToUserData (luaState, index); return LuaCore.LuaToUserData (luaState, index);
} }
public static void lua_getref (LuaState luaState, int reference) public static void LuaGetRef (LuaState luaState, int reference)
{ {
lua_rawgeti (luaState, (int)LuaIndexes.Registry, reference); LuaRawGetI (luaState, (int)LuaIndexes.Registry, reference);
} }
public static void lua_unref (LuaState luaState, int reference) public static void LuaUnref (LuaState luaState, int reference)
{ {
LuaCore.LuaLUnref (luaState, (int)LuaIndexes.Registry, reference); LuaCore.LuaLUnref (luaState, (int)LuaIndexes.Registry, reference);
} }
public static bool lua_isstring (LuaState luaState, int index) public static bool LuaIsString (LuaState luaState, int index)
{ {
return LuaCore.LuaIsString (luaState, index) != 0; return LuaCore.LuaIsString (luaState, index) != 0;
} }
public static bool lua_iscfunction (LuaState luaState, int index) public static bool LuaIsCFunction (LuaState luaState, int index)
{ {
return LuaCore.LuaIsCFunction (luaState, index); return LuaCore.LuaIsCFunction (luaState, index);
} }
public static void lua_pushnil (LuaState luaState) public static void LuaPushNil (LuaState luaState)
{ {
LuaCore.LuaPushNil (luaState); LuaCore.LuaPushNil (luaState);
} }
public static void lua_call (LuaState luaState, int nArgs, int nResults) public static void LuaCall (LuaState luaState, int nArgs, int nResults)
{ {
LuaCore.LuaCall (luaState, nArgs, nResults); LuaCore.LuaCall (luaState, nArgs, nResults);
} }
public static void lua_pushstdcallcfunction (LuaState luaState, LuaCore.LuaNativeFunction function) public static void LuaPushStdCallCFunction (LuaState luaState, LuaCore.LuaNativeFunction function)
{ {
LuaCore.LuaPushStdCallCFunction (luaState, function); LuaCore.LuaPushStdCallCFunction (luaState, function);
} }
public static int lua_pcall (LuaState luaState, int nArgs, int nResults, int errfunc) public static int LuaPCall (LuaState luaState, int nArgs, int nResults, int errfunc)
{ {
return LuaCore.LuaNetPCall (luaState, nArgs, nResults, errfunc); return LuaCore.LuaNetPCall (luaState, nArgs, nResults, errfunc);
} }
public static LuaCore.LuaNativeFunction lua_tocfunction (LuaState luaState, int index) public static LuaCore.LuaNativeFunction LuaToCFunction (LuaState luaState, int index)
{ {
return LuaCore.LuaToCFunction (luaState, index); return LuaCore.LuaToCFunction (luaState, index);
} }
public static double lua_tonumber (LuaState luaState, int index) public static double LuaToNumber (LuaState luaState, int index)
{ {
return LuaCore.LuaNetToNumber (luaState, index); return LuaCore.LuaNetToNumber (luaState, index);
} }
public static bool lua_toboolean (LuaState luaState, int index) public static bool LuaToBoolean (LuaState luaState, int index)
{ {
return LuaCore.LuaToBoolean (luaState, index) != 0; return LuaCore.LuaToBoolean (luaState, index) != 0;
} }
public static string lua_tostring (LuaState luaState, int index) public static string LuaToString (LuaState luaState, int index)
{ {
#if true
// FIXME use the same format string as lua i.e. LUA_NUMBER_FMT // FIXME use the same format string as lua i.e. LUA_NUMBER_FMT
var t = lua_type (luaState, index); var t = LuaType (luaState, index);
if (t == LuaTypes.Number) if (t == LuaTypes.Number)
return string.Format ("{0}", lua_tonumber (luaState, index)); return string.Format ("{0}", LuaToNumber (luaState, index));
else if (t == LuaTypes.String) { else if (t == LuaTypes.String) {
uint strlen; uint strlen;
// Changed 2013-05-18 by Dirk Weltz // Changed 2013-05-18 by Dirk Weltz
...@@ -345,145 +329,132 @@ namespace NLua ...@@ -345,145 +329,132 @@ namespace NLua
return null; // treat lua nulls to as C# nulls return null; // treat lua nulls to as C# nulls
else else
return "0"; // Because luaV_tostring does this return "0"; // Because luaV_tostring does this
#else
size_t strlen;
// Note! This method will _change_ the representation of the object on the stack to a string.
// We do not want this behavior so we do the conversion ourselves
const char *str = LuaCore.lua_tolstring(luaState, index, &strlen);
if (str)
return Marshal::PtrToStringAnsi(IntPtr((char *) str), strlen);
else
return nullptr; // treat lua nulls to as C# nulls
#endif
} }
public static void lua_atpanic (LuaState luaState, LuaCore.LuaNativeFunction panicf) public static void LuaAtPanic (LuaState luaState, LuaCore.LuaNativeFunction panicf)
{ {
LuaCore.LuaAtPanic (luaState, (LuaCore.LuaNativeFunction)panicf); LuaCore.LuaAtPanic (luaState, (LuaCore.LuaNativeFunction)panicf);
} }
public static void lua_pushnumber (LuaState luaState, double number) public static void LuaPushNumber (LuaState luaState, double number)
{ {
LuaCore.LuaPushNumber (luaState, number); LuaCore.LuaPushNumber (luaState, number);
} }
public static void lua_pushboolean (LuaState luaState, bool value) public static void LuaPushBoolean (LuaState luaState, bool value)
{ {
LuaCore.LuaPushBoolean (luaState, value ? 1 : 0); LuaCore.LuaPushBoolean (luaState, value ? 1 : 0);
} }
public static void lua_pushstring (LuaState luaState, string str) public static void LuaPushString (LuaState luaState, string str)
{ {
LuaCore.LuaPushString (luaState, str); LuaCore.LuaPushString (luaState, str);
} }
public static int luaL_newmetatable (LuaState luaState, string meta) public static int LuaLNewMetatable (LuaState luaState, string meta)
{ {
return LuaCore.LuaLNewMetatable (luaState, meta); return LuaCore.LuaLNewMetatable (luaState, meta);
} }
// steffenj: BEGIN Lua 5.1.1 API change (luaL_getmetatable is now a macro using lua_getfield) public static void LuaGetField (LuaState luaState, int stackPos, string meta)
public static void lua_getfield (LuaState luaState, int stackPos, string meta)
{ {
LuaCore.LuaGetField (luaState, stackPos, meta); LuaCore.LuaGetField (luaState, stackPos, meta);
} }
public static void luaL_getmetatable (LuaState luaState, string meta) public static void LuaLGetMetatable (LuaState luaState, string meta)
{ {
lua_getfield (luaState, (int)LuaIndexes.Registry, meta); LuaGetField (luaState, (int)LuaIndexes.Registry, meta);
} }
public static object luaL_checkudata (LuaState luaState, int stackPos, string meta) public static object LuaLCheckUData (LuaState luaState, int stackPos, string meta)
{ {
return LuaCore.LuaLCheckUData (luaState, stackPos, meta); return LuaCore.LuaLCheckUData (luaState, stackPos, meta);
} }
public static bool luaL_getmetafield (LuaState luaState, int stackPos, string field) public static bool LuaLGetMetafield (LuaState luaState, int stackPos, string field)
{ {
return LuaCore.LuaLGetMetafield (luaState, stackPos, field) != 0; return LuaCore.LuaLGetMetafield (luaState, stackPos, field) != 0;
} }
public static int luaL_loadbuffer (LuaState luaState, string buff, string name) public static int LuaLLoadBuffer (LuaState luaState, string buff, string name)
{ {
return LuaCore.LuaNetLoadBuffer (luaState, buff, (uint)buff.Length, name); return LuaCore.LuaNetLoadBuffer (luaState, buff, (uint)buff.Length, name);
} }
public static int luaL_loadbuffer (LuaState luaState, byte [] buff, string name) public static int LuaLLoadBuffer (LuaState luaState, byte [] buff, string name)
{ {
return LuaCore.LuaNetLoadBuffer (luaState, buff, (uint)buff.Length, name); return LuaCore.LuaNetLoadBuffer (luaState, buff, (uint)buff.Length, name);
} }
public static int luaL_loadfile (LuaState luaState, string filename) public static int LuaLLoadFile (LuaState luaState, string filename)
{ {
return LuaCore.LuaNetLoadFile (luaState, filename); return LuaCore.LuaNetLoadFile (luaState, filename);
} }
public static bool luaL_checkmetatable (LuaState luaState, int index) public static bool LuaLCheckMetatable (LuaState luaState, int index)
{ {
return LuaCore.LuaLCheckMetatable (luaState, index); return LuaCore.LuaLCheckMetatable (luaState, index);
} }
public static int luanet_registryindex () public static int LuaNetRegistryIndex ()
{ {
return LuaCore.LuaNetRegistryIndex (); return LuaCore.LuaNetRegistryIndex ();
} }
public static int luanet_tonetobject (LuaState luaState, int index) public static int LuaNetToNetObject (LuaState luaState, int index)
{ {
return LuaCore.LuaNetToNetObject (luaState, index); return LuaCore.LuaNetToNetObject (luaState, index);
} }
public static void luanet_newudata (LuaState luaState, int val) public static void LuaNetNewUData (LuaState luaState, int val)
{ {
LuaCore.LuaNetNewUData (luaState, val); LuaCore.LuaNetNewUData (luaState, val);
} }
public static int luanet_rawnetobj (LuaState luaState, int obj) public static int LuaNetRawNetObj (LuaState luaState, int obj)
{ {
return LuaCore.LuaNetRawNetObj (luaState, obj); return LuaCore.LuaNetRawNetObj (luaState, obj);
} }
public static int luanet_checkudata (LuaState luaState, int ud, string tname) public static int LuaNetCheckUData (LuaState luaState, int ud, string tname)
{ {
return LuaCore.LuaNetCheckUData (luaState, ud, tname); return LuaCore.LuaNetCheckUData (luaState, ud, tname);
} }
public static void lua_error (LuaState luaState) public static void LuaError (LuaState luaState)
{ {
LuaCore.LuaError (luaState); LuaCore.LuaError (luaState);
} }
public static bool lua_checkstack (LuaState luaState, int extra) public static bool LuaCheckStack (LuaState luaState, int extra)
{ {
return LuaCore.LuaCheckStack (luaState, extra) != 0; return LuaCore.LuaCheckStack (luaState, extra) != 0;
} }
public static int lua_next (LuaState luaState, int index) public static int LuaNext (LuaState luaState, int index)
{ {
return LuaCore.LuaNext (luaState, index); return LuaCore.LuaNext (luaState, index);
} }
public static void lua_pushlightuserdata (LuaState luaState, LuaTag udata) public static void LuaPushLightUserData (LuaState luaState, LuaTag udata)
{ {
LuaCore.LuaPushLightUserData (luaState, udata.Tag); LuaCore.LuaPushLightUserData (luaState, udata.Tag);
} }
public static LuaTag luanet_gettag () public static LuaTag LuaNetGetTag ()
{ {
return LuaCore.LuaNetGetTag (); return LuaCore.LuaNetGetTag ();
} }
public static void luanet_pushglobaltable (LuaState luaState) public static void LuaNetPushGlobalTable (LuaState luaState)
{ {
LuaCore.LuaNetPushGlobalTable (luaState); LuaCore.LuaNetPushGlobalTable (luaState);
} }
public static void luanet_popglobaltable (LuaState luaState) public static void LuaNetPopGlobalTable (LuaState luaState)
{ {
LuaCore.LuaNetPopGlobalTable (luaState); LuaCore.LuaNetPopGlobalTable (luaState);
} }
} }
} }
\ No newline at end of file
...@@ -57,10 +57,10 @@ namespace NLua ...@@ -57,10 +57,10 @@ namespace NLua
*/ */
public object this [string field] { public object this [string field] {
get { get {
return _Interpreter.getObject (_Reference, field); return _Interpreter.GetObject (_Reference, field);
} }
set { set {
_Interpreter.setObject (_Reference, field, value); _Interpreter.SetObject (_Reference, field, value);
} }
} }
...@@ -69,10 +69,10 @@ namespace NLua ...@@ -69,10 +69,10 @@ namespace NLua
*/ */
public object this [object field] { public object this [object field] {
get { get {
return _Interpreter.getObject (_Reference, field); return _Interpreter.GetObject (_Reference, field);
} }
set { set {
_Interpreter.setObject (_Reference, field, value); _Interpreter.SetObject (_Reference, field, value);
} }
} }
...@@ -93,14 +93,14 @@ namespace NLua ...@@ -93,14 +93,14 @@ namespace NLua
* Gets an string fields of a table ignoring its metatable, * Gets an string fields of a table ignoring its metatable,
* if it exists * if it exists
*/ */
internal object rawget (string field) internal object RawGet (string field)
{ {
return _Interpreter.rawGetObject (_Reference, field); return _Interpreter.RawGetObject (_Reference, field);
} }
internal object rawgetFunction (string field) internal object RawGetFunction (string field)
{ {
object obj = _Interpreter.rawGetObject (_Reference, field); object obj = _Interpreter.RawGetObject (_Reference, field);
if (obj is LuaCore.LuaNativeFunction) if (obj is LuaCore.LuaNativeFunction)
return new LuaFunction ((LuaCore.LuaNativeFunction)obj, _Interpreter); return new LuaFunction ((LuaCore.LuaNativeFunction)obj, _Interpreter);
...@@ -111,9 +111,9 @@ namespace NLua ...@@ -111,9 +111,9 @@ namespace NLua
/* /*
* Pushes this table into the Lua stack * Pushes this table into the Lua stack
*/ */
internal void push (LuaState luaState) internal void Push (LuaState luaState)
{ {
LuaLib.lua_getref (luaState, _Reference); LuaLib.LuaGetRef (luaState, _Reference);
} }
public override string ToString () public override string ToString ()
......
...@@ -50,10 +50,10 @@ namespace NLua ...@@ -50,10 +50,10 @@ namespace NLua
*/ */
public object this [string field] { public object this [string field] {
get { get {
return _Interpreter.getObject (_Reference, field); return _Interpreter.GetObject (_Reference, field);
} }
set { set {
_Interpreter.setObject (_Reference, field, value); _Interpreter.SetObject (_Reference, field, value);
} }
} }
...@@ -62,10 +62,10 @@ namespace NLua ...@@ -62,10 +62,10 @@ namespace NLua
*/ */
public object this [object field] { public object this [object field] {
get { get {
return _Interpreter.getObject (_Reference, field); return _Interpreter.GetObject (_Reference, field);
} }
set { set {
_Interpreter.setObject (_Reference, field, value); _Interpreter.SetObject (_Reference, field, value);
} }
} }
...@@ -75,15 +75,15 @@ namespace NLua ...@@ -75,15 +75,15 @@ namespace NLua
*/ */
public object[] Call (params object[] args) public object[] Call (params object[] args)
{ {
return _Interpreter.callFunction (this, args); return _Interpreter.CallFunction (this, args);
} }
/* /*
* Pushes the userdata into the Lua stack * Pushes the userdata into the Lua stack
*/ */
internal void push (LuaState luaState) internal void Push (LuaState luaState)
{ {
LuaLib.lua_getref (luaState, _Reference); LuaLib.LuaGetRef (luaState, _Reference);
} }
public override string ToString () public override string ToString ()
......
...@@ -79,15 +79,15 @@ namespace NLua ...@@ -79,15 +79,15 @@ namespace NLua
public MetaFunctions (ObjectTranslator translator) public MetaFunctions (ObjectTranslator translator)
{ {
this.translator = translator; this.translator = translator;
gcFunction = new LuaCore.LuaNativeFunction (MetaFunctions.collectObject); gcFunction = new LuaCore.LuaNativeFunction (MetaFunctions.CollectObject);
toStringFunction = new LuaCore.LuaNativeFunction (MetaFunctions.toString); toStringFunction = new LuaCore.LuaNativeFunction (MetaFunctions.ToStringLua);
indexFunction = new LuaCore.LuaNativeFunction (MetaFunctions.getMethod); indexFunction = new LuaCore.LuaNativeFunction (MetaFunctions.GetMethod);
newindexFunction = new LuaCore.LuaNativeFunction (MetaFunctions.setFieldOrProperty); newindexFunction = new LuaCore.LuaNativeFunction (MetaFunctions.SetFieldOrProperty);
baseIndexFunction = new LuaCore.LuaNativeFunction (MetaFunctions.getBaseMethod); baseIndexFunction = new LuaCore.LuaNativeFunction (MetaFunctions.GetBaseMethod);
callConstructorFunction = new LuaCore.LuaNativeFunction (MetaFunctions.callConstructor); callConstructorFunction = new LuaCore.LuaNativeFunction (MetaFunctions.CallConstructor);
classIndexFunction = new LuaCore.LuaNativeFunction (MetaFunctions.getClassMethod); classIndexFunction = new LuaCore.LuaNativeFunction (MetaFunctions.GetClassMethod);
classNewindexFunction = new LuaCore.LuaNativeFunction (MetaFunctions.setClassFieldOrProperty); classNewindexFunction = new LuaCore.LuaNativeFunction (MetaFunctions.SetClassFieldOrProperty);
execDelegateFunction = new LuaCore.LuaNativeFunction (MetaFunctions.runFunctionDelegate); execDelegateFunction = new LuaCore.LuaNativeFunction (MetaFunctions.RunFunctionDelegate);
} }
/* /*
...@@ -97,16 +97,16 @@ namespace NLua ...@@ -97,16 +97,16 @@ namespace NLua
[MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))] [MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))]
#endif #endif
[System.Runtime.InteropServices.AllowReversePInvokeCalls] [System.Runtime.InteropServices.AllowReversePInvokeCalls]
private static int runFunctionDelegate (LuaState luaState) private static int RunFunctionDelegate (LuaState luaState)
{ {
var translator = ObjectTranslatorPool.Instance.Find (luaState); var translator = ObjectTranslatorPool.Instance.Find (luaState);
return runFunctionDelegate (luaState, translator); return RunFunctionDelegate (luaState, translator);
} }
private static int runFunctionDelegate (LuaState luaState, ObjectTranslator translator) private static int RunFunctionDelegate (LuaState luaState, ObjectTranslator translator)
{ {
LuaCore.LuaNativeFunction func = (LuaCore.LuaNativeFunction)translator.getRawNetObject (luaState, 1); LuaCore.LuaNativeFunction func = (LuaCore.LuaNativeFunction)translator.GetRawNetObject (luaState, 1);
LuaLib.lua_remove (luaState, 1); LuaLib.LuaRemove (luaState, 1);
return func (luaState); return func (luaState);
} }
...@@ -117,18 +117,18 @@ namespace NLua ...@@ -117,18 +117,18 @@ namespace NLua
[MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))] [MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))]
#endif #endif
[System.Runtime.InteropServices.AllowReversePInvokeCalls] [System.Runtime.InteropServices.AllowReversePInvokeCalls]
private static int collectObject (LuaState luaState) private static int CollectObject (LuaState luaState)
{ {
var translator = ObjectTranslatorPool.Instance.Find (luaState); var translator = ObjectTranslatorPool.Instance.Find (luaState);
return collectObject (luaState, translator); return CollectObject (luaState, translator);
} }
private static int collectObject (LuaState luaState, ObjectTranslator translator) private static int CollectObject (LuaState luaState, ObjectTranslator translator)
{ {
int udata = LuaLib.luanet_rawnetobj (luaState, 1); int udata = LuaLib.LuaNetRawNetObj (luaState, 1);
if (udata != -1) if (udata != -1)
translator.collectObject (udata); translator.CollectObject (udata);
return 0; return 0;
} }
...@@ -140,20 +140,20 @@ namespace NLua ...@@ -140,20 +140,20 @@ namespace NLua
[MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))] [MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))]
#endif #endif
[System.Runtime.InteropServices.AllowReversePInvokeCalls] [System.Runtime.InteropServices.AllowReversePInvokeCalls]
private static int toString (LuaState luaState) private static int ToStringLua (LuaState luaState)
{ {
var translator = ObjectTranslatorPool.Instance.Find (luaState); var translator = ObjectTranslatorPool.Instance.Find (luaState);
return toString (luaState, translator); return ToStringLua (luaState, translator);
} }
private static int toString (LuaState luaState, ObjectTranslator translator) private static int ToStringLua (LuaState luaState, ObjectTranslator translator)
{ {
object obj = translator.getRawNetObject (luaState, 1); object obj = translator.GetRawNetObject (luaState, 1);
if (!obj.IsNull ()) if (!obj.IsNull ())
translator.push (luaState, obj.ToString () + ": " + obj.GetHashCode ()); translator.Push (luaState, obj.ToString () + ": " + obj.GetHashCode ());
else else
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
return 1; return 1;
} }
...@@ -163,19 +163,19 @@ namespace NLua ...@@ -163,19 +163,19 @@ namespace NLua
/// Debug tool to dump the lua stack /// Debug tool to dump the lua stack
/// </summary> /// </summary>
/// FIXME, move somewhere else /// FIXME, move somewhere else
public static void dumpStack (ObjectTranslator translator, LuaState luaState) public static void DumpStack (ObjectTranslator translator, LuaState luaState)
{ {
int depth = LuaLib.lua_gettop (luaState); int depth = LuaLib.LuaGetTop (luaState);
Debug.WriteLine ("lua stack depth: " + depth); Debug.WriteLine ("lua stack depth: " + depth);
for (int i = 1; i <= depth; i++) { for (int i = 1; i <= depth; i++) {
var type = LuaLib.lua_type (luaState, i); var type = LuaLib.LuaType (luaState, i);
// we dump stacks when deep in calls, calling typename while the stack is in flux can fail sometimes, so manually check for key types // we dump stacks when deep in calls, calling typename while the stack is in flux can fail sometimes, so manually check for key types
string typestr = (type == LuaTypes.Table) ? "table" : LuaLib.lua_typename (luaState, type); string typestr = (type == LuaTypes.Table) ? "table" : LuaLib.LuaTypeName (luaState, type);
string strrep = LuaLib.lua_tostring (luaState, i).ToString (); string strrep = LuaLib.LuaToString (luaState, i).ToString ();
if (type == LuaTypes.UserData) { if (type == LuaTypes.UserData) {
object obj = translator.getRawNetObject (luaState, i); object obj = translator.GetRawNetObject (luaState, i);
strrep = obj.ToString (); strrep = obj.ToString ();
} }
...@@ -198,24 +198,24 @@ namespace NLua ...@@ -198,24 +198,24 @@ namespace NLua
[MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))] [MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))]
#endif #endif
[System.Runtime.InteropServices.AllowReversePInvokeCalls] [System.Runtime.InteropServices.AllowReversePInvokeCalls]
private static int getMethod (LuaState luaState) private static int GetMethod (LuaState luaState)
{ {
var translator = ObjectTranslatorPool.Instance.Find (luaState); var translator = ObjectTranslatorPool.Instance.Find (luaState);
var instance = translator.MetaFunctionsInstance; var instance = translator.MetaFunctionsInstance;
return instance.getMethodInternal (luaState); return instance.GetMethodInternal (luaState);
} }
private int getMethodInternal (LuaState luaState) private int GetMethodInternal (LuaState luaState)
{ {
object obj = translator.getRawNetObject (luaState, 1); object obj = translator.GetRawNetObject (luaState, 1);
if (obj.IsNull ()) { if (obj.IsNull ()) {
translator.throwError (luaState, "trying to index an invalid object reference"); translator.ThrowError (luaState, "trying to index an invalid object reference");
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
return 1; return 1;
} }
object index = translator.getObject (luaState, 2); object index = translator.GetObject (luaState, 2);
//var indexType = index.GetType(); //var indexType = index.GetType();
string methodName = index as string; // will be null if not a string arg string methodName = index as string; // will be null if not a string arg
var objType = obj.GetType (); var objType = obj.GetType ();
...@@ -225,8 +225,8 @@ namespace NLua ...@@ -225,8 +225,8 @@ namespace NLua
// CP: This will fail when using indexers and attempting to get a value with the same name as a property of the object, // CP: This will fail when using indexers and attempting to get a value with the same name as a property of the object,
// ie: xmlelement['item'] <- item is a property of xmlelement // ie: xmlelement['item'] <- item is a property of xmlelement
try { try {
if (!methodName.IsNull () && isMemberPresent (objType, methodName)) if (!methodName.IsNull () && IsMemberPresent (objType, methodName))
return getMember (luaState, objType, obj, methodName, BindingFlags.Instance | BindingFlags.IgnoreCase); return GetMember (luaState, objType, obj, methodName, BindingFlags.Instance | BindingFlags.IgnoreCase);
} catch { } catch {
} }
...@@ -236,16 +236,16 @@ namespace NLua ...@@ -236,16 +236,16 @@ namespace NLua
if (objType.UnderlyingSystemType == typeof(float[])) { if (objType.UnderlyingSystemType == typeof(float[])) {
float[] arr = ((float[])obj); float[] arr = ((float[])obj);
translator.push (luaState, arr [intIndex]); translator.Push (luaState, arr [intIndex]);
} else if (objType.UnderlyingSystemType == typeof(double[])) { } else if (objType.UnderlyingSystemType == typeof(double[])) {
double[] arr = ((double[])obj); double[] arr = ((double[])obj);
translator.push (luaState, arr [intIndex]); translator.Push (luaState, arr [intIndex]);
} else if (objType.UnderlyingSystemType == typeof(int[])) { } else if (objType.UnderlyingSystemType == typeof(int[])) {
int[] arr = ((int[])obj); int[] arr = ((int[])obj);
translator.push (luaState, arr [intIndex]); translator.Push (luaState, arr [intIndex]);
} else { } else {
object[] arr = (object[])obj; object[] arr = (object[])obj;
translator.push (luaState, arr [intIndex]); translator.Push (luaState, arr [intIndex]);
} }
} else { } else {
// Try to use get_Item to index into this .net object // Try to use get_Item to index into this .net object
...@@ -259,11 +259,11 @@ namespace NLua ...@@ -259,11 +259,11 @@ namespace NLua
var actualParms = (!getter.IsNull ()) ? getter.GetParameters () : null; var actualParms = (!getter.IsNull ()) ? getter.GetParameters () : null;
if (actualParms.IsNull () || actualParms.Length != 1) { if (actualParms.IsNull () || actualParms.Length != 1) {
translator.throwError (luaState, "method not found (or no indexer): " + index); translator.ThrowError (luaState, "method not found (or no indexer): " + index);
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
} else { } else {
// Get the index in a form acceptable to the getter // Get the index in a form acceptable to the getter
index = translator.getAsType (luaState, 2, actualParms [0].ParameterType); index = translator.GetAsType (luaState, 2, actualParms [0].ParameterType);
object[] args = new object[1]; object[] args = new object[1];
// Just call the indexer - if out of bounds an exception will happen // Just call the indexer - if out of bounds an exception will happen
...@@ -271,15 +271,15 @@ namespace NLua ...@@ -271,15 +271,15 @@ namespace NLua
try { try {
object result = getter.Invoke (obj, args); object result = getter.Invoke (obj, args);
translator.push (luaState, result); translator.Push (luaState, result);
} catch (TargetInvocationException e) { } catch (TargetInvocationException e) {
// Provide a more readable description for the common case of key not found // Provide a more readable description for the common case of key not found
if (e.InnerException is KeyNotFoundException) if (e.InnerException is KeyNotFoundException)
translator.throwError (luaState, "key '" + index + "' not found "); translator.ThrowError (luaState, "key '" + index + "' not found ");
else else
translator.throwError (luaState, "exception indexing '" + index + "' " + e.Message); translator.ThrowError (luaState, "exception indexing '" + index + "' " + e.Message);
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
} }
} }
} }
...@@ -287,7 +287,7 @@ namespace NLua ...@@ -287,7 +287,7 @@ namespace NLua
} }
} }
LuaLib.lua_pushboolean (luaState, false); LuaLib.LuaPushBoolean (luaState, false);
return 2; return 2;
} }
...@@ -299,41 +299,41 @@ namespace NLua ...@@ -299,41 +299,41 @@ namespace NLua
[MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))] [MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))]
#endif #endif
[System.Runtime.InteropServices.AllowReversePInvokeCalls] [System.Runtime.InteropServices.AllowReversePInvokeCalls]
private static int getBaseMethod (LuaState luaState) private static int GetBaseMethod (LuaState luaState)
{ {
var translator = ObjectTranslatorPool.Instance.Find (luaState); var translator = ObjectTranslatorPool.Instance.Find (luaState);
var instance = translator.MetaFunctionsInstance; var instance = translator.MetaFunctionsInstance;
return instance.getBaseMethodInternal (luaState); return instance.GetBaseMethodInternal (luaState);
} }
private int getBaseMethodInternal (LuaState luaState) private int GetBaseMethodInternal (LuaState luaState)
{ {
object obj = translator.getRawNetObject (luaState, 1); object obj = translator.GetRawNetObject (luaState, 1);
if (obj.IsNull ()) { if (obj.IsNull ()) {
translator.throwError (luaState, "trying to index an invalid object reference"); translator.ThrowError (luaState, "trying to index an invalid object reference");
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
LuaLib.lua_pushboolean (luaState, false); LuaLib.LuaPushBoolean (luaState, false);
return 2; return 2;
} }
string methodName = LuaLib.lua_tostring (luaState, 2).ToString (); string methodName = LuaLib.LuaToString (luaState, 2).ToString ();
if (methodName.IsNull ()) { if (methodName.IsNull ()) {
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
LuaLib.lua_pushboolean (luaState, false); LuaLib.LuaPushBoolean (luaState, false);
return 2; return 2;
} }
getMember (luaState, obj.GetType (), obj, "__luaInterface_base_" + methodName, BindingFlags.Instance | BindingFlags.IgnoreCase); GetMember (luaState, obj.GetType (), obj, "__luaInterface_base_" + methodName, BindingFlags.Instance | BindingFlags.IgnoreCase);
LuaLib.lua_settop (luaState, -2); LuaLib.LuaSetTop (luaState, -2);
if (LuaLib.lua_type (luaState, -1) == LuaTypes.Nil) { if (LuaLib.LuaType (luaState, -1) == LuaTypes.Nil) {
LuaLib.lua_settop (luaState, -2); LuaLib.LuaSetTop (luaState, -2);
return getMember (luaState, obj.GetType (), obj, methodName, BindingFlags.Instance | BindingFlags.IgnoreCase); return GetMember (luaState, obj.GetType (), obj, methodName, BindingFlags.Instance | BindingFlags.IgnoreCase);
} }
LuaLib.lua_pushboolean (luaState, false); LuaLib.LuaPushBoolean (luaState, false);
return 2; return 2;
} }
...@@ -343,9 +343,9 @@ namespace NLua ...@@ -343,9 +343,9 @@ namespace NLua
/// <param name="objType"></param> /// <param name="objType"></param>
/// <param name="methodName"></param> /// <param name="methodName"></param>
/// <returns></returns> /// <returns></returns>
bool isMemberPresent (IReflect objType, string methodName) bool IsMemberPresent (IReflect objType, string methodName)
{ {
object cachedMember = checkMemberCache (memberCache, objType, methodName); object cachedMember = CheckMemberCache (memberCache, objType, methodName);
if (!cachedMember.IsNull ()) if (!cachedMember.IsNull ())
return true; return true;
...@@ -361,16 +361,16 @@ namespace NLua ...@@ -361,16 +361,16 @@ namespace NLua
* Uses reflection to find members, and stores the reflected MemberInfo object in * Uses reflection to find members, and stores the reflected MemberInfo object in
* a cache (indexed by the type of the object and the name of the member). * a cache (indexed by the type of the object and the name of the member).
*/ */
private int getMember (LuaState luaState, IReflect objType, object obj, string methodName, BindingFlags bindingType) private int GetMember (LuaState luaState, IReflect objType, object obj, string methodName, BindingFlags bindingType)
{ {
bool implicitStatic = false; bool implicitStatic = false;
MemberInfo member = null; MemberInfo member = null;
object cachedMember = checkMemberCache (memberCache, objType, methodName); object cachedMember = CheckMemberCache (memberCache, objType, methodName);
//object cachedMember=null; //object cachedMember=null;
if (cachedMember is LuaCore.LuaNativeFunction) { if (cachedMember is LuaCore.LuaNativeFunction) {
translator.pushFunction (luaState, (LuaCore.LuaNativeFunction)cachedMember); translator.PushFunction (luaState, (LuaCore.LuaNativeFunction)cachedMember);
translator.push (luaState, true); translator.Push (luaState, true);
return 2; return 2;
} else if (!cachedMember.IsNull ()) } else if (!cachedMember.IsNull ())
member = (MemberInfo)cachedMember; member = (MemberInfo)cachedMember;
...@@ -398,44 +398,44 @@ namespace NLua ...@@ -398,44 +398,44 @@ namespace NLua
var field = (FieldInfo)member; var field = (FieldInfo)member;
if (cachedMember.IsNull ()) if (cachedMember.IsNull ())
setMemberCache (memberCache, objType, methodName, member); SetMemberCache (memberCache, objType, methodName, member);
try { try {
translator.push (luaState, field.GetValue (obj)); translator.Push (luaState, field.GetValue (obj));
} catch { } catch {
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
} }
} else if (member.MemberType == MemberTypes.Property) { } else if (member.MemberType == MemberTypes.Property) {
var property = (PropertyInfo)member; var property = (PropertyInfo)member;
if (cachedMember.IsNull ()) if (cachedMember.IsNull ())
setMemberCache (memberCache, objType, methodName, member); SetMemberCache (memberCache, objType, methodName, member);
try { try {
object val = property.GetValue (obj, null); object val = property.GetValue (obj, null);
translator.push (luaState, val); translator.Push (luaState, val);
} catch (ArgumentException) { } catch (ArgumentException) {
// If we can't find the getter in our class, recurse up to the base class and see // If we can't find the getter in our class, recurse up to the base class and see
// if they can help. // if they can help.
if (objType is Type && !(((Type)objType) == typeof(object))) if (objType is Type && !(((Type)objType) == typeof(object)))
return getMember (luaState, ((Type)objType).BaseType, obj, methodName, bindingType); return GetMember (luaState, ((Type)objType).BaseType, obj, methodName, bindingType);
else else
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
} catch (TargetInvocationException e) { // Convert this exception into a Lua error } catch (TargetInvocationException e) { // Convert this exception into a Lua error
ThrowError (luaState, e); ThrowError (luaState, e);
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
} }
} else if (member.MemberType == MemberTypes.Event) { } else if (member.MemberType == MemberTypes.Event) {
var eventInfo = (EventInfo)member; var eventInfo = (EventInfo)member;
if (cachedMember.IsNull ()) if (cachedMember.IsNull ())
setMemberCache (memberCache, objType, methodName, member); SetMemberCache (memberCache, objType, methodName, member);
translator.push (luaState, new RegisterEventHandler (translator.pendingEvents, obj, eventInfo)); translator.Push (luaState, new RegisterEventHandler (translator.pendingEvents, obj, eventInfo));
} else if (!implicitStatic) { } else if (!implicitStatic) {
if (member.MemberType == MemberTypes.NestedType) { if (member.MemberType == MemberTypes.NestedType) {
// kevinh - added support for finding nested types // kevinh - added support for finding nested types
// cache us // cache us
if (cachedMember.IsNull ()) if (cachedMember.IsNull ())
setMemberCache (memberCache, objType, methodName, member); SetMemberCache (memberCache, objType, methodName, member);
// Find the name of our class // Find the name of our class
string name = member.Name; string name = member.Name;
...@@ -444,40 +444,40 @@ namespace NLua ...@@ -444,40 +444,40 @@ namespace NLua
// Build a new long name and try to find the type by name // Build a new long name and try to find the type by name
string longname = dectype.FullName + "+" + name; string longname = dectype.FullName + "+" + name;
var nestedType = translator.FindType (longname); var nestedType = translator.FindType (longname);
translator.pushType (luaState, nestedType); translator.PushType (luaState, nestedType);
} else { } else {
// Member type must be 'method' // Member type must be 'method'
var wrapper = new LuaCore.LuaNativeFunction ((new LuaMethodWrapper (translator, objType, methodName, bindingType)).invokeFunction); var wrapper = new LuaCore.LuaNativeFunction ((new LuaMethodWrapper (translator, objType, methodName, bindingType)).invokeFunction);
if (cachedMember.IsNull ()) if (cachedMember.IsNull ())
setMemberCache (memberCache, objType, methodName, wrapper); SetMemberCache (memberCache, objType, methodName, wrapper);
translator.pushFunction (luaState, wrapper); translator.PushFunction (luaState, wrapper);
translator.push (luaState, true); translator.Push (luaState, true);
return 2; return 2;
} }
} else { } else {
// If we reach this point we found a static method, but can't use it in this context because the user passed in an instance // If we reach this point we found a static method, but can't use it in this context because the user passed in an instance
translator.throwError (luaState, "can't pass instance to static method " + methodName); translator.ThrowError (luaState, "can't pass instance to static method " + methodName);
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
} }
} else { } else {
// kevinh - we want to throw an exception because meerly returning 'nil' in this case // kevinh - we want to throw an exception because meerly returning 'nil' in this case
// is not sufficient. valid data members may return nil and therefore there must be some // is not sufficient. valid data members may return nil and therefore there must be some
// way to know the member just doesn't exist. // way to know the member just doesn't exist.
translator.throwError (luaState, "unknown member name " + methodName); translator.ThrowError (luaState, "unknown member name " + methodName);
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
} }
// push false because we are NOT returning a function (see luaIndexFunction) // push false because we are NOT returning a function (see luaIndexFunction)
translator.push (luaState, false); translator.Push (luaState, false);
return 2; return 2;
} }
/* /*
* Checks if a MemberInfo object is cached, returning it or null. * Checks if a MemberInfo object is cached, returning it or null.
*/ */
private object checkMemberCache (Dictionary<object, object> memberCache, IReflect objType, string memberName) private object CheckMemberCache (Dictionary<object, object> memberCache, IReflect objType, string memberName)
{ {
object members = null; object members = null;
...@@ -499,7 +499,7 @@ namespace NLua ...@@ -499,7 +499,7 @@ namespace NLua
/* /*
* Stores a MemberInfo object in the member cache. * Stores a MemberInfo object in the member cache.
*/ */
private void setMemberCache (Dictionary<object, object> memberCache, IReflect objType, string memberName, object member) private void SetMemberCache (Dictionary<object, object> memberCache, IReflect objType, string memberName, object member)
{ {
Dictionary<object, object> members = null; Dictionary<object, object> members = null;
object memberCacheValue = null; object memberCacheValue = null;
...@@ -521,19 +521,19 @@ namespace NLua ...@@ -521,19 +521,19 @@ namespace NLua
[MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))] [MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))]
#endif #endif
[System.Runtime.InteropServices.AllowReversePInvokeCalls] [System.Runtime.InteropServices.AllowReversePInvokeCalls]
private static int setFieldOrProperty (LuaState luaState) private static int SetFieldOrProperty (LuaState luaState)
{ {
var translator = ObjectTranslatorPool.Instance.Find (luaState); var translator = ObjectTranslatorPool.Instance.Find (luaState);
var instance = translator.MetaFunctionsInstance; var instance = translator.MetaFunctionsInstance;
return instance.setFieldOrPropertyInternal (luaState); return instance.SetFieldOrPropertyInternal (luaState);
} }
private int setFieldOrPropertyInternal (LuaState luaState) private int SetFieldOrPropertyInternal (LuaState luaState)
{ {
object target = translator.getRawNetObject (luaState, 1); object target = translator.GetRawNetObject (luaState, 1);
if (target.IsNull ()) { if (target.IsNull ()) {
translator.throwError (luaState, "trying to index and invalid object reference"); translator.ThrowError (luaState, "trying to index and invalid object reference");
return 0; return 0;
} }
...@@ -541,17 +541,17 @@ namespace NLua ...@@ -541,17 +541,17 @@ namespace NLua
// First try to look up the parameter as a property name // First try to look up the parameter as a property name
string detailMessage; string detailMessage;
bool didMember = trySetMember (luaState, type, target, BindingFlags.Instance | BindingFlags.IgnoreCase, out detailMessage); bool didMember = TrySetMember (luaState, type, target, BindingFlags.Instance | BindingFlags.IgnoreCase, out detailMessage);
if (didMember) if (didMember)
return 0; // Must have found the property name return 0; // Must have found the property name
// We didn't find a property name, now see if we can use a [] style this accessor to set array contents // We didn't find a property name, now see if we can use a [] style this accessor to set array contents
try { try {
if (type.IsArray && LuaLib.lua_isnumber (luaState, 2)) { if (type.IsArray && LuaLib.LuaIsNumber (luaState, 2)) {
int index = (int)LuaLib.lua_tonumber (luaState, 2); int index = (int)LuaLib.LuaToNumber (luaState, 2);
var arr = (Array)target; var arr = (Array)target;
object val = translator.getAsType (luaState, 3, arr.GetType ().GetElementType ()); object val = translator.GetAsType (luaState, 3, arr.GetType ().GetElementType ());
arr.SetValue (val, index); arr.SetValue (val, index);
} else { } else {
// Try to see if we have a this[] accessor // Try to see if we have a this[] accessor
...@@ -561,9 +561,9 @@ namespace NLua ...@@ -561,9 +561,9 @@ namespace NLua
var valueType = args [1].ParameterType; var valueType = args [1].ParameterType;
// The new val ue the user specified // The new val ue the user specified
object val = translator.getAsType (luaState, 3, valueType); object val = translator.GetAsType (luaState, 3, valueType);
var indexType = args [0].ParameterType; var indexType = args [0].ParameterType;
object index = translator.getAsType (luaState, 2, indexType); object index = translator.GetAsType (luaState, 2, indexType);
object[] methodArgs = new object[2]; object[] methodArgs = new object[2];
...@@ -572,7 +572,7 @@ namespace NLua ...@@ -572,7 +572,7 @@ namespace NLua
methodArgs [1] = val; methodArgs [1] = val;
setter.Invoke (target, methodArgs); setter.Invoke (target, methodArgs);
} else } else
translator.throwError (luaState, detailMessage); // Pass the original message from trySetMember because it is probably best translator.ThrowError (luaState, detailMessage); // Pass the original message from trySetMember because it is probably best
} }
#if !SILVERLIGHT #if !SILVERLIGHT
} catch (SEHException) { } catch (SEHException) {
...@@ -594,7 +594,7 @@ namespace NLua ...@@ -594,7 +594,7 @@ namespace NLua
/// <param name="target"></param> /// <param name="target"></param>
/// <param name="bindingType"></param> /// <param name="bindingType"></param>
/// <returns>false if unable to find the named member, true for success</returns> /// <returns>false if unable to find the named member, true for success</returns>
private bool trySetMember (LuaState luaState, IReflect targetType, object target, BindingFlags bindingType, out string detailMessage) private bool TrySetMember (LuaState luaState, IReflect targetType, object target, BindingFlags bindingType, out string detailMessage)
{ {
detailMessage = null; // No error yet detailMessage = null; // No error yet
...@@ -602,27 +602,27 @@ namespace NLua ...@@ -602,27 +602,27 @@ namespace NLua
// changing the lua typecode to string // changing the lua typecode to string
// Note: We don't use isstring because the standard lua C isstring considers either strings or numbers to // Note: We don't use isstring because the standard lua C isstring considers either strings or numbers to
// be true for isstring. // be true for isstring.
if (LuaLib.lua_type (luaState, 2) != LuaTypes.String) { if (LuaLib.LuaType (luaState, 2) != LuaTypes.String) {
detailMessage = "property names must be strings"; detailMessage = "property names must be strings";
return false; return false;
} }
// We only look up property names by string // We only look up property names by string
string fieldName = LuaLib.lua_tostring (luaState, 2).ToString (); string fieldName = LuaLib.LuaToString (luaState, 2).ToString ();
if (fieldName.IsNull () || fieldName.Length < 1 || !(char.IsLetter (fieldName [0]) || fieldName [0] == '_')) { if (fieldName.IsNull () || fieldName.Length < 1 || !(char.IsLetter (fieldName [0]) || fieldName [0] == '_')) {
detailMessage = "invalid property name"; detailMessage = "invalid property name";
return false; return false;
} }
// Find our member via reflection or the cache // Find our member via reflection or the cache
var member = (MemberInfo)checkMemberCache (memberCache, targetType, fieldName); var member = (MemberInfo)CheckMemberCache (memberCache, targetType, fieldName);
if (member.IsNull ()) { if (member.IsNull ()) {
//CP: Removed NonPublic binding search and made case insensitive //CP: Removed NonPublic binding search and made case insensitive
var members = targetType.GetMember (fieldName, bindingType | BindingFlags.Public | BindingFlags.IgnoreCase/*| BindingFlags.NonPublic*/); var members = targetType.GetMember (fieldName, bindingType | BindingFlags.Public | BindingFlags.IgnoreCase/*| BindingFlags.NonPublic*/);
if (members.Length > 0) { if (members.Length > 0) {
member = members [0]; member = members [0];
setMemberCache (memberCache, targetType, fieldName, member); SetMemberCache (memberCache, targetType, fieldName, member);
} else { } else {
detailMessage = "field or property '" + fieldName + "' does not exist"; detailMessage = "field or property '" + fieldName + "' does not exist";
return false; return false;
...@@ -631,7 +631,7 @@ namespace NLua ...@@ -631,7 +631,7 @@ namespace NLua
if (member.MemberType == MemberTypes.Field) { if (member.MemberType == MemberTypes.Field) {
var field = (FieldInfo)member; var field = (FieldInfo)member;
object val = translator.getAsType (luaState, 3, field.FieldType); object val = translator.GetAsType (luaState, 3, field.FieldType);
try { try {
field.SetValue (target, val); field.SetValue (target, val);
...@@ -643,7 +643,7 @@ namespace NLua ...@@ -643,7 +643,7 @@ namespace NLua
return true; return true;
} else if (member.MemberType == MemberTypes.Property) { } else if (member.MemberType == MemberTypes.Property) {
var property = (PropertyInfo)member; var property = (PropertyInfo)member;
object val = translator.getAsType (luaState, 3, property.PropertyType); object val = translator.GetAsType (luaState, 3, property.PropertyType);
try { try {
property.SetValue (target, val, null); property.SetValue (target, val, null);
...@@ -663,13 +663,13 @@ namespace NLua ...@@ -663,13 +663,13 @@ namespace NLua
* Writes to fields or properties, either static or instance. Throws an error * Writes to fields or properties, either static or instance. Throws an error
* if the operation is invalid. * if the operation is invalid.
*/ */
private int setMember (LuaState luaState, IReflect targetType, object target, BindingFlags bindingType) private int SetMember (LuaState luaState, IReflect targetType, object target, BindingFlags bindingType)
{ {
string detail; string detail;
bool success = trySetMember (luaState, targetType, target, bindingType, out detail); bool success = TrySetMember (luaState, targetType, target, bindingType, out detail);
if (!success) if (!success)
translator.throwError (luaState, detail); translator.ThrowError (luaState, detail);
return 0; return 0;
} }
...@@ -687,7 +687,7 @@ namespace NLua ...@@ -687,7 +687,7 @@ namespace NLua
if (!te.IsNull ()) if (!te.IsNull ())
e = te.InnerException; e = te.InnerException;
translator.throwError (luaState, e); translator.ThrowError (luaState, e);
} }
/* /*
...@@ -697,38 +697,38 @@ namespace NLua ...@@ -697,38 +697,38 @@ namespace NLua
[MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))] [MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))]
#endif #endif
[System.Runtime.InteropServices.AllowReversePInvokeCalls] [System.Runtime.InteropServices.AllowReversePInvokeCalls]
private static int getClassMethod (LuaState luaState) private static int GetClassMethod (LuaState luaState)
{ {
var translator = ObjectTranslatorPool.Instance.Find (luaState); var translator = ObjectTranslatorPool.Instance.Find (luaState);
var instance = translator.MetaFunctionsInstance; var instance = translator.MetaFunctionsInstance;
return instance.getClassMethodInternal (luaState); return instance.GetClassMethodInternal (luaState);
} }
private int getClassMethodInternal (LuaState luaState) private int GetClassMethodInternal (LuaState luaState)
{ {
IReflect klass; IReflect klass;
object obj = translator.getRawNetObject (luaState, 1); object obj = translator.GetRawNetObject (luaState, 1);
if (obj.IsNull () || !(obj is IReflect)) { if (obj.IsNull () || !(obj is IReflect)) {
translator.throwError (luaState, "trying to index an invalid type reference"); translator.ThrowError (luaState, "trying to index an invalid type reference");
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
return 1; return 1;
} else } else
klass = (IReflect)obj; klass = (IReflect)obj;
if (LuaLib.lua_isnumber (luaState, 2)) { if (LuaLib.LuaIsNumber (luaState, 2)) {
int size = (int)LuaLib.lua_tonumber (luaState, 2); int size = (int)LuaLib.LuaToNumber (luaState, 2);
translator.push (luaState, Array.CreateInstance (klass.UnderlyingSystemType, size)); translator.Push (luaState, Array.CreateInstance (klass.UnderlyingSystemType, size));
return 1; return 1;
} else { } else {
string methodName = LuaLib.lua_tostring (luaState, 2).ToString (); string methodName = LuaLib.LuaToString (luaState, 2).ToString ();
if (methodName.IsNull ()) { if (methodName.IsNull ()) {
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
return 1; return 1;
} //CP: Ignore case } //CP: Ignore case
else else
return getMember (luaState, klass, null, methodName, BindingFlags.FlattenHierarchy | BindingFlags.Static | BindingFlags.IgnoreCase); return GetMember (luaState, klass, null, methodName, BindingFlags.FlattenHierarchy | BindingFlags.Static | BindingFlags.IgnoreCase);
} }
} }
...@@ -739,25 +739,25 @@ namespace NLua ...@@ -739,25 +739,25 @@ namespace NLua
[MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))] [MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))]
#endif #endif
[System.Runtime.InteropServices.AllowReversePInvokeCalls] [System.Runtime.InteropServices.AllowReversePInvokeCalls]
private static int setClassFieldOrProperty (LuaState luaState) private static int SetClassFieldOrProperty (LuaState luaState)
{ {
var translator = ObjectTranslatorPool.Instance.Find (luaState); var translator = ObjectTranslatorPool.Instance.Find (luaState);
var instance = translator.MetaFunctionsInstance; var instance = translator.MetaFunctionsInstance;
return instance.setClassFieldOrPropertyInternal (luaState); return instance.SetClassFieldOrPropertyInternal (luaState);
} }
private int setClassFieldOrPropertyInternal (LuaState luaState) private int SetClassFieldOrPropertyInternal (LuaState luaState)
{ {
IReflect target; IReflect target;
object obj = translator.getRawNetObject (luaState, 1); object obj = translator.GetRawNetObject (luaState, 1);
if (obj.IsNull () || !(obj is IReflect)) { if (obj.IsNull () || !(obj is IReflect)) {
translator.throwError (luaState, "trying to index an invalid type reference"); translator.ThrowError (luaState, "trying to index an invalid type reference");
return 0; return 0;
} else } else
target = (IReflect)obj; target = (IReflect)obj;
return setMember (luaState, target, null, BindingFlags.FlattenHierarchy | BindingFlags.Static | BindingFlags.IgnoreCase); return SetMember (luaState, target, null, BindingFlags.FlattenHierarchy | BindingFlags.Static | BindingFlags.IgnoreCase);
} }
/* /*
...@@ -770,40 +770,40 @@ namespace NLua ...@@ -770,40 +770,40 @@ namespace NLua
[MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))] [MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))]
#endif #endif
[System.Runtime.InteropServices.AllowReversePInvokeCalls] [System.Runtime.InteropServices.AllowReversePInvokeCalls]
private static int callConstructor (LuaState luaState) private static int CallConstructor (LuaState luaState)
{ {
var translator = ObjectTranslatorPool.Instance.Find (luaState); var translator = ObjectTranslatorPool.Instance.Find (luaState);
var instance = translator.MetaFunctionsInstance; var instance = translator.MetaFunctionsInstance;
return instance.callConstructorInternal (luaState); return instance.CallConstructorInternal (luaState);
} }
private int callConstructorInternal (LuaState luaState) private int CallConstructorInternal (LuaState luaState)
{ {
var validConstructor = new MethodCache (); var validConstructor = new MethodCache ();
IReflect klass; IReflect klass;
object obj = translator.getRawNetObject (luaState, 1); object obj = translator.GetRawNetObject (luaState, 1);
if (obj.IsNull () || !(obj is IReflect)) { if (obj.IsNull () || !(obj is IReflect)) {
translator.throwError (luaState, "trying to call constructor on an invalid type reference"); translator.ThrowError (luaState, "trying to call constructor on an invalid type reference");
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
return 1; return 1;
} else } else
klass = (IReflect)obj; klass = (IReflect)obj;
LuaLib.lua_remove (luaState, 1); LuaLib.LuaRemove (luaState, 1);
var constructors = klass.UnderlyingSystemType.GetConstructors (); var constructors = klass.UnderlyingSystemType.GetConstructors ();
foreach (var constructor in constructors) { foreach (var constructor in constructors) {
bool isConstructor = matchParameters (luaState, constructor, ref validConstructor); bool isConstructor = MatchParameters (luaState, constructor, ref validConstructor);
if (isConstructor) { if (isConstructor) {
try { try {
translator.push (luaState, constructor.Invoke (validConstructor.args)); translator.Push (luaState, constructor.Invoke (validConstructor.args));
} catch (TargetInvocationException e) { } catch (TargetInvocationException e) {
ThrowError (luaState, e); ThrowError (luaState, e);
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
} catch { } catch {
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
} }
return 1; return 1;
...@@ -811,9 +811,9 @@ namespace NLua ...@@ -811,9 +811,9 @@ namespace NLua
} }
string constructorName = (constructors.Length == 0) ? "unknown" : constructors [0].Name; string constructorName = (constructors.Length == 0) ? "unknown" : constructors [0].Name;
translator.throwError (luaState, String.Format ("{0} does not contain constructor({1}) argument match", translator.ThrowError (luaState, String.Format ("{0} does not contain constructor({1}) argument match",
klass.UnderlyingSystemType, constructorName)); klass.UnderlyingSystemType, constructorName));
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
return 1; return 1;
} }
private static bool IsInteger(double x) { private static bool IsInteger(double x) {
...@@ -862,13 +862,13 @@ namespace NLua ...@@ -862,13 +862,13 @@ namespace NLua
* if the match was succesful. It it was also returns the information * if the match was succesful. It it was also returns the information
* necessary to invoke the method. * necessary to invoke the method.
*/ */
internal bool matchParameters (LuaState luaState, MethodBase method, ref MethodCache methodCache) internal bool MatchParameters (LuaState luaState, MethodBase method, ref MethodCache methodCache)
{ {
ExtractValue extractValue; ExtractValue extractValue;
bool isMethod = true; bool isMethod = true;
var paramInfo = method.GetParameters (); var paramInfo = method.GetParameters ();
int currentLuaParam = 1; int currentLuaParam = 1;
int nLuaParams = LuaLib.lua_gettop (luaState); int nLuaParams = LuaLib.LuaGetTop (luaState);
var paramList = new List<object> (); var paramList = new List<object> ();
var outList = new List<int> (); var outList = new List<int> ();
var argTypes = new List<MethodArgs> (); var argTypes = new List<MethodArgs> ();
...@@ -889,7 +889,7 @@ namespace NLua ...@@ -889,7 +889,7 @@ namespace NLua
isMethod = false; isMethod = false;
break; break;
} }
} else if (_IsTypeCorrect (luaState, currentLuaParam, currentNetParam, out extractValue)) { // Type checking } else if (IsTypeCorrect (luaState, currentLuaParam, currentNetParam, out extractValue)) { // Type checking
var value = extractValue (luaState, currentLuaParam); var value = extractValue (luaState, currentLuaParam);
paramList.Add (value); paramList.Add (value);
int index = paramList.LastIndexOf (value); int index = paramList.LastIndexOf (value);
...@@ -903,7 +903,7 @@ namespace NLua ...@@ -903,7 +903,7 @@ namespace NLua
currentLuaParam++; currentLuaParam++;
} // Type does not match, ignore if the parameter is optional } // Type does not match, ignore if the parameter is optional
else if (_IsParamsArray (luaState, currentLuaParam, currentNetParam, out extractValue)) { else if (IsParamsArray (luaState, currentLuaParam, currentNetParam, out extractValue)) {
object luaParamValue = extractValue (luaState, currentLuaParam); object luaParamValue = extractValue (luaState, currentLuaParam);
var paramArrayType = currentNetParam.ParameterType.GetElementType (); var paramArrayType = currentNetParam.ParameterType.GetElementType ();
...@@ -947,10 +947,10 @@ namespace NLua ...@@ -947,10 +947,10 @@ namespace NLua
/// <param name="currentNetParam"></param> /// <param name="currentNetParam"></param>
/// <param name="extractValue"></param> /// <param name="extractValue"></param>
/// <returns></returns> /// <returns></returns>
private bool _IsTypeCorrect (LuaState luaState, int currentLuaParam, ParameterInfo currentNetParam, out ExtractValue extractValue) private bool IsTypeCorrect (LuaState luaState, int currentLuaParam, ParameterInfo currentNetParam, out ExtractValue extractValue)
{ {
try { try {
return (extractValue = translator.typeChecker.checkType (luaState, currentLuaParam, currentNetParam.ParameterType)) != null; return (extractValue = translator.typeChecker.CheckLuaType (luaState, currentLuaParam, currentNetParam.ParameterType)) != null;
} catch { } catch {
extractValue = null; extractValue = null;
Debug.WriteLine ("Type wasn't correct"); Debug.WriteLine ("Type wasn't correct");
...@@ -958,7 +958,7 @@ namespace NLua ...@@ -958,7 +958,7 @@ namespace NLua
} }
} }
private bool _IsParamsArray (LuaState luaState, int currentLuaParam, ParameterInfo currentNetParam, out ExtractValue extractValue) private bool IsParamsArray (LuaState luaState, int currentLuaParam, ParameterInfo currentNetParam, out ExtractValue extractValue)
{ {
extractValue = null; extractValue = null;
...@@ -966,7 +966,7 @@ namespace NLua ...@@ -966,7 +966,7 @@ namespace NLua
LuaTypes luaType; LuaTypes luaType;
try { try {
luaType = LuaLib.lua_type (luaState, currentLuaParam); luaType = LuaLib.LuaType (luaState, currentLuaParam);
} catch (Exception ex) { } catch (Exception ex) {
Debug.WriteLine ("Could not retrieve lua type while attempting to determine params Array Status."); Debug.WriteLine ("Could not retrieve lua type while attempting to determine params Array Status.");
Debug.WriteLine (ex.Message); Debug.WriteLine (ex.Message);
...@@ -976,7 +976,7 @@ namespace NLua ...@@ -976,7 +976,7 @@ namespace NLua
if (luaType == LuaTypes.Table) { if (luaType == LuaTypes.Table) {
try { try {
extractValue = translator.typeChecker.getExtractor (typeof(LuaTable)); extractValue = translator.typeChecker.GetExtractor (typeof(LuaTable));
} catch (Exception/* ex*/) { } catch (Exception/* ex*/) {
Debug.WriteLine ("An error occurred during an attempt to retrieve a LuaTable extractor while checking for params array status."); Debug.WriteLine ("An error occurred during an attempt to retrieve a LuaTable extractor while checking for params array status.");
} }
...@@ -988,7 +988,7 @@ namespace NLua ...@@ -988,7 +988,7 @@ namespace NLua
var paramElementType = currentNetParam.ParameterType.GetElementType (); var paramElementType = currentNetParam.ParameterType.GetElementType ();
try { try {
extractValue = translator.typeChecker.checkType (luaState, currentLuaParam, paramElementType); extractValue = translator.typeChecker.CheckLuaType (luaState, currentLuaParam, paramElementType);
} catch (Exception/* ex*/) { } catch (Exception/* ex*/) {
Debug.WriteLine (string.Format ("An error occurred during an attempt to retrieve an extractor ({0}) while checking for params array status.", paramElementType.FullName)); Debug.WriteLine (string.Format ("An error occurred during an attempt to retrieve an extractor ({0}) while checking for params array status.", paramElementType.FullName));
} }
......
...@@ -38,9 +38,9 @@ namespace NLua.Method ...@@ -38,9 +38,9 @@ namespace NLua.Method
* Gets the function called name from the provided table, * Gets the function called name from the provided table,
* returning null if it does not exist * returning null if it does not exist
*/ */
public static LuaFunction getTableFunction (LuaTable luaTable, string name) public static LuaFunction GetTableFunction (LuaTable luaTable, string name)
{ {
object funcObj = luaTable.rawget (name); object funcObj = luaTable.RawGet (name);
if (funcObj is LuaFunction) if (funcObj is LuaFunction)
return (LuaFunction)funcObj; return (LuaFunction)funcObj;
...@@ -51,14 +51,14 @@ namespace NLua.Method ...@@ -51,14 +51,14 @@ namespace NLua.Method
/* /*
* Calls the provided function with the provided parameters * Calls the provided function with the provided parameters
*/ */
public static object callFunction (LuaFunction function, object[] args, Type[] returnTypes, object[] inArgs, int[] outArgs) public static object CallFunction (LuaFunction function, object[] args, Type[] returnTypes, object[] inArgs, int[] outArgs)
{ {
// args is the return array of arguments, inArgs is the actual array // args is the return array of arguments, inArgs is the actual array
// of arguments passed to the function (with in parameters only), outArgs // of arguments passed to the function (with in parameters only), outArgs
// has the positions of out parameters // has the positions of out parameters
object returnValue; object returnValue;
int iRefArgs; int iRefArgs;
object[] returnValues = function.call (inArgs, returnTypes); object[] returnValues = function.Call (inArgs, returnTypes);
if (returnTypes [0] == typeof(void)) { if (returnTypes [0] == typeof(void)) {
returnValue = null; returnValue = null;
......
...@@ -45,14 +45,14 @@ namespace NLua.Method ...@@ -45,14 +45,14 @@ namespace NLua.Method
returnTypes = null; returnTypes = null;
} }
public object callFunction (object[] args, object[] inArgs, int[] outArgs) public object CallFunction (object[] args, object[] inArgs, int[] outArgs)
{ {
// args is the return array of arguments, inArgs is the actual array // args is the return array of arguments, inArgs is the actual array
// of arguments passed to the function (with in parameters only), outArgs // of arguments passed to the function (with in parameters only), outArgs
// has the positions of out parameters // has the positions of out parameters
object returnValue; object returnValue;
int iRefArgs; int iRefArgs;
object[] returnValues = function.call (inArgs, returnTypes); object[] returnValues = function.Call (inArgs, returnTypes);
if (returnTypes [0] == typeof(void)) { if (returnTypes [0] == typeof(void)) {
returnValue = null; returnValue = null;
......
...@@ -40,7 +40,7 @@ namespace NLua.Method ...@@ -40,7 +40,7 @@ namespace NLua.Method
// CP: Fix provided by Ben Bryant for delegates with one param // CP: Fix provided by Ben Bryant for delegates with one param
// link: http://luaforge.net/forum/message.php?msg_id=9318 // link: http://luaforge.net/forum/message.php?msg_id=9318
public void handleEvent (object[] args) public void HandleEvent (object[] args)
{ {
handler.Call (args); handler.Call (args);
} }
......
...@@ -66,12 +66,12 @@ namespace NLua.Method ...@@ -66,12 +66,12 @@ namespace NLua.Method
*/ */
public LuaMethodWrapper (ObjectTranslator translator, object target, IReflect targetType, MethodBase method) public LuaMethodWrapper (ObjectTranslator translator, object target, IReflect targetType, MethodBase method)
{ {
invokeFunction = new LuaCore.LuaNativeFunction (this.call); invokeFunction = new LuaCore.LuaNativeFunction (this.Call);
_Translator = translator; _Translator = translator;
_Target = target; _Target = target;
if (!targetType.IsNull ()) if (!targetType.IsNull ())
_ExtractTarget = translator.typeChecker.getExtractor (targetType); _ExtractTarget = translator.typeChecker.GetExtractor (targetType);
_Method = method; _Method = method;
_MethodName = method.Name; _MethodName = method.Name;
...@@ -87,13 +87,13 @@ namespace NLua.Method ...@@ -87,13 +87,13 @@ namespace NLua.Method
*/ */
public LuaMethodWrapper (ObjectTranslator translator, IReflect targetType, string methodName, BindingFlags bindingType) public LuaMethodWrapper (ObjectTranslator translator, IReflect targetType, string methodName, BindingFlags bindingType)
{ {
invokeFunction = new LuaCore.LuaNativeFunction (this.call); invokeFunction = new LuaCore.LuaNativeFunction (this.Call);
_Translator = translator; _Translator = translator;
_MethodName = methodName; _MethodName = methodName;
if (!targetType.IsNull ()) if (!targetType.IsNull ())
_ExtractTarget = translator.typeChecker.getExtractor (targetType); _ExtractTarget = translator.typeChecker.GetExtractor (targetType);
_BindingType = bindingType; _BindingType = bindingType;
//CP: Removed NonPublic binding search and added IgnoreCase //CP: Removed NonPublic binding search and added IgnoreCase
...@@ -114,14 +114,14 @@ namespace NLua.Method ...@@ -114,14 +114,14 @@ namespace NLua.Method
* Calls the method. Receives the arguments from the Lua stack * Calls the method. Receives the arguments from the Lua stack
* and returns values in it. * and returns values in it.
*/ */
int call (LuaState luaState) int Call (LuaState luaState)
{ {
var methodToCall = _Method; var methodToCall = _Method;
object targetObject = _Target; object targetObject = _Target;
bool failedCall = true; bool failedCall = true;
int nReturnValues = 0; int nReturnValues = 0;
if (!LuaLib.lua_checkstack (luaState, 5)) if (!LuaLib.LuaCheckStack (luaState, 5))
throw new LuaException ("Lua stack overflow"); throw new LuaException ("Lua stack overflow");
bool isStatic = (_BindingType & BindingFlags.Static) == BindingFlags.Static; bool isStatic = (_BindingType & BindingFlags.Static) == BindingFlags.Static;
...@@ -136,11 +136,11 @@ namespace NLua.Method ...@@ -136,11 +136,11 @@ namespace NLua.Method
//LuaLib.lua_remove(luaState,1); // Pops the receiver //LuaLib.lua_remove(luaState,1); // Pops the receiver
if (!_LastCalledMethod.cachedMethod.IsNull ()) { // Cached? if (!_LastCalledMethod.cachedMethod.IsNull ()) { // Cached?
int numStackToSkip = isStatic ? 0 : 1; // If this is an instance invoe we will have an extra arg on the stack for the targetObject int numStackToSkip = isStatic ? 0 : 1; // If this is an instance invoe we will have an extra arg on the stack for the targetObject
int numArgsPassed = LuaLib.lua_gettop (luaState) - numStackToSkip; int numArgsPassed = LuaLib.LuaGetTop (luaState) - numStackToSkip;
MethodBase method = _LastCalledMethod.cachedMethod; MethodBase method = _LastCalledMethod.cachedMethod;
if (numArgsPassed == _LastCalledMethod.argTypes.Length) { // No. of args match? if (numArgsPassed == _LastCalledMethod.argTypes.Length) { // No. of args match?
if (!LuaLib.lua_checkstack (luaState, _LastCalledMethod.outList.Length + 6)) if (!LuaLib.LuaCheckStack (luaState, _LastCalledMethod.outList.Length + 6))
throw new LuaException ("Lua stack overflow"); throw new LuaException ("Lua stack overflow");
object [] args = _LastCalledMethod.args; object [] args = _LastCalledMethod.args;
...@@ -152,24 +152,24 @@ namespace NLua.Method ...@@ -152,24 +152,24 @@ namespace NLua.Method
object luaParamValue = type.extractValue (luaState, i + 1 + numStackToSkip); object luaParamValue = type.extractValue (luaState, i + 1 + numStackToSkip);
if (_LastCalledMethod.argTypes [i].isParamsArray) { if (_LastCalledMethod.argTypes [i].isParamsArray) {
Array paramArray = _Translator.tableToArray (luaParamValue, type.paramsArrayType); Array paramArray = _Translator.TableToArray (luaParamValue, type.paramsArrayType);
args [_LastCalledMethod.argTypes [i].index] = paramArray; args [_LastCalledMethod.argTypes [i].index] = paramArray;
} else { } else {
args [type.index] = luaParamValue; args [type.index] = luaParamValue;
} }
if (_LastCalledMethod.args [_LastCalledMethod.argTypes [i].index] == null && if (_LastCalledMethod.args [_LastCalledMethod.argTypes [i].index] == null &&
!LuaLib.lua_isnil (luaState, i + 1 + numStackToSkip)) !LuaLib.LuaIsNil (luaState, i + 1 + numStackToSkip))
throw new LuaException ("argument number " + (i + 1) + " is invalid"); throw new LuaException ("argument number " + (i + 1) + " is invalid");
} }
if ((_BindingType & BindingFlags.Static) == BindingFlags.Static) if ((_BindingType & BindingFlags.Static) == BindingFlags.Static)
_Translator.push (luaState, method.Invoke (null, _LastCalledMethod.args)); _Translator.Push (luaState, method.Invoke (null, _LastCalledMethod.args));
else { else {
if (method.IsConstructor) if (method.IsConstructor)
_Translator.push (luaState, ((ConstructorInfo)method).Invoke (_LastCalledMethod.args)); _Translator.Push (luaState, ((ConstructorInfo)method).Invoke (_LastCalledMethod.args));
else else
_Translator.push (luaState, method.Invoke (targetObject, _LastCalledMethod.args)); _Translator.Push (luaState, method.Invoke (targetObject, _LastCalledMethod.args));
} }
failedCall = false; failedCall = false;
...@@ -190,12 +190,12 @@ namespace NLua.Method ...@@ -190,12 +190,12 @@ namespace NLua.Method
// If we are running an instance variable, we can now pop the targetObject from the stack // If we are running an instance variable, we can now pop the targetObject from the stack
if (!isStatic) { if (!isStatic) {
if (targetObject.IsNull ()) { if (targetObject.IsNull ()) {
_Translator.throwError (luaState, String.Format ("instance method '{0}' requires a non null target object", _MethodName)); _Translator.ThrowError (luaState, String.Format ("instance method '{0}' requires a non null target object", _MethodName));
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
return 1; return 1;
} }
LuaLib.lua_remove (luaState, 1); // Pops the receiver LuaLib.LuaRemove (luaState, 1); // Pops the receiver
} }
bool hasMatch = false; bool hasMatch = false;
...@@ -204,7 +204,7 @@ namespace NLua.Method ...@@ -204,7 +204,7 @@ namespace NLua.Method
foreach (var member in _Members) { foreach (var member in _Members) {
candidateName = member.ReflectedType.Name + "." + member.Name; candidateName = member.ReflectedType.Name + "." + member.Name;
var m = (MethodInfo)member; var m = (MethodInfo)member;
bool isMethod = _Translator.matchParameters (luaState, m, ref _LastCalledMethod); bool isMethod = _Translator.MatchParameters (luaState, m, ref _LastCalledMethod);
if (isMethod) { if (isMethod) {
hasMatch = true; hasMatch = true;
...@@ -214,15 +214,15 @@ namespace NLua.Method ...@@ -214,15 +214,15 @@ namespace NLua.Method
if (!hasMatch) { if (!hasMatch) {
string msg = (candidateName == null) ? "invalid arguments to method call" : ("invalid arguments to method: " + candidateName); string msg = (candidateName == null) ? "invalid arguments to method call" : ("invalid arguments to method: " + candidateName);
_Translator.throwError (luaState, msg); _Translator.ThrowError (luaState, msg);
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
return 1; return 1;
} }
} }
} else { // Method from MethodBase instance } else { // Method from MethodBase instance
if (methodToCall.ContainsGenericParameters) { if (methodToCall.ContainsGenericParameters) {
_Translator.matchParameters (luaState, methodToCall, ref _LastCalledMethod); _Translator.MatchParameters (luaState, methodToCall, ref _LastCalledMethod);
if (methodToCall.IsGenericMethodDefinition) { if (methodToCall.IsGenericMethodDefinition) {
//need to make a concrete type of the generic method definition //need to make a concrete type of the generic method definition
...@@ -232,39 +232,39 @@ namespace NLua.Method ...@@ -232,39 +232,39 @@ namespace NLua.Method
typeArgs.Add (arg.GetType ()); typeArgs.Add (arg.GetType ());
var concreteMethod = (methodToCall as MethodInfo).MakeGenericMethod (typeArgs.ToArray ()); var concreteMethod = (methodToCall as MethodInfo).MakeGenericMethod (typeArgs.ToArray ());
_Translator.push (luaState, concreteMethod.Invoke (targetObject, _LastCalledMethod.args)); _Translator.Push (luaState, concreteMethod.Invoke (targetObject, _LastCalledMethod.args));
failedCall = false; failedCall = false;
} else if (methodToCall.ContainsGenericParameters) { } else if (methodToCall.ContainsGenericParameters) {
_Translator.throwError (luaState, "unable to invoke method on generic class as the current method is an open generic method"); _Translator.ThrowError (luaState, "unable to invoke method on generic class as the current method is an open generic method");
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
return 1; return 1;
} }
} else { } else {
if (!methodToCall.IsStatic && !methodToCall.IsConstructor && targetObject == null) { if (!methodToCall.IsStatic && !methodToCall.IsConstructor && targetObject == null) {
targetObject = _ExtractTarget (luaState, 1); targetObject = _ExtractTarget (luaState, 1);
LuaLib.lua_remove (luaState, 1); // Pops the receiver LuaLib.LuaRemove (luaState, 1); // Pops the receiver
} }
if (!_Translator.matchParameters (luaState, methodToCall, ref _LastCalledMethod)) { if (!_Translator.MatchParameters (luaState, methodToCall, ref _LastCalledMethod)) {
_Translator.throwError (luaState, "invalid arguments to method call"); _Translator.ThrowError (luaState, "invalid arguments to method call");
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
return 1; return 1;
} }
} }
} }
if (failedCall) { if (failedCall) {
if (!LuaLib.lua_checkstack (luaState, _LastCalledMethod.outList.Length + 6)) if (!LuaLib.LuaCheckStack (luaState, _LastCalledMethod.outList.Length + 6))
throw new LuaException ("Lua stack overflow"); throw new LuaException ("Lua stack overflow");
try { try {
if (isStatic) if (isStatic)
_Translator.push (luaState, _LastCalledMethod.cachedMethod.Invoke (null, _LastCalledMethod.args)); _Translator.Push (luaState, _LastCalledMethod.cachedMethod.Invoke (null, _LastCalledMethod.args));
else { else {
if (_LastCalledMethod.cachedMethod.IsConstructor) if (_LastCalledMethod.cachedMethod.IsConstructor)
_Translator.push (luaState, ((ConstructorInfo)_LastCalledMethod.cachedMethod).Invoke (_LastCalledMethod.args)); _Translator.Push (luaState, ((ConstructorInfo)_LastCalledMethod.cachedMethod).Invoke (_LastCalledMethod.args));
else else
_Translator.push (luaState, _LastCalledMethod.cachedMethod.Invoke (targetObject, _LastCalledMethod.args)); _Translator.Push (luaState, _LastCalledMethod.cachedMethod.Invoke (targetObject, _LastCalledMethod.args));
} }
} catch (TargetInvocationException e) { } catch (TargetInvocationException e) {
return SetPendingException (e.GetBaseException ()); return SetPendingException (e.GetBaseException ());
...@@ -276,7 +276,7 @@ namespace NLua.Method ...@@ -276,7 +276,7 @@ namespace NLua.Method
// Pushes out and ref return values // Pushes out and ref return values
for (int index = 0; index < _LastCalledMethod.outList.Length; index++) { for (int index = 0; index < _LastCalledMethod.outList.Length; index++) {
nReturnValues++; nReturnValues++;
_Translator.push (luaState, _LastCalledMethod.args [_LastCalledMethod.outList [index]]); _Translator.Push (luaState, _LastCalledMethod.args [_LastCalledMethod.outList [index]]);
} }
//by isSingle 2010-09-10 11:26:31 //by isSingle 2010-09-10 11:26:31
......
...@@ -59,13 +59,6 @@ namespace NLua.Method ...@@ -59,13 +59,6 @@ namespace NLua.Method
pendingEvents.Add (handlerDelegate, this); pendingEvents.Add (handlerDelegate, this);
return handlerDelegate; return handlerDelegate;
//MethodInfo mi = eventInfo.EventHandlerType.GetMethod("Invoke");
//ParameterInfo[] pi = mi.GetParameters();
//LuaEventHandler handler=CodeGeneration.Instance.GetEvent(pi[1].ParameterType,function);
//Delegate handlerDelegate=Delegate.CreateDelegate(eventInfo.EventHandlerType,handler,"HandleEvent");
//eventInfo.AddEventHandler(target,handlerDelegate);
//pendingEvents.Add(handlerDelegate, this);
//return handlerDelegate;
} }
/* /*
......
...@@ -86,141 +86,141 @@ namespace NLua ...@@ -86,141 +86,141 @@ namespace NLua
metaFunctions = new MetaFunctions (this); metaFunctions = new MetaFunctions (this);
assemblies = new List<Assembly> (); assemblies = new List<Assembly> ();
importTypeFunction = new LuaCore.LuaNativeFunction (ObjectTranslator.importType); importTypeFunction = new LuaCore.LuaNativeFunction (ObjectTranslator.ImportType);
loadAssemblyFunction = new LuaCore.LuaNativeFunction (ObjectTranslator.loadAssembly); loadAssemblyFunction = new LuaCore.LuaNativeFunction (ObjectTranslator.LoadAssembly);
registerTableFunction = new LuaCore.LuaNativeFunction (ObjectTranslator.registerTable); registerTableFunction = new LuaCore.LuaNativeFunction (ObjectTranslator.RegisterTable);
unregisterTableFunction = new LuaCore.LuaNativeFunction (ObjectTranslator.unregisterTable); unregisterTableFunction = new LuaCore.LuaNativeFunction (ObjectTranslator.UnregisterTable);
getMethodSigFunction = new LuaCore.LuaNativeFunction (ObjectTranslator.getMethodSignature); getMethodSigFunction = new LuaCore.LuaNativeFunction (ObjectTranslator.GetMethodSignature);
getConstructorSigFunction = new LuaCore.LuaNativeFunction (ObjectTranslator.getConstructorSignature); getConstructorSigFunction = new LuaCore.LuaNativeFunction (ObjectTranslator.GetConstructorSignature);
createLuaObjectList (luaState); CreateLuaObjectList (luaState);
createIndexingMetaFunction (luaState); CreateIndexingMetaFunction (luaState);
createBaseClassMetatable (luaState); CreateBaseClassMetatable (luaState);
createClassMetatable (luaState); CreateClassMetatable (luaState);
createFunctionMetatable (luaState); CreateFunctionMetatable (luaState);
setGlobalFunctions (luaState); SetGlobalFunctions (luaState);
} }
/* /*
* Sets up the list of objects in the Lua side * Sets up the list of objects in the Lua side
*/ */
private void createLuaObjectList (LuaState luaState) private void CreateLuaObjectList (LuaState luaState)
{ {
LuaLib.lua_pushstring (luaState, "luaNet_objects"); LuaLib.LuaPushString (luaState, "luaNet_objects");
LuaLib.lua_newtable (luaState); LuaLib.LuaNewTable (luaState);
LuaLib.lua_newtable (luaState); LuaLib.LuaNewTable (luaState);
LuaLib.lua_pushstring (luaState, "__mode"); LuaLib.LuaPushString (luaState, "__mode");
LuaLib.lua_pushstring (luaState, "v"); LuaLib.LuaPushString (luaState, "v");
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
LuaLib.lua_setmetatable (luaState, -2); LuaLib.LuaSetMetatable (luaState, -2);
LuaLib.lua_settable (luaState, (int)LuaIndexes.Registry); LuaLib.LuaSetTable (luaState, (int)LuaIndexes.Registry);
} }
/* /*
* Registers the indexing function of CLR objects * Registers the indexing function of CLR objects
* passed to Lua * passed to Lua
*/ */
private void createIndexingMetaFunction (LuaState luaState) private void CreateIndexingMetaFunction (LuaState luaState)
{ {
LuaLib.lua_pushstring (luaState, "luaNet_indexfunction"); LuaLib.LuaPushString (luaState, "luaNet_indexfunction");
LuaLib.luaL_dostring (luaState, MetaFunctions.luaIndexFunction); // steffenj: lua_dostring renamed to luaL_dostring LuaLib.LuaLDoString (luaState, MetaFunctions.luaIndexFunction);
LuaLib.lua_rawset (luaState, (int)LuaIndexes.Registry); LuaLib.LuaRawSet (luaState, (int)LuaIndexes.Registry);
} }
/* /*
* Creates the metatable for superclasses (the base * Creates the metatable for superclasses (the base
* field of registered tables) * field of registered tables)
*/ */
private void createBaseClassMetatable (LuaState luaState) private void CreateBaseClassMetatable (LuaState luaState)
{ {
LuaLib.luaL_newmetatable (luaState, "luaNet_searchbase"); LuaLib.LuaLNewMetatable (luaState, "luaNet_searchbase");
LuaLib.lua_pushstring (luaState, "__gc"); LuaLib.LuaPushString (luaState, "__gc");
LuaLib.lua_pushstdcallcfunction (luaState, metaFunctions.gcFunction); LuaLib.LuaPushStdCallCFunction (luaState, metaFunctions.gcFunction);
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
LuaLib.lua_pushstring (luaState, "__tostring"); LuaLib.LuaPushString (luaState, "__tostring");
LuaLib.lua_pushstdcallcfunction (luaState, metaFunctions.toStringFunction); LuaLib.LuaPushStdCallCFunction (luaState, metaFunctions.toStringFunction);
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
LuaLib.lua_pushstring (luaState, "__index"); LuaLib.LuaPushString (luaState, "__index");
LuaLib.lua_pushstdcallcfunction (luaState, metaFunctions.baseIndexFunction); LuaLib.LuaPushStdCallCFunction (luaState, metaFunctions.baseIndexFunction);
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
LuaLib.lua_pushstring (luaState, "__newindex"); LuaLib.LuaPushString (luaState, "__newindex");
LuaLib.lua_pushstdcallcfunction (luaState, metaFunctions.newindexFunction); LuaLib.LuaPushStdCallCFunction (luaState, metaFunctions.newindexFunction);
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
LuaLib.lua_settop (luaState, -2); LuaLib.LuaSetTop (luaState, -2);
} }
/* /*
* Creates the metatable for type references * Creates the metatable for type references
*/ */
private void createClassMetatable (LuaState luaState) private void CreateClassMetatable (LuaState luaState)
{ {
LuaLib.luaL_newmetatable (luaState, "luaNet_class"); LuaLib.LuaLNewMetatable (luaState, "luaNet_class");
LuaLib.lua_pushstring (luaState, "__gc"); LuaLib.LuaPushString (luaState, "__gc");
LuaLib.lua_pushstdcallcfunction (luaState, metaFunctions.gcFunction); LuaLib.LuaPushStdCallCFunction (luaState, metaFunctions.gcFunction);
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
LuaLib.lua_pushstring (luaState, "__tostring"); LuaLib.LuaPushString (luaState, "__tostring");
LuaLib.lua_pushstdcallcfunction (luaState, metaFunctions.toStringFunction); LuaLib.LuaPushStdCallCFunction (luaState, metaFunctions.toStringFunction);
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
LuaLib.lua_pushstring (luaState, "__index"); LuaLib.LuaPushString (luaState, "__index");
LuaLib.lua_pushstdcallcfunction (luaState, metaFunctions.classIndexFunction); LuaLib.LuaPushStdCallCFunction (luaState, metaFunctions.classIndexFunction);
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
LuaLib.lua_pushstring (luaState, "__newindex"); LuaLib.LuaPushString (luaState, "__newindex");
LuaLib.lua_pushstdcallcfunction (luaState, metaFunctions.classNewindexFunction); LuaLib.LuaPushStdCallCFunction (luaState, metaFunctions.classNewindexFunction);
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
LuaLib.lua_pushstring (luaState, "__call"); LuaLib.LuaPushString (luaState, "__call");
LuaLib.lua_pushstdcallcfunction (luaState, metaFunctions.callConstructorFunction); LuaLib.LuaPushStdCallCFunction (luaState, metaFunctions.callConstructorFunction);
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
LuaLib.lua_settop (luaState, -2); LuaLib.LuaSetTop (luaState, -2);
} }
/* /*
* Registers the global functions used by NLua * Registers the global functions used by NLua
*/ */
private void setGlobalFunctions (LuaState luaState) private void SetGlobalFunctions (LuaState luaState)
{ {
LuaLib.lua_pushstdcallcfunction (luaState, metaFunctions.indexFunction); LuaLib.LuaPushStdCallCFunction (luaState, metaFunctions.indexFunction);
LuaLib.lua_setglobal (luaState, "get_object_member"); LuaLib.LuaSetGlobal (luaState, "get_object_member");
LuaLib.lua_pushstdcallcfunction (luaState, importTypeFunction); LuaLib.LuaPushStdCallCFunction (luaState, importTypeFunction);
LuaLib.lua_setglobal (luaState, "import_type"); LuaLib.LuaSetGlobal (luaState, "import_type");
LuaLib.lua_pushstdcallcfunction (luaState, loadAssemblyFunction); LuaLib.LuaPushStdCallCFunction (luaState, loadAssemblyFunction);
LuaLib.lua_setglobal (luaState, "load_assembly"); LuaLib.LuaSetGlobal (luaState, "load_assembly");
LuaLib.lua_pushstdcallcfunction (luaState, registerTableFunction); LuaLib.LuaPushStdCallCFunction (luaState, registerTableFunction);
LuaLib.lua_setglobal (luaState, "make_object"); LuaLib.LuaSetGlobal (luaState, "make_object");
LuaLib.lua_pushstdcallcfunction (luaState, unregisterTableFunction); LuaLib.LuaPushStdCallCFunction (luaState, unregisterTableFunction);
LuaLib.lua_setglobal (luaState, "free_object"); LuaLib.LuaSetGlobal (luaState, "free_object");
LuaLib.lua_pushstdcallcfunction (luaState, getMethodSigFunction); LuaLib.LuaPushStdCallCFunction (luaState, getMethodSigFunction);
LuaLib.lua_setglobal (luaState, "get_method_bysig"); LuaLib.LuaSetGlobal (luaState, "get_method_bysig");
LuaLib.lua_pushstdcallcfunction (luaState, getConstructorSigFunction); LuaLib.LuaPushStdCallCFunction (luaState, getConstructorSigFunction);
LuaLib.lua_setglobal (luaState, "get_constructor_bysig"); LuaLib.LuaSetGlobal (luaState, "get_constructor_bysig");
} }
/* /*
* Creates the metatable for delegates * Creates the metatable for delegates
*/ */
private void createFunctionMetatable (LuaState luaState) private void CreateFunctionMetatable (LuaState luaState)
{ {
LuaLib.luaL_newmetatable (luaState, "luaNet_function"); LuaLib.LuaLNewMetatable (luaState, "luaNet_function");
LuaLib.lua_pushstring (luaState, "__gc"); LuaLib.LuaPushString (luaState, "__gc");
LuaLib.lua_pushstdcallcfunction (luaState, metaFunctions.gcFunction); LuaLib.LuaPushStdCallCFunction (luaState, metaFunctions.gcFunction);
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
LuaLib.lua_pushstring (luaState, "__call"); LuaLib.LuaPushString (luaState, "__call");
LuaLib.lua_pushstdcallcfunction (luaState, metaFunctions.execDelegateFunction); LuaLib.LuaPushStdCallCFunction (luaState, metaFunctions.execDelegateFunction);
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
LuaLib.lua_settop (luaState, -2); LuaLib.LuaSetTop (luaState, -2);
} }
/* /*
* Passes errors (argument e) to the Lua interpreter * Passes errors (argument e) to the Lua interpreter
*/ */
internal void throwError (LuaState luaState, object e) internal void ThrowError (LuaState luaState, object e)
{ {
// We use this to remove anything pushed by luaL_where // We use this to remove anything pushed by luaL_where
int oldTop = LuaLib.lua_gettop (luaState); int oldTop = LuaLib.LuaGetTop (luaState);
// Stack frame #1 is our C# wrapper, so not very interesting to the user // Stack frame #1 is our C# wrapper, so not very interesting to the user
// Stack frame #2 must be the lua code that called us, so that's what we want to use // Stack frame #2 must be the lua code that called us, so that's what we want to use
LuaLib.luaL_where (luaState, 1); LuaLib.LuaLWhere (luaState, 1);
var curlev = popValues (luaState, oldTop); var curlev = PopValues (luaState, oldTop);
// Determine the position in the script where the exception was triggered // Determine the position in the script where the exception was triggered
string errLocation = string.Empty; string errLocation = string.Empty;
...@@ -242,8 +242,8 @@ namespace NLua ...@@ -242,8 +242,8 @@ namespace NLua
} }
} }
push (luaState, e); Push (luaState, e);
LuaLib.lua_error (luaState); LuaLib.LuaError (luaState);
} }
/* /*
...@@ -254,16 +254,16 @@ namespace NLua ...@@ -254,16 +254,16 @@ namespace NLua
[MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))] [MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))]
#endif #endif
[System.Runtime.InteropServices.AllowReversePInvokeCalls] [System.Runtime.InteropServices.AllowReversePInvokeCalls]
private static int loadAssembly (LuaState luaState) private static int LoadAssembly (LuaState luaState)
{ {
var translator = ObjectTranslatorPool.Instance.Find (luaState); var translator = ObjectTranslatorPool.Instance.Find (luaState);
return translator.loadAssemblyInternal (luaState); return translator.LoadAssemblyInternal (luaState);
} }
private int loadAssemblyInternal (LuaState luaState) private int LoadAssemblyInternal (LuaState luaState)
{ {
try { try {
string assemblyName = LuaLib.lua_tostring (luaState, 1).ToString (); string assemblyName = LuaLib.LuaToString (luaState, 1).ToString ();
Assembly assembly = null; Assembly assembly = null;
try { try {
...@@ -280,7 +280,7 @@ namespace NLua ...@@ -280,7 +280,7 @@ namespace NLua
if (!assembly.IsNull () && !assemblies.Contains (assembly)) if (!assembly.IsNull () && !assemblies.Contains (assembly))
assemblies.Add (assembly); assemblies.Add (assembly);
} catch (Exception e) { } catch (Exception e) {
throwError (luaState, e); ThrowError (luaState, e);
} }
return 0; return 0;
...@@ -305,21 +305,21 @@ namespace NLua ...@@ -305,21 +305,21 @@ namespace NLua
[MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))] [MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))]
#endif #endif
[System.Runtime.InteropServices.AllowReversePInvokeCalls] [System.Runtime.InteropServices.AllowReversePInvokeCalls]
private static int importType (LuaState luaState) private static int ImportType (LuaState luaState)
{ {
var translator = ObjectTranslatorPool.Instance.Find (luaState); var translator = ObjectTranslatorPool.Instance.Find (luaState);
return translator.importTypeInternal (luaState); return translator.ImportTypeInternal (luaState);
} }
private int importTypeInternal (LuaState luaState) private int ImportTypeInternal (LuaState luaState)
{ {
string className = LuaLib.lua_tostring (luaState, 1).ToString (); string className = LuaLib.LuaToString (luaState, 1).ToString ();
var klass = FindType (className); var klass = FindType (className);
if (!klass.IsNull ()) if (!klass.IsNull ())
pushType (luaState, klass); PushType (luaState, klass);
else else
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
return 1; return 1;
} }
...@@ -333,17 +333,17 @@ namespace NLua ...@@ -333,17 +333,17 @@ namespace NLua
[MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))] [MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))]
#endif #endif
[System.Runtime.InteropServices.AllowReversePInvokeCalls] [System.Runtime.InteropServices.AllowReversePInvokeCalls]
private static int registerTable (LuaState luaState) private static int RegisterTable (LuaState luaState)
{ {
var translator = ObjectTranslatorPool.Instance.Find (luaState); var translator = ObjectTranslatorPool.Instance.Find (luaState);
return translator.registerTableInternal (luaState); return translator.RegisterTableInternal (luaState);
} }
private int registerTableInternal (LuaState luaState) private int RegisterTableInternal (LuaState luaState)
{ {
if (LuaLib.lua_type (luaState, 1) == LuaTypes.Table) { if (LuaLib.LuaType (luaState, 1) == LuaTypes.Table) {
var luaTable = getTable (luaState, 1); var luaTable = GetTable (luaState, 1);
string superclassName = LuaLib.lua_tostring (luaState, 2).ToString (); string superclassName = LuaLib.LuaToString (luaState, 2).ToString ();
if (!superclassName.IsNull ()) { if (!superclassName.IsNull ()) {
var klass = FindType (superclassName); var klass = FindType (superclassName);
...@@ -352,27 +352,27 @@ namespace NLua ...@@ -352,27 +352,27 @@ namespace NLua
// Creates and pushes the object in the stack, setting // Creates and pushes the object in the stack, setting
// it as the metatable of the first argument // it as the metatable of the first argument
object obj = CodeGeneration.Instance.GetClassInstance (klass, luaTable); object obj = CodeGeneration.Instance.GetClassInstance (klass, luaTable);
pushObject (luaState, obj, "luaNet_metatable"); PushObject (luaState, obj, "luaNet_metatable");
LuaLib.lua_newtable (luaState); LuaLib.LuaNewTable (luaState);
LuaLib.lua_pushstring (luaState, "__index"); LuaLib.LuaPushString (luaState, "__index");
LuaLib.lua_pushvalue (luaState, -3); LuaLib.LuaPushValue (luaState, -3);
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
LuaLib.lua_pushstring (luaState, "__newindex"); LuaLib.LuaPushString (luaState, "__newindex");
LuaLib.lua_pushvalue (luaState, -3); LuaLib.LuaPushValue (luaState, -3);
LuaLib.lua_settable (luaState, -3); LuaLib.LuaSetTable (luaState, -3);
LuaLib.lua_setmetatable (luaState, 1); LuaLib.LuaSetMetatable (luaState, 1);
// Pushes the object again, this time as the base field // Pushes the object again, this time as the base field
// of the table and with the luaNet_searchbase metatable // of the table and with the luaNet_searchbase metatable
LuaLib.lua_pushstring (luaState, "base"); LuaLib.LuaPushString (luaState, "base");
int index = addObject (obj); int index = AddObject (obj);
pushNewObject (luaState, obj, index, "luaNet_searchbase"); PushNewObject (luaState, obj, index, "luaNet_searchbase");
LuaLib.lua_rawset (luaState, 1); LuaLib.LuaRawSet (luaState, 1);
} else } else
throwError (luaState, "register_table: can not find superclass '" + superclassName + "'"); ThrowError (luaState, "register_table: can not find superclass '" + superclassName + "'");
} else } else
throwError (luaState, "register_table: superclass name can not be null"); ThrowError (luaState, "register_table: superclass name can not be null");
} else } else
throwError (luaState, "register_table: first arg is not a table"); ThrowError (luaState, "register_table: first arg is not a table");
return 0; return 0;
} }
...@@ -385,38 +385,38 @@ namespace NLua ...@@ -385,38 +385,38 @@ namespace NLua
[MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))] [MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))]
#endif #endif
[System.Runtime.InteropServices.AllowReversePInvokeCalls] [System.Runtime.InteropServices.AllowReversePInvokeCalls]
private static int unregisterTable (LuaState luaState) private static int UnregisterTable (LuaState luaState)
{ {
var translator = ObjectTranslatorPool.Instance.Find (luaState); var translator = ObjectTranslatorPool.Instance.Find (luaState);
return translator.unregisterTableInternal (luaState); return translator.UnregisterTableInternal (luaState);
} }
private int unregisterTableInternal (LuaState luaState) private int UnregisterTableInternal (LuaState luaState)
{ {
try { try {
if (LuaLib.lua_getmetatable (luaState, 1) != 0) { if (LuaLib.LuaGetMetatable (luaState, 1) != 0) {
LuaLib.lua_pushstring (luaState, "__index"); LuaLib.LuaPushString (luaState, "__index");
LuaLib.lua_gettable (luaState, -2); LuaLib.LuaGetTable (luaState, -2);
object obj = getRawNetObject (luaState, -1); object obj = GetRawNetObject (luaState, -1);
if (obj.IsNull ()) if (obj.IsNull ())
throwError (luaState, "unregister_table: arg is not valid table"); ThrowError (luaState, "unregister_table: arg is not valid table");
var luaTableField = obj.GetType ().GetField ("__luaInterface_luaTable"); var luaTableField = obj.GetType ().GetField ("__luaInterface_luaTable");
if (luaTableField.IsNull ()) if (luaTableField.IsNull ())
throwError (luaState, "unregister_table: arg is not valid table"); ThrowError (luaState, "unregister_table: arg is not valid table");
luaTableField.SetValue (obj, null); luaTableField.SetValue (obj, null);
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
LuaLib.lua_setmetatable (luaState, 1); LuaLib.LuaSetMetatable (luaState, 1);
LuaLib.lua_pushstring (luaState, "base"); LuaLib.LuaPushString (luaState, "base");
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
LuaLib.lua_settable (luaState, 1); LuaLib.LuaSetTable (luaState, 1);
} else } else
throwError (luaState, "unregister_table: arg is not valid table"); ThrowError (luaState, "unregister_table: arg is not valid table");
} catch (Exception e) { } catch (Exception e) {
throwError (luaState, e.Message); ThrowError (luaState, e.Message);
} }
return 0; return 0;
...@@ -430,47 +430,47 @@ namespace NLua ...@@ -430,47 +430,47 @@ namespace NLua
[MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))] [MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))]
#endif #endif
[System.Runtime.InteropServices.AllowReversePInvokeCalls] [System.Runtime.InteropServices.AllowReversePInvokeCalls]
private static int getMethodSignature (LuaState luaState) private static int GetMethodSignature (LuaState luaState)
{ {
var translator = ObjectTranslatorPool.Instance.Find (luaState); var translator = ObjectTranslatorPool.Instance.Find (luaState);
return translator.getMethodSignatureInternal (luaState); return translator.GetMethodSignatureInternal (luaState);
} }
private int getMethodSignatureInternal (LuaState luaState) private int GetMethodSignatureInternal (LuaState luaState)
{ {
IReflect klass; IReflect klass;
object target; object target;
int udata = LuaLib.luanet_checkudata (luaState, 1, "luaNet_class"); int udata = LuaLib.LuaNetCheckUData (luaState, 1, "luaNet_class");
if (udata != -1) { if (udata != -1) {
klass = (IReflect)objects [udata]; klass = (IReflect)objects [udata];
target = null; target = null;
} else { } else {
target = getRawNetObject (luaState, 1); target = GetRawNetObject (luaState, 1);
if (target.IsNull ()) { if (target.IsNull ()) {
throwError (luaState, "get_method_bysig: first arg is not type or object reference"); ThrowError (luaState, "get_method_bysig: first arg is not type or object reference");
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
return 1; return 1;
} }
klass = target.GetType (); klass = target.GetType ();
} }
string methodName = LuaLib.lua_tostring (luaState, 2).ToString (); string methodName = LuaLib.LuaToString (luaState, 2).ToString ();
var signature = new Type[LuaLib.lua_gettop (luaState) - 2]; var signature = new Type[LuaLib.LuaGetTop (luaState) - 2];
for (int i = 0; i < signature.Length; i++) for (int i = 0; i < signature.Length; i++)
signature [i] = FindType (LuaLib.lua_tostring (luaState, i + 3).ToString ()); signature [i] = FindType (LuaLib.LuaToString (luaState, i + 3).ToString ());
try { try {
//CP: Added ignore case //CP: Added ignore case
var method = klass.GetMethod (methodName, BindingFlags.Public | BindingFlags.Static | var method = klass.GetMethod (methodName, BindingFlags.Public | BindingFlags.Static |
BindingFlags.Instance | BindingFlags.FlattenHierarchy | BindingFlags.IgnoreCase, null, signature, null); BindingFlags.Instance | BindingFlags.FlattenHierarchy | BindingFlags.IgnoreCase, null, signature, null);
pushFunction (luaState, new LuaCore.LuaNativeFunction ((new LuaMethodWrapper (this, target, klass, method)).invokeFunction)); PushFunction (luaState, new LuaCore.LuaNativeFunction ((new LuaMethodWrapper (this, target, klass, method)).invokeFunction));
} catch (Exception e) { } catch (Exception e) {
throwError (luaState, e); ThrowError (luaState, e);
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
} }
return 1; return 1;
...@@ -484,34 +484,34 @@ namespace NLua ...@@ -484,34 +484,34 @@ namespace NLua
[MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))] [MonoTouch.MonoPInvokeCallback (typeof (LuaCore.lua_CFunction))]
#endif #endif
[System.Runtime.InteropServices.AllowReversePInvokeCalls] [System.Runtime.InteropServices.AllowReversePInvokeCalls]
private static int getConstructorSignature (LuaState luaState) private static int GetConstructorSignature (LuaState luaState)
{ {
var translator = ObjectTranslatorPool.Instance.Find (luaState); var translator = ObjectTranslatorPool.Instance.Find (luaState);
return translator.getConstructorSignatureInternal (luaState); return translator.GetConstructorSignatureInternal (luaState);
} }
private int getConstructorSignatureInternal (LuaState luaState) private int GetConstructorSignatureInternal (LuaState luaState)
{ {
IReflect klass = null; IReflect klass = null;
int udata = LuaLib.luanet_checkudata (luaState, 1, "luaNet_class"); int udata = LuaLib.LuaNetCheckUData (luaState, 1, "luaNet_class");
if (udata != -1) if (udata != -1)
klass = (IReflect)objects [udata]; klass = (IReflect)objects [udata];
if (klass.IsNull ()) if (klass.IsNull ())
throwError (luaState, "get_constructor_bysig: first arg is invalid type reference"); ThrowError (luaState, "get_constructor_bysig: first arg is invalid type reference");
var signature = new Type[LuaLib.lua_gettop (luaState) - 1]; var signature = new Type[LuaLib.LuaGetTop (luaState) - 1];
for (int i = 0; i < signature.Length; i++) for (int i = 0; i < signature.Length; i++)
signature [i] = FindType (LuaLib.lua_tostring (luaState, i + 2).ToString ()); signature [i] = FindType (LuaLib.LuaToString (luaState, i + 2).ToString ());
try { try {
ConstructorInfo constructor = klass.UnderlyingSystemType.GetConstructor (signature); ConstructorInfo constructor = klass.UnderlyingSystemType.GetConstructor (signature);
pushFunction (luaState, new LuaCore.LuaNativeFunction ((new LuaMethodWrapper (this, null, klass, constructor)).invokeFunction)); PushFunction (luaState, new LuaCore.LuaNativeFunction ((new LuaMethodWrapper (this, null, klass, constructor)).invokeFunction));
} catch (Exception e) { } catch (Exception e) {
throwError (luaState, e); ThrowError (luaState, e);
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
} }
return 1; return 1;
...@@ -520,30 +520,30 @@ namespace NLua ...@@ -520,30 +520,30 @@ namespace NLua
/* /*
* Pushes a type reference into the stack * Pushes a type reference into the stack
*/ */
internal void pushType (LuaState luaState, Type t) internal void PushType (LuaState luaState, Type t)
{ {
pushObject (luaState, new ProxyType (t), "luaNet_class"); PushObject (luaState, new ProxyType (t), "luaNet_class");
} }
/* /*
* Pushes a delegate into the stack * Pushes a delegate into the stack
*/ */
internal void pushFunction (LuaState luaState, LuaCore.LuaNativeFunction func) internal void PushFunction (LuaState luaState, LuaCore.LuaNativeFunction func)
{ {
pushObject (luaState, func, "luaNet_function"); PushObject (luaState, func, "luaNet_function");
} }
/* /*
* Pushes a CLR object into the Lua stack as an userdata * Pushes a CLR object into the Lua stack as an userdata
* with the provided metatable * with the provided metatable
*/ */
internal void pushObject (LuaState luaState, object o, string metatable) internal void PushObject (LuaState luaState, object o, string metatable)
{ {
int index = -1; int index = -1;
// Pushes nil // Pushes nil
if (o.IsNull ()) { if (o.IsNull ()) {
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
return; return;
} }
...@@ -551,85 +551,85 @@ namespace NLua ...@@ -551,85 +551,85 @@ namespace NLua
bool found = objectsBackMap.TryGetValue (o, out index); bool found = objectsBackMap.TryGetValue (o, out index);
if (found) { if (found) {
LuaLib.luaL_getmetatable (luaState, "luaNet_objects"); LuaLib.LuaLGetMetatable (luaState, "luaNet_objects");
LuaLib.lua_rawgeti (luaState, -1, index); LuaLib.LuaRawGetI (luaState, -1, index);
// Note: starting with lua5.1 the garbage collector may remove weak reference items (such as our luaNet_objects values) when the initial GC sweep // Note: starting with lua5.1 the garbage collector may remove weak reference items (such as our luaNet_objects values) when the initial GC sweep
// occurs, but the actual call of the __gc finalizer for that object may not happen until a little while later. During that window we might call // occurs, but the actual call of the __gc finalizer for that object may not happen until a little while later. During that window we might call
// this routine and find the element missing from luaNet_objects, but collectObject() has not yet been called. In that case, we go ahead and call collect // this routine and find the element missing from luaNet_objects, but collectObject() has not yet been called. In that case, we go ahead and call collect
// object here // object here
// did we find a non nil object in our table? if not, we need to call collect object // did we find a non nil object in our table? if not, we need to call collect object
var type = LuaLib.lua_type (luaState, -1); var type = LuaLib.LuaType (luaState, -1);
if (type != LuaTypes.Nil) { if (type != LuaTypes.Nil) {
LuaLib.lua_remove (luaState, -2); // drop the metatable - we're going to leave our object on the stack LuaLib.LuaRemove (luaState, -2); // drop the metatable - we're going to leave our object on the stack
return; return;
} }
// MetaFunctions.dumpStack(this, luaState); // MetaFunctions.dumpStack(this, luaState);
LuaLib.lua_remove (luaState, -1); // remove the nil object value LuaLib.LuaRemove (luaState, -1); // remove the nil object value
LuaLib.lua_remove (luaState, -1); // remove the metatable LuaLib.LuaRemove (luaState, -1); // remove the metatable
collectObject (o, index); // Remove from both our tables and fall out to get a new ID CollectObject (o, index); // Remove from both our tables and fall out to get a new ID
} }
index = addObject (o); index = AddObject (o);
pushNewObject (luaState, o, index, metatable); PushNewObject (luaState, o, index, metatable);
} }
/* /*
* Pushes a new object into the Lua stack with the provided * Pushes a new object into the Lua stack with the provided
* metatable * metatable
*/ */
private void pushNewObject (LuaState luaState, object o, int index, string metatable) private void PushNewObject (LuaState luaState, object o, int index, string metatable)
{ {
if (metatable == "luaNet_metatable") { if (metatable == "luaNet_metatable") {
// Gets or creates the metatable for the object's type // Gets or creates the metatable for the object's type
LuaLib.luaL_getmetatable (luaState, o.GetType ().AssemblyQualifiedName); LuaLib.LuaLGetMetatable (luaState, o.GetType ().AssemblyQualifiedName);
if (LuaLib.lua_isnil (luaState, -1)) { if (LuaLib.LuaIsNil (luaState, -1)) {
LuaLib.lua_settop (luaState, -2); LuaLib.LuaSetTop (luaState, -2);
LuaLib.luaL_newmetatable (luaState, o.GetType ().AssemblyQualifiedName); LuaLib.LuaLNewMetatable (luaState, o.GetType ().AssemblyQualifiedName);
LuaLib.lua_pushstring (luaState, "cache"); LuaLib.LuaPushString (luaState, "cache");
LuaLib.lua_newtable (luaState); LuaLib.LuaNewTable (luaState);
LuaLib.lua_rawset (luaState, -3); LuaLib.LuaRawSet (luaState, -3);
LuaLib.lua_pushlightuserdata (luaState, LuaLib.luanet_gettag ()); LuaLib.LuaPushLightUserData (luaState, LuaLib.LuaNetGetTag ());
LuaLib.lua_pushnumber (luaState, 1); LuaLib.LuaPushNumber (luaState, 1);
LuaLib.lua_rawset (luaState, -3); LuaLib.LuaRawSet (luaState, -3);
LuaLib.lua_pushstring (luaState, "__index"); LuaLib.LuaPushString (luaState, "__index");
LuaLib.lua_pushstring (luaState, "luaNet_indexfunction"); LuaLib.LuaPushString (luaState, "luaNet_indexfunction");
LuaLib.lua_rawget (luaState, (int)LuaIndexes.Registry); LuaLib.LuaRawGet (luaState, (int)LuaIndexes.Registry);
LuaLib.lua_rawset (luaState, -3); LuaLib.LuaRawSet (luaState, -3);
LuaLib.lua_pushstring (luaState, "__gc"); LuaLib.LuaPushString (luaState, "__gc");
LuaLib.lua_pushstdcallcfunction (luaState, metaFunctions.gcFunction); LuaLib.LuaPushStdCallCFunction (luaState, metaFunctions.gcFunction);
LuaLib.lua_rawset (luaState, -3); LuaLib.LuaRawSet (luaState, -3);
LuaLib.lua_pushstring (luaState, "__tostring"); LuaLib.LuaPushString (luaState, "__tostring");
LuaLib.lua_pushstdcallcfunction (luaState, metaFunctions.toStringFunction); LuaLib.LuaPushStdCallCFunction (luaState, metaFunctions.toStringFunction);
LuaLib.lua_rawset (luaState, -3); LuaLib.LuaRawSet (luaState, -3);
LuaLib.lua_pushstring (luaState, "__newindex"); LuaLib.LuaPushString (luaState, "__newindex");
LuaLib.lua_pushstdcallcfunction (luaState, metaFunctions.newindexFunction); LuaLib.LuaPushStdCallCFunction (luaState, metaFunctions.newindexFunction);
LuaLib.lua_rawset (luaState, -3); LuaLib.LuaRawSet (luaState, -3);
} }
} else } else
LuaLib.luaL_getmetatable (luaState, metatable); LuaLib.LuaLGetMetatable (luaState, metatable);
// Stores the object index in the Lua list and pushes the // Stores the object index in the Lua list and pushes the
// index into the Lua stack // index into the Lua stack
LuaLib.luaL_getmetatable (luaState, "luaNet_objects"); LuaLib.LuaLGetMetatable (luaState, "luaNet_objects");
LuaLib.luanet_newudata (luaState, index); LuaLib.LuaNetNewUData (luaState, index);
LuaLib.lua_pushvalue (luaState, -3); LuaLib.LuaPushValue (luaState, -3);
LuaLib.lua_remove (luaState, -4); LuaLib.LuaRemove (luaState, -4);
LuaLib.lua_setmetatable (luaState, -2); LuaLib.LuaSetMetatable (luaState, -2);
LuaLib.lua_pushvalue (luaState, -1); LuaLib.LuaPushValue (luaState, -1);
LuaLib.lua_rawseti (luaState, -3, index); LuaLib.LuaRawSetI (luaState, -3, index);
LuaLib.lua_remove (luaState, -2); LuaLib.LuaRemove (luaState, -2);
} }
/* /*
* Gets an object from the Lua stack with the desired type, if it matches, otherwise * Gets an object from the Lua stack with the desired type, if it matches, otherwise
* returns null. * returns null.
*/ */
internal object getAsType (LuaState luaState, int stackPos, Type paramType) internal object GetAsType (LuaState luaState, int stackPos, Type paramType)
{ {
var extractor = typeChecker.checkType (luaState, stackPos, paramType); var extractor = typeChecker.CheckLuaType (luaState, stackPos, paramType);
return !extractor.IsNull () ? extractor (luaState, stackPos) : null; return !extractor.IsNull () ? extractor (luaState, stackPos) : null;
} }
...@@ -637,7 +637,7 @@ namespace NLua ...@@ -637,7 +637,7 @@ namespace NLua
/// Given the Lua int ID for an object remove it from our maps /// Given the Lua int ID for an object remove it from our maps
/// </summary> /// </summary>
/// <param name = "udata"></param> /// <param name = "udata"></param>
internal void collectObject (int udata) internal void CollectObject (int udata)
{ {
object o; object o;
bool found = objects.TryGetValue (udata, out o); bool found = objects.TryGetValue (udata, out o);
...@@ -654,14 +654,14 @@ namespace NLua ...@@ -654,14 +654,14 @@ namespace NLua
/// Given an object reference, remove it from our maps /// Given an object reference, remove it from our maps
/// </summary> /// </summary>
/// <param name = "udata"></param> /// <param name = "udata"></param>
private void collectObject (object o, int udata) private void CollectObject (object o, int udata)
{ {
// Debug.WriteLine("Removing " + o.ToString() + " @ " + udata); // Debug.WriteLine("Removing " + o.ToString() + " @ " + udata);
objects.Remove (udata); objects.Remove (udata);
objectsBackMap.Remove (o); objectsBackMap.Remove (o);
} }
private int addObject (object obj) private int AddObject (object obj)
{ {
// New object: inserts it in the list // New object: inserts it in the list
int index = nextObj++; int index = nextObj++;
...@@ -673,35 +673,35 @@ namespace NLua ...@@ -673,35 +673,35 @@ namespace NLua
/* /*
* Gets an object from the Lua stack according to its Lua type. * Gets an object from the Lua stack according to its Lua type.
*/ */
internal object getObject (LuaState luaState, int index) internal object GetObject (LuaState luaState, int index)
{ {
var type = LuaLib.lua_type (luaState, index); var type = LuaLib.LuaType (luaState, index);
switch (type) { switch (type) {
case LuaTypes.Number: case LuaTypes.Number:
{ {
return LuaLib.lua_tonumber (luaState, index); return LuaLib.LuaToNumber (luaState, index);
} }
case LuaTypes.String: case LuaTypes.String:
{ {
return LuaLib.lua_tostring (luaState, index); return LuaLib.LuaToString (luaState, index);
} }
case LuaTypes.Boolean: case LuaTypes.Boolean:
{ {
return LuaLib.lua_toboolean (luaState, index); return LuaLib.LuaToBoolean (luaState, index);
} }
case LuaTypes.Table: case LuaTypes.Table:
{ {
return getTable (luaState, index); return GetTable (luaState, index);
} }
case LuaTypes.Function: case LuaTypes.Function:
{ {
return getFunction (luaState, index); return GetFunction (luaState, index);
} }
case LuaTypes.UserData: case LuaTypes.UserData:
{ {
int udata = LuaLib.luanet_tonetobject (luaState, index); int udata = LuaLib.LuaNetToNetObject (luaState, index);
return udata != -1 ? objects [udata] : getUserData (luaState, index); return udata != -1 ? objects [udata] : GetUserData (luaState, index);
} }
default: default:
return null; return null;
...@@ -711,37 +711,37 @@ namespace NLua ...@@ -711,37 +711,37 @@ namespace NLua
/* /*
* Gets the table in the index positon of the Lua stack. * Gets the table in the index positon of the Lua stack.
*/ */
internal LuaTable getTable (LuaState luaState, int index) internal LuaTable GetTable (LuaState luaState, int index)
{ {
LuaLib.lua_pushvalue (luaState, index); LuaLib.LuaPushValue (luaState, index);
return new LuaTable (LuaLib.lua_ref (luaState, 1), interpreter); return new LuaTable (LuaLib.LuaRef (luaState, 1), interpreter);
} }
/* /*
* Gets the userdata in the index positon of the Lua stack. * Gets the userdata in the index positon of the Lua stack.
*/ */
internal LuaUserData getUserData (LuaState luaState, int index) internal LuaUserData GetUserData (LuaState luaState, int index)
{ {
LuaLib.lua_pushvalue (luaState, index); LuaLib.LuaPushValue (luaState, index);
return new LuaUserData (LuaLib.lua_ref (luaState, 1), interpreter); return new LuaUserData (LuaLib.LuaRef (luaState, 1), interpreter);
} }
/* /*
* Gets the function in the index positon of the Lua stack. * Gets the function in the index positon of the Lua stack.
*/ */
internal LuaFunction getFunction (LuaState luaState, int index) internal LuaFunction GetFunction (LuaState luaState, int index)
{ {
LuaLib.lua_pushvalue (luaState, index); LuaLib.LuaPushValue (luaState, index);
return new LuaFunction (LuaLib.lua_ref (luaState, 1), interpreter); return new LuaFunction (LuaLib.LuaRef (luaState, 1), interpreter);
} }
/* /*
* Gets the CLR object in the index positon of the Lua stack. Returns * Gets the CLR object in the index positon of the Lua stack. Returns
* delegates as Lua functions. * delegates as Lua functions.
*/ */
internal object getNetObject (LuaState luaState, int index) internal object GetNetObject (LuaState luaState, int index)
{ {
int idx = LuaLib.luanet_tonetobject (luaState, index); int idx = LuaLib.LuaNetToNetObject (luaState, index);
return idx != -1 ? objects [idx] : null; return idx != -1 ? objects [idx] : null;
} }
...@@ -749,9 +749,9 @@ namespace NLua ...@@ -749,9 +749,9 @@ namespace NLua
* Gets the CLR object in the index position of the Lua stack. Returns * Gets the CLR object in the index position of the Lua stack. Returns
* delegates as is. * delegates as is.
*/ */
internal object getRawNetObject (LuaState luaState, int index) internal object GetRawNetObject (LuaState luaState, int index)
{ {
int udata = LuaLib.luanet_rawnetobj (luaState, index); int udata = LuaLib.LuaNetRawNetObj (luaState, index);
return udata != -1 ? objects [udata] : null; return udata != -1 ? objects [udata] : null;
} }
...@@ -759,11 +759,11 @@ namespace NLua ...@@ -759,11 +759,11 @@ namespace NLua
* Pushes the entire array into the Lua stack and returns the number * Pushes the entire array into the Lua stack and returns the number
* of elements pushed. * of elements pushed.
*/ */
internal int returnValues (LuaState luaState, object[] returnValues) internal int ReturnValues (LuaState luaState, object[] returnValues)
{ {
if (LuaLib.lua_checkstack (luaState, returnValues.Length + 5)) { if (LuaLib.LuaCheckStack (luaState, returnValues.Length + 5)) {
for (int i = 0; i < returnValues.Length; i++) for (int i = 0; i < returnValues.Length; i++)
push (luaState, returnValues [i]); Push (luaState, returnValues [i]);
return returnValues.Length; return returnValues.Length;
} else } else
...@@ -774,18 +774,18 @@ namespace NLua ...@@ -774,18 +774,18 @@ namespace NLua
* Gets the values from the provided index to * Gets the values from the provided index to
* the top of the stack and returns them in an array. * the top of the stack and returns them in an array.
*/ */
internal object[] popValues (LuaState luaState, int oldTop) internal object[] PopValues (LuaState luaState, int oldTop)
{ {
int newTop = LuaLib.lua_gettop (luaState); int newTop = LuaLib.LuaGetTop (luaState);
if (oldTop == newTop) if (oldTop == newTop)
return null; return null;
else { else {
var returnValues = new List<object> (); var returnValues = new List<object> ();
for (int i = oldTop+1; i <= newTop; i++) for (int i = oldTop+1; i <= newTop; i++)
returnValues.Add (getObject (luaState, i)); returnValues.Add (GetObject (luaState, i));
LuaLib.lua_settop (luaState, oldTop); LuaLib.LuaSetTop (luaState, oldTop);
return returnValues.ToArray (); return returnValues.ToArray ();
} }
} }
...@@ -795,9 +795,9 @@ namespace NLua ...@@ -795,9 +795,9 @@ namespace NLua
* the top of the stack and returns them in an array, casting * the top of the stack and returns them in an array, casting
* them to the provided types. * them to the provided types.
*/ */
internal object[] popValues (LuaState luaState, int oldTop, Type[] popTypes) internal object[] PopValues (LuaState luaState, int oldTop, Type[] popTypes)
{ {
int newTop = LuaLib.lua_gettop (luaState); int newTop = LuaLib.LuaGetTop (luaState);
if (oldTop == newTop) if (oldTop == newTop)
return null; return null;
...@@ -811,11 +811,11 @@ namespace NLua ...@@ -811,11 +811,11 @@ namespace NLua
iTypes = 0; iTypes = 0;
for (int i = oldTop+1; i <= newTop; i++) { for (int i = oldTop+1; i <= newTop; i++) {
returnValues.Add (getAsType (luaState, i, popTypes [iTypes])); returnValues.Add (GetAsType (luaState, i, popTypes [iTypes]));
iTypes++; iTypes++;
} }
LuaLib.lua_settop (luaState, oldTop); LuaLib.LuaSetTop (luaState, oldTop);
return returnValues.ToArray (); return returnValues.ToArray ();
} }
} }
...@@ -839,46 +839,46 @@ namespace NLua ...@@ -839,46 +839,46 @@ namespace NLua
/* /*
* Pushes the object into the Lua stack according to its type. * Pushes the object into the Lua stack according to its type.
*/ */
internal void push (LuaState luaState, object o) internal void Push (LuaState luaState, object o)
{ {
if (o.IsNull ()) if (o.IsNull ())
LuaLib.lua_pushnil (luaState); LuaLib.LuaPushNil (luaState);
else if (o is sbyte || o is byte || o is short || o is ushort || else if (o is sbyte || o is byte || o is short || o is ushort ||
o is int || o is uint || o is long || o is float || o is int || o is uint || o is long || o is float ||
o is ulong || o is decimal || o is double) { o is ulong || o is decimal || o is double) {
double d = Convert.ToDouble (o); double d = Convert.ToDouble (o);
LuaLib.lua_pushnumber (luaState, d); LuaLib.LuaPushNumber (luaState, d);
} else if (o is char) { } else if (o is char) {
double d = (char)o; double d = (char)o;
LuaLib.lua_pushnumber (luaState, d); LuaLib.LuaPushNumber (luaState, d);
} else if (o is string) { } else if (o is string) {
string str = (string)o; string str = (string)o;
LuaLib.lua_pushstring (luaState, str); LuaLib.LuaPushString (luaState, str);
} else if (o is bool) { } else if (o is bool) {
bool b = (bool)o; bool b = (bool)o;
LuaLib.lua_pushboolean (luaState, b); LuaLib.LuaPushBoolean (luaState, b);
} else if (IsILua (o)) } else if (IsILua (o))
(((ILuaGeneratedType)o).LuaInterfaceGetLuaTable ()).push (luaState); (((ILuaGeneratedType)o).LuaInterfaceGetLuaTable ()).Push (luaState);
else if (o is LuaTable) else if (o is LuaTable)
((LuaTable)o).push (luaState); ((LuaTable)o).Push (luaState);
else if (o is LuaCore.LuaNativeFunction) else if (o is LuaCore.LuaNativeFunction)
pushFunction (luaState, (LuaCore.LuaNativeFunction)o); PushFunction (luaState, (LuaCore.LuaNativeFunction)o);
else if (o is LuaFunction) else if (o is LuaFunction)
((LuaFunction)o).push (luaState); ((LuaFunction)o).Push (luaState);
else else
pushObject (luaState, o, "luaNet_metatable"); PushObject (luaState, o, "luaNet_metatable");
} }
/* /*
* Checks if the method matches the arguments in the Lua stack, getting * Checks if the method matches the arguments in the Lua stack, getting
* the arguments if it does. * the arguments if it does.
*/ */
internal bool matchParameters (LuaState luaState, MethodBase method, ref MethodCache methodCache) internal bool MatchParameters (LuaState luaState, MethodBase method, ref MethodCache methodCache)
{ {
return metaFunctions.matchParameters (luaState, method, ref methodCache); return metaFunctions.MatchParameters (luaState, method, ref methodCache);
} }
internal Array tableToArray(object luaParamValue, Type paramArrayType) { internal Array TableToArray(object luaParamValue, Type paramArrayType) {
return metaFunctions.TableToArray(luaParamValue,paramArrayType); return metaFunctions.TableToArray(luaParamValue,paramArrayType);
} }
} }
......
...@@ -285,7 +285,7 @@ namespace NLuaTest ...@@ -285,7 +285,7 @@ namespace NLuaTest
object [] args = new object [] {sender, eventArgs }; object [] args = new object [] {sender, eventArgs };
object [] inArgs = new object [] { sender, eventArgs }; object [] inArgs = new object [] { sender, eventArgs };
int [] outArgs = new int [] { }; int [] outArgs = new int [] { };
base.callFunction (args, inArgs, outArgs); base.CallFunction (args, inArgs, outArgs);
} }
} }
...@@ -1436,8 +1436,8 @@ namespace NLuaTest ...@@ -1436,8 +1436,8 @@ namespace NLuaTest
}; };
int [] outArgs = new int [] { }; int [] outArgs = new int [] { };
Type [] returnTypes = __luaInterface_returnTypes [0]; Type [] returnTypes = __luaInterface_returnTypes [0];
LuaFunction function = NLua.Method.LuaClassHelper.getTableFunction (__luaInterface_luaTable, "overridableMethod"); LuaFunction function = NLua.Method.LuaClassHelper.GetTableFunction (__luaInterface_luaTable, "overridableMethod");
object ret = NLua.Method.LuaClassHelper.callFunction (function, args, returnTypes, inArgs, outArgs); object ret = NLua.Method.LuaClassHelper.CallFunction (function, args, returnTypes, inArgs, outArgs);
return (int)ret; return (int)ret;
} }
} }
...@@ -1464,8 +1464,8 @@ namespace NLuaTest ...@@ -1464,8 +1464,8 @@ namespace NLuaTest
object [] inArgs = new object [] { __luaInterface_luaTable }; object [] inArgs = new object [] { __luaInterface_luaTable };
int [] outArgs = new int [] { }; int [] outArgs = new int [] { };
Type [] returnTypes = __luaInterface_returnTypes [0]; Type [] returnTypes = __luaInterface_returnTypes [0];
LuaFunction function = NLua.Method.LuaClassHelper.getTableFunction (__luaInterface_luaTable, "get_intProp"); LuaFunction function = NLua.Method.LuaClassHelper.GetTableFunction (__luaInterface_luaTable, "get_intProp");
object ret = NLua.Method.LuaClassHelper.callFunction (function, args, returnTypes, inArgs, outArgs); object ret = NLua.Method.LuaClassHelper.CallFunction (function, args, returnTypes, inArgs, outArgs);
return (int)ret; return (int)ret;
} }
set { set {
...@@ -1480,8 +1480,8 @@ namespace NLuaTest ...@@ -1480,8 +1480,8 @@ namespace NLuaTest
}; };
int [] outArgs = new int [] { }; int [] outArgs = new int [] { };
Type [] returnTypes = __luaInterface_returnTypes [1]; Type [] returnTypes = __luaInterface_returnTypes [1];
LuaFunction function = NLua.Method.LuaClassHelper.getTableFunction (__luaInterface_luaTable, "set_intProp"); LuaFunction function = NLua.Method.LuaClassHelper.GetTableFunction (__luaInterface_luaTable, "set_intProp");
NLua.Method.LuaClassHelper.callFunction (function, args, returnTypes, inArgs, outArgs); NLua.Method.LuaClassHelper.CallFunction (function, args, returnTypes, inArgs, outArgs);
} }
} }
...@@ -1491,8 +1491,8 @@ namespace NLuaTest ...@@ -1491,8 +1491,8 @@ namespace NLuaTest
object [] inArgs = new object [] { __luaInterface_luaTable }; object [] inArgs = new object [] { __luaInterface_luaTable };
int [] outArgs = new int [] { }; int [] outArgs = new int [] { };
Type [] returnTypes = __luaInterface_returnTypes [2]; Type [] returnTypes = __luaInterface_returnTypes [2];
LuaFunction function = NLua.Method.LuaClassHelper.getTableFunction (__luaInterface_luaTable, "get_refProp"); LuaFunction function = NLua.Method.LuaClassHelper.GetTableFunction (__luaInterface_luaTable, "get_refProp");
object ret = NLua.Method.LuaClassHelper.callFunction (function, args, returnTypes, inArgs, outArgs); object ret = NLua.Method.LuaClassHelper.CallFunction (function, args, returnTypes, inArgs, outArgs);
return (TestClass)ret; return (TestClass)ret;
} }
set { set {
...@@ -1507,8 +1507,8 @@ namespace NLuaTest ...@@ -1507,8 +1507,8 @@ namespace NLuaTest
}; };
int [] outArgs = new int [] { }; int [] outArgs = new int [] { };
Type [] returnTypes = __luaInterface_returnTypes [3]; Type [] returnTypes = __luaInterface_returnTypes [3];
LuaFunction function = NLua.Method.LuaClassHelper.getTableFunction (__luaInterface_luaTable, "set_refProp"); LuaFunction function = NLua.Method.LuaClassHelper.GetTableFunction (__luaInterface_luaTable, "set_refProp");
NLua.Method.LuaClassHelper.callFunction (function, args, returnTypes, inArgs, outArgs); NLua.Method.LuaClassHelper.CallFunction (function, args, returnTypes, inArgs, outArgs);
} }
} }
...@@ -1526,8 +1526,8 @@ namespace NLuaTest ...@@ -1526,8 +1526,8 @@ namespace NLuaTest
}; };
int [] outArgs = new int [] { }; int [] outArgs = new int [] { };
Type [] returnTypes = __luaInterface_returnTypes [4]; Type [] returnTypes = __luaInterface_returnTypes [4];
LuaFunction function = NLua.Method.LuaClassHelper.getTableFunction (__luaInterface_luaTable, "test1"); LuaFunction function = NLua.Method.LuaClassHelper.GetTableFunction (__luaInterface_luaTable, "test1");
object ret = NLua.Method.LuaClassHelper.callFunction (function, args, returnTypes, inArgs, outArgs); object ret = NLua.Method.LuaClassHelper.CallFunction (function, args, returnTypes, inArgs, outArgs);
return (int)ret; return (int)ret;
} }
...@@ -1544,8 +1544,8 @@ namespace NLuaTest ...@@ -1544,8 +1544,8 @@ namespace NLuaTest
}; };
int [] outArgs = new int [] { 1 }; int [] outArgs = new int [] { 1 };
Type [] returnTypes = __luaInterface_returnTypes [5]; Type [] returnTypes = __luaInterface_returnTypes [5];
LuaFunction function = NLua.Method.LuaClassHelper.getTableFunction (__luaInterface_luaTable, "test2"); LuaFunction function = NLua.Method.LuaClassHelper.GetTableFunction (__luaInterface_luaTable, "test2");
object ret = NLua.Method.LuaClassHelper.callFunction (function, args, returnTypes, inArgs, outArgs); object ret = NLua.Method.LuaClassHelper.CallFunction (function, args, returnTypes, inArgs, outArgs);
b = (int)args [1]; b = (int)args [1];
return (int)ret; return (int)ret;
} }
...@@ -1564,8 +1564,8 @@ namespace NLuaTest ...@@ -1564,8 +1564,8 @@ namespace NLuaTest
}; };
int [] outArgs = new int [] { 1 }; int [] outArgs = new int [] { 1 };
Type [] returnTypes = __luaInterface_returnTypes [6]; Type [] returnTypes = __luaInterface_returnTypes [6];
LuaFunction function = NLua.Method.LuaClassHelper.getTableFunction (__luaInterface_luaTable, "test3"); LuaFunction function = NLua.Method.LuaClassHelper.GetTableFunction (__luaInterface_luaTable, "test3");
NLua.Method.LuaClassHelper.callFunction (function, args, returnTypes, inArgs, outArgs); NLua.Method.LuaClassHelper.CallFunction (function, args, returnTypes, inArgs, outArgs);
b = (int)args [1]; b = (int)args [1];
} }
...@@ -1583,8 +1583,8 @@ namespace NLuaTest ...@@ -1583,8 +1583,8 @@ namespace NLuaTest
}; };
int [] outArgs = new int [] { }; int [] outArgs = new int [] { };
Type [] returnTypes = __luaInterface_returnTypes [7]; Type [] returnTypes = __luaInterface_returnTypes [7];
LuaFunction function = NLua.Method.LuaClassHelper.getTableFunction (__luaInterface_luaTable, "test4"); LuaFunction function = NLua.Method.LuaClassHelper.GetTableFunction (__luaInterface_luaTable, "test4");
object ret = NLua.Method.LuaClassHelper.callFunction (function, args, returnTypes, inArgs, outArgs); object ret = NLua.Method.LuaClassHelper.CallFunction (function, args, returnTypes, inArgs, outArgs);
return (TestClass)ret; return (TestClass)ret;
} }
...@@ -1602,8 +1602,8 @@ namespace NLuaTest ...@@ -1602,8 +1602,8 @@ namespace NLuaTest
}; };
int [] outArgs = new int [] { }; int [] outArgs = new int [] { };
Type [] returnTypes = __luaInterface_returnTypes [8]; Type [] returnTypes = __luaInterface_returnTypes [8];
LuaFunction function = NLua.Method.LuaClassHelper.getTableFunction (__luaInterface_luaTable, "test5"); LuaFunction function = NLua.Method.LuaClassHelper.GetTableFunction (__luaInterface_luaTable, "test5");
object ret = NLua.Method.LuaClassHelper.callFunction (function, args, returnTypes, inArgs, outArgs); object ret = NLua.Method.LuaClassHelper.CallFunction (function, args, returnTypes, inArgs, outArgs);
return (int)ret; return (int)ret;
} }
...@@ -1620,8 +1620,8 @@ namespace NLuaTest ...@@ -1620,8 +1620,8 @@ namespace NLuaTest
}; };
int [] outArgs = new int [] { 1}; int [] outArgs = new int [] { 1};
Type [] returnTypes = __luaInterface_returnTypes [9]; Type [] returnTypes = __luaInterface_returnTypes [9];
LuaFunction function = NLua.Method.LuaClassHelper.getTableFunction (__luaInterface_luaTable, "test6"); LuaFunction function = NLua.Method.LuaClassHelper.GetTableFunction (__luaInterface_luaTable, "test6");
object ret = NLua.Method.LuaClassHelper.callFunction (function, args, returnTypes, inArgs, outArgs); object ret = NLua.Method.LuaClassHelper.CallFunction (function, args, returnTypes, inArgs, outArgs);
b = (TestClass)args [1]; b = (TestClass)args [1];
return (int)ret; return (int)ret;
...@@ -1641,8 +1641,8 @@ namespace NLuaTest ...@@ -1641,8 +1641,8 @@ namespace NLuaTest
}; };
int [] outArgs = new int [] { 1 }; int [] outArgs = new int [] { 1 };
Type [] returnTypes = __luaInterface_returnTypes [10]; Type [] returnTypes = __luaInterface_returnTypes [10];
LuaFunction function = NLua.Method.LuaClassHelper.getTableFunction (__luaInterface_luaTable, "test7"); LuaFunction function = NLua.Method.LuaClassHelper.GetTableFunction (__luaInterface_luaTable, "test7");
NLua.Method.LuaClassHelper.callFunction (function, args, returnTypes, inArgs, outArgs); NLua.Method.LuaClassHelper.CallFunction (function, args, returnTypes, inArgs, outArgs);
b = (TestClass)args [1]; b = (TestClass)args [1];
} }
} }
......
...@@ -35,7 +35,7 @@ namespace NLuaTest.Mock ...@@ -35,7 +35,7 @@ namespace NLuaTest.Mock
object [] inArgs = new object [] { a, b }; object [] inArgs = new object [] { a, b };
int [] outArgs = new int [] { }; int [] outArgs = new int [] { };
object ret = base.callFunction (args, inArgs, outArgs); object ret = base.CallFunction (args, inArgs, outArgs);
return (int)ret; return (int)ret;
} }
...@@ -49,7 +49,7 @@ namespace NLuaTest.Mock ...@@ -49,7 +49,7 @@ namespace NLuaTest.Mock
object [] inArgs = new object [] { a }; object [] inArgs = new object [] { a };
int [] outArgs = new int [] { 1 }; int [] outArgs = new int [] { 1 };
object ret = base.callFunction (args, inArgs, outArgs); object ret = base.CallFunction (args, inArgs, outArgs);
b = (int)args [1]; b = (int)args [1];
return (int)ret; return (int)ret;
...@@ -64,7 +64,7 @@ namespace NLuaTest.Mock ...@@ -64,7 +64,7 @@ namespace NLuaTest.Mock
object [] inArgs = new object [] { a, b }; object [] inArgs = new object [] { a, b };
int [] outArgs = new int [] { 1 }; int [] outArgs = new int [] { 1 };
base.callFunction (args, inArgs, outArgs); base.CallFunction (args, inArgs, outArgs);
b = (int)args [1]; b = (int)args [1];
} }
...@@ -78,7 +78,7 @@ namespace NLuaTest.Mock ...@@ -78,7 +78,7 @@ namespace NLuaTest.Mock
object [] inArgs = new object [] { a, b }; object [] inArgs = new object [] { a, b };
int [] outArgs = new int [] { }; int [] outArgs = new int [] { };
object ret = base.callFunction (args, inArgs, outArgs); object ret = base.CallFunction (args, inArgs, outArgs);
return (TestClass)ret; return (TestClass)ret;
} }
...@@ -92,7 +92,7 @@ namespace NLuaTest.Mock ...@@ -92,7 +92,7 @@ namespace NLuaTest.Mock
object [] inArgs = new object [] { a, b }; object [] inArgs = new object [] { a, b };
int [] outArgs = new int [] { }; int [] outArgs = new int [] { };
object ret = base.callFunction (args, inArgs, outArgs); object ret = base.CallFunction (args, inArgs, outArgs);
return (int)ret; return (int)ret;
} }
...@@ -106,7 +106,7 @@ namespace NLuaTest.Mock ...@@ -106,7 +106,7 @@ namespace NLuaTest.Mock
object [] inArgs = new object [] { a }; object [] inArgs = new object [] { a };
int [] outArgs = new int [] { 1 }; int [] outArgs = new int [] { 1 };
object ret = base.callFunction (args, inArgs, outArgs); object ret = base.CallFunction (args, inArgs, outArgs);
b = (TestClass)args [1]; b = (TestClass)args [1];
return (int)ret; return (int)ret;
...@@ -121,7 +121,7 @@ namespace NLuaTest.Mock ...@@ -121,7 +121,7 @@ namespace NLuaTest.Mock
object [] inArgs = new object [] { a , b}; object [] inArgs = new object [] { a , b};
int [] outArgs = new int [] { 1 }; int [] outArgs = new int [] { 1 };
base.callFunction (args, inArgs, outArgs); base.CallFunction (args, inArgs, outArgs);
b = (TestClass)args [1]; b = (TestClass)args [1];
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment