Unverified Commit 5e9a190a authored by Vinicius Jarina's avatar Vinicius Jarina Committed by GitHub
Browse files

WIP cleanup (#275)

* WIP cleanup

* Trying fixing iPhoneSimTests.

* More cleanups

* Minified initLua loadCLRpackage
parent 66947423
......@@ -9,33 +9,33 @@ namespace NLua
using LuaState = KeraLua.Lua;
sealed class CheckType
{
Dictionary<Type, ExtractValue> extractValues = new Dictionary<Type, ExtractValue>();
ExtractValue extractNetObject;
ObjectTranslator translator;
readonly Dictionary<Type, ExtractValue> _extractValues = new Dictionary<Type, ExtractValue>();
readonly ExtractValue _extractNetObject;
readonly ObjectTranslator _translator;
public CheckType(ObjectTranslator translator)
{
this.translator = translator;
extractValues.Add(GetExtractDictionaryKey(typeof(object)), new ExtractValue(GetAsObject));
extractValues.Add(GetExtractDictionaryKey(typeof(sbyte)), new ExtractValue(GetAsSbyte));
extractValues.Add(GetExtractDictionaryKey(typeof(byte)), new ExtractValue(GetAsByte));
extractValues.Add(GetExtractDictionaryKey(typeof(short)), new ExtractValue(GetAsShort));
extractValues.Add(GetExtractDictionaryKey(typeof(ushort)), new ExtractValue(GetAsUshort));
extractValues.Add(GetExtractDictionaryKey(typeof(int)), new ExtractValue(GetAsInt));
extractValues.Add(GetExtractDictionaryKey(typeof(uint)), new ExtractValue(GetAsUint));
extractValues.Add(GetExtractDictionaryKey(typeof(long)), new ExtractValue(GetAsLong));
extractValues.Add(GetExtractDictionaryKey(typeof(ulong)), new ExtractValue(GetAsUlong));
extractValues.Add(GetExtractDictionaryKey(typeof(double)), new ExtractValue(GetAsDouble));
extractValues.Add(GetExtractDictionaryKey(typeof(char)), new ExtractValue(GetAsChar));
extractValues.Add(GetExtractDictionaryKey(typeof(float)), new ExtractValue(GetAsFloat));
extractValues.Add(GetExtractDictionaryKey(typeof(decimal)), new ExtractValue(GetAsDecimal));
extractValues.Add(GetExtractDictionaryKey(typeof(bool)), new ExtractValue(GetAsBoolean));
extractValues.Add(GetExtractDictionaryKey(typeof(string)), new ExtractValue(GetAsString));
extractValues.Add(GetExtractDictionaryKey(typeof(char[])), new ExtractValue(GetAsCharArray));
extractValues.Add(GetExtractDictionaryKey(typeof(LuaFunction)), new ExtractValue(GetAsFunction));
extractValues.Add(GetExtractDictionaryKey(typeof(LuaTable)), new ExtractValue(GetAsTable));
extractValues.Add(GetExtractDictionaryKey(typeof(LuaUserData)), new ExtractValue(GetAsUserdata));
extractNetObject = new ExtractValue(GetAsNetObject);
_translator = translator;
_extractValues.Add(GetExtractDictionaryKey(typeof(object)), GetAsObject);
_extractValues.Add(GetExtractDictionaryKey(typeof(sbyte)), GetAsSbyte);
_extractValues.Add(GetExtractDictionaryKey(typeof(byte)), GetAsByte);
_extractValues.Add(GetExtractDictionaryKey(typeof(short)), GetAsShort);
_extractValues.Add(GetExtractDictionaryKey(typeof(ushort)), GetAsUshort);
_extractValues.Add(GetExtractDictionaryKey(typeof(int)), GetAsInt);
_extractValues.Add(GetExtractDictionaryKey(typeof(uint)), GetAsUint);
_extractValues.Add(GetExtractDictionaryKey(typeof(long)), GetAsLong);
_extractValues.Add(GetExtractDictionaryKey(typeof(ulong)), GetAsUlong);
_extractValues.Add(GetExtractDictionaryKey(typeof(double)), GetAsDouble);
_extractValues.Add(GetExtractDictionaryKey(typeof(char)), GetAsChar);
_extractValues.Add(GetExtractDictionaryKey(typeof(float)), GetAsFloat);
_extractValues.Add(GetExtractDictionaryKey(typeof(decimal)), GetAsDecimal);
_extractValues.Add(GetExtractDictionaryKey(typeof(bool)), GetAsBoolean);
_extractValues.Add(GetExtractDictionaryKey(typeof(string)), GetAsString);
_extractValues.Add(GetExtractDictionaryKey(typeof(char[])), GetAsCharArray);
_extractValues.Add(GetExtractDictionaryKey(typeof(LuaFunction)), GetAsFunction);
_extractValues.Add(GetExtractDictionaryKey(typeof(LuaTable)), GetAsTable);
_extractValues.Add(GetExtractDictionaryKey(typeof(LuaUserData)), GetAsUserdata);
_extractNetObject = GetAsNetObject;
}
/*
......@@ -53,7 +53,7 @@ namespace NLua
paramType = paramType.GetElementType();
var extractKey = GetExtractDictionaryKey(paramType);
return extractValues.ContainsKey(extractKey) ? extractValues[extractKey] : extractNetObject;
return _extractValues.ContainsKey(extractKey) ? _extractValues[extractKey] : _extractNetObject;
}
internal ExtractValue CheckLuaType(LuaState luaState, int stackPos, Type paramType)
......@@ -91,90 +91,90 @@ namespace NLua
{
// Return the correct extractor anyways
if (netParamIsNumeric || paramType == typeof(bool))
return extractValues[extractKey];
return extractNetObject;
return _extractValues[extractKey];
return _extractNetObject;
}
}
if (paramType.Equals(typeof(object)))
return extractValues[extractKey];
return _extractValues[extractKey];
//CP: Added support for generic parameters
if (paramType.IsGenericParameter)
{
if (luatype == LuaType.Boolean)
return extractValues[GetExtractDictionaryKey(typeof(bool))];
else if (luatype == LuaType.String)
return extractValues[GetExtractDictionaryKey(typeof(string))];
else if (luatype == LuaType.Table)
return extractValues[GetExtractDictionaryKey(typeof(LuaTable))];
else if (luatype == LuaType.UserData)
return extractValues[GetExtractDictionaryKey(typeof(object))];
else if (luatype == LuaType.Function)
return extractValues[GetExtractDictionaryKey(typeof(LuaFunction))];
else if (luatype == LuaType.Number)
return extractValues[GetExtractDictionaryKey(typeof(double))];
return _extractValues[GetExtractDictionaryKey(typeof(bool))];
if (luatype == LuaType.String)
return _extractValues[GetExtractDictionaryKey(typeof(string))];
if (luatype == LuaType.Table)
return _extractValues[GetExtractDictionaryKey(typeof(LuaTable))];
if (luatype == LuaType.UserData)
return _extractValues[GetExtractDictionaryKey(typeof(object))];
if (luatype == LuaType.Function)
return _extractValues[GetExtractDictionaryKey(typeof(LuaFunction))];
if (luatype == LuaType.Number)
return _extractValues[GetExtractDictionaryKey(typeof(double))];
}
bool netParamIsString = paramType == typeof(string) || paramType == typeof(char[]);
if (netParamIsNumeric)
{
if (luaState.IsNumber(stackPos) && !netParamIsString)
return extractValues[extractKey];
return _extractValues[extractKey];
}
else if (paramType == typeof(bool))
{
if (luaState.IsBoolean(stackPos))
return extractValues[extractKey];
return _extractValues[extractKey];
}
else if (netParamIsString)
{
if (luaState.IsString(stackPos))
return extractValues[extractKey];
else if (luatype == LuaType.Nil)
return extractNetObject; // kevinh - silently convert nil to a null string pointer
return _extractValues[extractKey];
if (luatype == LuaType.Nil)
return _extractNetObject; // kevinh - silently convert nil to a null string pointer
}
else if (paramType == typeof(LuaTable))
{
if (luatype == LuaType.Table || luatype == LuaType.Nil)
return extractValues[extractKey];
return _extractValues[extractKey];
}
else if (paramType == typeof(LuaUserData))
{
if (luatype == LuaType.UserData || luatype == LuaType.Nil)
return extractValues[extractKey];
return _extractValues[extractKey];
}
else if (paramType == typeof(LuaFunction))
{
if (luatype == LuaType.Function || luatype == LuaType.Nil)
return extractValues[extractKey];
return _extractValues[extractKey];
}
else if (typeof(Delegate).IsAssignableFrom(paramType) && luatype == LuaType.Function)
return new ExtractValue(new DelegateGenerator(translator, paramType).ExtractGenerated);
return new DelegateGenerator(_translator, paramType).ExtractGenerated;
else if (paramType.IsInterface && luatype == LuaType.Table)
return new ExtractValue(new ClassGenerator(translator, paramType).ExtractGenerated);
return new ClassGenerator(_translator, paramType).ExtractGenerated;
else if ((paramType.IsInterface || paramType.IsClass) && luatype == LuaType.Nil)
{
// 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 (luaState.Type(stackPos) == LuaType.Table)
{
if (luaState.GetMetaField(stackPos, "__index") != LuaType.Nil)
{
object obj = translator.GetNetObject(luaState, -1);
object obj = _translator.GetNetObject(luaState, -1);
luaState.SetTop(-2);
if (obj != null && paramType.IsAssignableFrom(obj.GetType()))
return extractNetObject;
return _extractNetObject;
}
else
return null;
}
else
{
object obj = translator.GetNetObject(luaState, stackPos);
object obj = _translator.GetNetObject(luaState, stackPos);
if (obj != null && paramType.IsAssignableFrom(obj.GetType()))
return extractNetObject;
return _extractNetObject;
}
return null;
......@@ -323,17 +323,17 @@ namespace NLua
private object GetAsTable(LuaState luaState, int stackPos)
{
return translator.GetTable(luaState, stackPos);
return _translator.GetTable(luaState, 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)
{
return translator.GetUserData(luaState, stackPos);
return _translator.GetUserData(luaState, stackPos);
}
public object GetAsObject(LuaState luaState, int stackPos)
......@@ -342,7 +342,7 @@ namespace NLua
{
if (luaState.GetMetaField(stackPos, "__index") != LuaType.Nil)
{
if (luaState.CheckMetaTable(-1, translator.Tag))
if (luaState.CheckMetaTable(-1, _translator.Tag))
{
luaState.Insert(stackPos);
luaState.Remove(stackPos + 1);
......@@ -352,23 +352,23 @@ namespace NLua
}
}
object obj = translator.GetObject(luaState, stackPos);
object obj = _translator.GetObject(luaState, stackPos);
return obj;
}
public object GetAsNetObject(LuaState luaState, int stackPos)
{
object obj = translator.GetNetObject(luaState, stackPos);
object obj = _translator.GetNetObject(luaState, stackPos);
if (obj == null && luaState.Type(stackPos) == LuaType.Table)
{
if (luaState.GetMetaField(stackPos, "__index") != LuaType.Nil)
{
if (luaState.CheckMetaTable(-1, translator.Tag))
if (luaState.CheckMetaTable(-1, _translator.Tag))
{
luaState.Insert(stackPos);
luaState.Remove(stackPos + 1);
obj = translator.GetNetObject(luaState, stackPos);
obj = _translator.GetNetObject(luaState, stackPos);
}
else
luaState.SetTop(-2);
......
......@@ -6,18 +6,16 @@ namespace NLua.Event
/// <summary>
/// Event args for hook callback event
/// </summary>
/// <author>Reinhard Ostermeier</author>
public class DebugHookEventArgs : EventArgs
{
readonly LuaDebug luaDebug;
public DebugHookEventArgs(LuaDebug luaDebug)
{
this.luaDebug = luaDebug;
LuaDebug = luaDebug;
}
public LuaDebug LuaDebug {
get { return luaDebug; }
}
/// <summary>
/// Lua Debug Information
/// </summary>
public LuaDebug LuaDebug { get; }
}
}
\ No newline at end of file
......@@ -4,15 +4,11 @@ namespace NLua.Event
{
public class HookExceptionEventArgs : EventArgs
{
private readonly Exception m_Exception;
public Exception Exception {
get { return m_Exception; }
}
public Exception Exception { get; }
public HookExceptionEventArgs(Exception ex)
{
m_Exception = ex;
Exception = ex;
}
}
}
\ No newline at end of file
......@@ -8,10 +8,6 @@ namespace NLua.Exceptions
[Serializable]
public class LuaException : Exception
{
public LuaException ()
{
}
public LuaException (string message) : base(message)
{
}
......
......@@ -12,18 +12,14 @@ namespace NLua.Exceptions
/// <summary>
/// Returns true if the exception has occured as the result of a .NET exception in user code
/// </summary>
public bool IsNetException { get; private set; }
public bool IsNetException { get; }
private readonly string source;
private readonly string _source;
/// <summary>
/// The position in the script where the exception was triggered.
/// </summary>
#if SILVERLIGHT && !WINDOWS_PHONE
public string Source { get { return source; } }
#else
public override string Source { get { return source; } }
#endif
public override string Source => _source;
/// <summary>
/// Creates a new Lua-only exception.
......@@ -32,7 +28,7 @@ namespace NLua.Exceptions
/// <param name="source">The position in the script where the exception was triggered.</param>
public LuaScriptException(string message, string source) : base(message)
{
this.source = source;
_source = source;
}
/// <summary>
......@@ -43,14 +39,14 @@ namespace NLua.Exceptions
public LuaScriptException(Exception innerException, string source)
: base("A .NET exception occured in user-code", innerException)
{
this.source = source;
this.IsNetException = true;
_source = source;
IsNetException = true;
}
public override string ToString()
{
// Prepend the error source
return GetType().FullName + ": " + source + Message;
return GetType().FullName + ": " + _source + Message;
}
}
}
\ No newline at end of file
using System.Collections.Generic;
namespace NLua.Extensions
{
static class StringExtensions
{
public static IEnumerable<string> SplitWithEscape(this string input, char separator, char escapeCharacter)
{
int start = 0;
int index = 0;
while (index < input.Length)
{
index = input.IndexOf(separator, index);
if (index == -1)
break;
if (input[index - 1] == escapeCharacter)
{
input = input.Remove(index - 1, 1);
continue;
}
yield return input.Substring(start, index - start);
index++;
start = index;
}
yield return input.Substring(start);
}
}
}
\ No newline at end of file
using System;
using System.Linq;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
......@@ -92,7 +92,7 @@ namespace NLua.Extensions
public static MethodInfo[] GetExtensionMethods(this Type type, IEnumerable<Assembly> assemblies = null)
{
List<Type> types = new List<Type>();
var types = new List<Type>();
types.AddRange(type.Assembly.GetTypes().Where(t => t.IsPublic));
......@@ -106,58 +106,34 @@ namespace NLua.Extensions
}
}
var query = from extensionType in types
where extensionType.IsSealed && !extensionType.IsGenericType && !extensionType.IsNested
from method in extensionType.GetMethods(BindingFlags.Static | BindingFlags.Public)
where method.IsDefined(typeof(ExtensionAttribute), false)
where (method.GetParameters()[0].ParameterType == type
|| type.IsSubclassOf(method.GetParameters()[0].ParameterType)
|| type.GetInterfaces().Contains(method.GetParameters()[0].ParameterType))
select method;
return query.ToArray<MethodInfo>();
var query = types
.Where(extensionType =>
extensionType.IsSealed && !extensionType.IsGenericType && !extensionType.IsNested)
.SelectMany(extensionType => extensionType.GetMethods(BindingFlags.Static | BindingFlags.Public),
(extensionType, method) => new {extensionType, method})
.Where(t => t.method.IsDefined(typeof(ExtensionAttribute), false))
.Where(t =>
t.method.GetParameters()[0].ParameterType == type ||
type.IsSubclassOf(t.method.GetParameters()[0].ParameterType) ||
type.GetInterfaces().Contains(t.method.GetParameters()[0].ParameterType))
.Select(t => t.method);
return query.ToArray();
}
/// <summary>
/// Extends the System.Type-type to search for a given extended MethodeName.
/// </summary>
/// <param name="MethodeName">Name of the Methode</param>
/// <returns>the found Method or null</returns>
/// <param name="t"></param>
/// <param name="name"></param>
/// <param name="assemblies"></param>
/// <returns></returns>
public static MethodInfo GetExtensionMethod(this Type t, string name, IEnumerable<Assembly> assemblies = null)
{
var mi = from methode in t.GetExtensionMethods(assemblies)
where methode.Name == name
select methode;
if (!mi.Any<MethodInfo>())
var mi = t.GetExtensionMethods(assemblies).Where(method => method.Name == name).ToArray();
if (mi.Length == 0)
return null;
else
return mi.First<MethodInfo>();
}
}
static class StringExtensions
{
public static IEnumerable<string> SplitWithEscape(this string input, char separator, char escapeCharacter)
{
int start = 0;
int index = 0;
while (index < input.Length)
{
index = input.IndexOf(separator, index);
if (index == -1)
break;
if (input[index - 1] == escapeCharacter)
{
input = input.Remove(index - 1, 1);
continue;
}
yield return input.Substring(start, index - start);
index++;
start = index;
}
yield return input.Substring(start);
return mi[0];
}
}
}
\ No newline at end of file
......@@ -5,18 +5,18 @@ namespace NLua
{
class ClassGenerator
{
private ObjectTranslator translator;
private Type klass;
private readonly ObjectTranslator _translator;
private readonly Type _klass;
public ClassGenerator(ObjectTranslator objTranslator, Type typeClass)
{
translator = objTranslator;
klass = typeClass;
_translator = objTranslator;
_klass = typeClass;
}
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
......@@ -2,9 +2,7 @@ using System;
using System.Threading;
using System.Reflection;
using NLua.Extensions;
using System.Reflection.Emit;
using System.Collections;
using System.Collections.Generic;
using NLua.Method;
......@@ -12,12 +10,10 @@ namespace NLua
{
class CodeGeneration
{
private Dictionary<Type, LuaClassType> classCollection = new Dictionary<Type, LuaClassType>();
private Dictionary<Type, Type> delegateCollection = new Dictionary<Type, Type>();
private static readonly CodeGeneration instance = new CodeGeneration();
private AssemblyName assemblyName;
private readonly Dictionary<Type, LuaClassType> _classCollection = new Dictionary<Type, LuaClassType>();
private readonly Dictionary<Type, Type> _delegateCollection = new Dictionary<Type, Type>();
#if !(__IOS__ || __TVOS__ || __WATCHOS__) && !SILVERLIGHT && !NETSTANDARD
#if !(__IOS__ || __TVOS__ || __WATCHOS__) && !NETSTANDARD
private Dictionary<Type, Type> eventHandlerCollection = new Dictionary<Type, Type>();
private Type eventHandlerParent = typeof(LuaEventHandler);
private Type delegateParent = typeof(LuaDelegate);
......@@ -34,7 +30,7 @@ namespace NLua
private CodeGeneration()
{
// Create an assembly name
assemblyName = new AssemblyName();
var assemblyName = new AssemblyName();
assemblyName.Name = "NLua_generatedcode";
// Create a new assembly with one module.
#if NETCOREAPP
......@@ -49,9 +45,7 @@ namespace NLua
/*
* Singleton instance of the class
*/
public static CodeGeneration Instance {
get { return instance; }
}
public static CodeGeneration Instance { get; } = new CodeGeneration();
/*
* Generates an event handler that calls a Lua function
......@@ -60,15 +54,13 @@ namespace NLua
{
#if __IOS__ || __TVOS__ || __WATCHOS__
throw new NotImplementedException (" Emit not available on Xamarin.iOS ");
#elif SILVERLIGHT
throw new NotImplementedException(" Emit not available on Silverlight ");
#elif NETSTANDARD
throw new NotImplementedException(" Emit not available on .NET Standard ");
#else
string typeName;
lock (this)
{
typeName = "LuaGeneratedClass" + luaClassNumber.ToString();
typeName = "LuaGeneratedClass" + luaClassNumber;
luaClassNumber++;
}
......@@ -105,15 +97,13 @@ namespace NLua
{
#if __IOS__ || __TVOS__ || __WATCHOS__
throw new NotImplementedException ("GenerateDelegate is not available on iOS, please register your LuaDelegate type with Lua.RegisterLuaDelegateType( yourDelegate, theLuaDelegateHandler) ");
#elif SILVERLIGHT
throw new NotImplementedException("GenerateDelegate is not available on Silverlight, please register your LuaDelegate type with Lua.RegisterLuaDelegateType( yourDelegate, theLuaDelegateHandler) ");
#elif NETSTANDARD
throw new NotImplementedException("GenerateDelegate is not available on Windows Store, please register your LuaDelegate type with Lua.RegisterLuaDelegateType( yourDelegate, theLuaDelegateHandler) ");
#else
string typeName;
lock (this)
{
typeName = "LuaGeneratedClass" + luaClassNumber.ToString();
typeName = "LuaGeneratedClass" + luaClassNumber;
luaClassNumber++;
}
......@@ -297,13 +287,10 @@ namespace NLua
GetReturnTypesFromMethod(method, out returnTypes[i]);
i++;
}
else
else if (!method.IsPrivate && !method.IsFinal && method.IsVirtual)
{
if (!method.IsPrivate && !method.IsFinal && method.IsVirtual)
{
GetReturnTypesFromMethod(method, out returnTypes[i]);
i++;
}
GetReturnTypesFromMethod(method, out returnTypes[i]);
i++;
}
}
}
......@@ -316,15 +303,13 @@ namespace NLua
{
#if __IOS__ || __TVOS__ || __WATCHOS__
throw new NotImplementedException (" Emit not available on Xamarin.iOS ");
#elif SILVERLIGHT
throw new NotImplementedException (" Emit not available on Silverlight ");
#elif NETSTANDARD
throw new NotImplementedException (" Emit not available on .NET Standard ");
#else
string typeName;
lock (this)
{
typeName = "LuaGeneratedClass" + luaClassNumber.ToString();
typeName = "LuaGeneratedClass" + luaClassNumber;
luaClassNumber++;
}
......@@ -414,12 +399,9 @@ namespace NLua
for (int i = 0; i < paramTypes.Length; i++)
{
paramTypes[i] = paramInfo[i].ParameterType;
#if SILVERLIGHT
if (paramInfo[i].IsOut) {
#else
if ((!paramInfo[i].IsIn) && paramInfo[i].IsOut)
if (!paramInfo[i].IsIn && paramInfo[i].IsOut)
{
#endif
nOutParams++;
}
......@@ -433,7 +415,7 @@ namespace NLua
returnTypes = returnTypesList.ToArray();
}
#if !(__IOS__ || __TVOS__ || __WATCHOS__) && !SILVERLIGHT && !NETSTANDARD
#if !(__IOS__ || __TVOS__ || __WATCHOS__) && !NETSTANDARD
/*
* Generates an overriden implementation of method inside myType that delegates
......@@ -458,7 +440,7 @@ namespace NLua
for (int i = 0; i < paramTypes.Length; i++)
{
paramTypes[i] = paramInfo[i].ParameterType;
if ((!paramInfo[i].IsIn) && paramInfo[i].IsOut)
if (!paramInfo[i].IsIn && paramInfo[i].IsOut)
nOutParams++;
if (paramTypes[i].IsByRef)
......@@ -684,8 +666,6 @@ namespace NLua
{
#if __IOS__ || __TVOS__ || __WATCHOS__
throw new NotImplementedException (" Emit not available on Xamarin.iOS ");
#elif SILVERLIGHT
throw new NotImplementedException (" Emit not available on Silverlight ");
#elif NETSTANDARD
throw new NotImplementedException (" Emit not available on .NET Standard ");
#else
......@@ -700,22 +680,22 @@ namespace NLua
}
var luaEventHandler = (LuaEventHandler)Activator.CreateInstance(eventConsumerType);
luaEventHandler.handler = eventHandler;
luaEventHandler.Handler = eventHandler;
return luaEventHandler;
#endif
}
public void RegisterLuaDelegateType(Type delegateType, Type luaDelegateType)
{
delegateCollection[delegateType] = luaDelegateType;
_delegateCollection[delegateType] = luaDelegateType;
}
public void RegisterLuaClassType(Type klass, Type luaClass)
{
LuaClassType luaClassType = new LuaClassType();
var luaClassType = new LuaClassType();
luaClassType.klass = luaClass;
GetReturnTypesFromClass(klass, out luaClassType.returnTypes);
classCollection[klass] = luaClassType;
_classCollection[klass] = luaClassType;
}
/*
* Gets a delegate with delegateType that calls the luaFunc Lua function
......@@ -726,12 +706,14 @@ namespace NLua
var returnTypes = new List<Type>();
Type luaDelegateType;
if (delegateCollection.ContainsKey(delegateType))
luaDelegateType = delegateCollection[delegateType];
if (_delegateCollection.ContainsKey(delegateType))
{
luaDelegateType = _delegateCollection[delegateType];
}
else
{
luaDelegateType = GenerateDelegate(delegateType);
delegateCollection[delegateType] = luaDelegateType;
_delegateCollection[delegateType] = luaDelegateType;
}
var methodInfo = delegateType.GetMethod("Invoke");
......@@ -746,12 +728,7 @@ namespace NLua
var luaDelegate = (LuaDelegate)Activator.CreateInstance(luaDelegateType);
luaDelegate.function = luaFunc;
luaDelegate.returnTypes = returnTypes.ToArray();
#if NETFX_CORE
var mi = luaDelegate.GetType ().GetTypeInfo ().GetDeclaredMethod ("CallFunction");
return mi.CreateDelegate (delegateType, luaDelegate);
#else
return Delegate.CreateDelegate(delegateType, luaDelegate, "CallFunction");
#endif
}
/*
......@@ -764,13 +741,13 @@ namespace NLua
{
LuaClassType luaClassType;
if (classCollection.ContainsKey(klass))
luaClassType = classCollection[klass];
if (_classCollection.ContainsKey(klass))
luaClassType = _classCollection[klass];
else
{
luaClassType = new LuaClassType();
GenerateClass(klass, out luaClassType.klass, out luaClassType.returnTypes);
classCollection[klass] = luaClassType;
_classCollection[klass] = luaClassType;
}
return Activator.CreateInstance(luaClassType.klass, new object[] {
......
......@@ -5,19 +5,18 @@ namespace NLua
{
class DelegateGenerator
{
private ObjectTranslator translator;
private Type delegateType;
private readonly ObjectTranslator _translator;
private readonly Type _delegateType;
public DelegateGenerator(ObjectTranslator objectTranslator, Type type)
{
translator = objectTranslator;
delegateType = type;
_translator = objectTranslator;
_delegateType = type;
}
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
......@@ -37,22 +37,21 @@ namespace NLua
/// <summary>
/// lua hook calback delegate
/// </summary>
private LuaHookFunction hookCallback = null;
private LuaHookFunction _hookCallback;
#endregion
#region Globals auto-complete
private readonly List<string> globals = new List<string>();
private bool globalsSorted;
private readonly List<string> _globals = new List<string>();
private bool _globalsSorted;
#endregion
private LuaState luaState;
private LuaState _luaState;
/// <summary>
/// True while a script is being executed
/// </summary>
public bool IsExecuting { get { return executing; } }
public bool IsExecuting => executing;
public LuaState State => luaState;
public LuaState State => _luaState;
private LuaNativeFunction panicCallback;
private ObjectTranslator translator;
private ObjectTranslator _translator;
/// <summary>
/// Used to protect the (global) object translator pool during add/remove
/// </summary>
......@@ -64,155 +63,158 @@ namespace NLua
//private object luaLock = new object();
private bool _StatePassed;
private bool executing;
static string initLuanet =
@"local metatable = {}
local rawget = rawget
local import_type = luanet.import_type
local load_assembly = luanet.load_assembly
luanet.error, luanet.type = error, type
-- Lookup a .NET identifier component.
function metatable:__index(key) -- key is e.g. 'Form'
-- Get the fully-qualified name, e.g. 'System.Windows.Forms.Form'
local fqn = rawget(self,'.fqn')
fqn = ((fqn and fqn .. '.') or '') .. key
-- Try to find either a luanet function or a CLR type
local obj = rawget(luanet,key) or import_type(fqn)
-- If key is neither a luanet function or a CLR type, then it is simply
-- an identifier component.
if obj == nil then
-- It might be an assembly, so we load it too.
pcall(load_assembly,fqn)
obj = { ['.fqn'] = fqn }
setmetatable(obj, metatable)
end
-- Cache this lookup
rawset(self, key, obj)
return obj
end
-- A non-type has been called; e.g. foo = System.Foo()
function metatable:__call(...)
error('No such type: ' .. rawget(self,'.fqn'), 2)
end
-- This is the root of the .NET namespace
luanet['.fqn'] = false
setmetatable(luanet, metatable)
-- Preload the mscorlib assembly
luanet.load_assembly('mscorlib')";
static string clr_package = @"---
--- This lua module provides auto importing of .net classes into a named package.
--- Makes for super easy use of LuaInterface glue
---
--- example:
--- Threading = CLRPackage(""System"", ""System.Threading"")
--- Threading.Thread.Sleep(100)
---
--- Extensions:
--- import() is a version of CLRPackage() which puts the package into a list which is used by a global __index lookup,
--- and thus works rather like C#'s using statement. It also recognizes the case where one is importing a local
--- assembly, which must end with an explicit .dll extension.
--- Alternatively, luanet.namespace can be used for convenience without polluting the global namespace:
--- local sys,sysi = luanet.namespace {'System','System.IO'}
-- sys.Console.WriteLine(""we are at {0}"",sysi.Directory.GetCurrentDirectory())
-- LuaInterface hosted with stock Lua interpreter will need to explicitly require this...
if not luanet then require 'luanet' end
local import_type, load_assembly = luanet.import_type, luanet.load_assembly
local mt = {
--- Lookup a previously unfound class and add it to our table
__index = function(package, classname)
local class = rawget(package, classname)
if class == nil then
class = import_type(package.packageName .. ""."" .. classname)
if class == nil then class = import_type(classname) end
package[classname] = class -- keep what we found around, so it will be shared
end
return class
end
}
function luanet.namespace(ns)
if type(ns) == 'table' then
local res = {}
for i = 1,#ns do
res[i] = luanet.namespace(ns[i])
end
return unpack(res)
end
-- FIXME - table.packageName could instead be a private index (see Lua 13.4.4)
local t = { packageName = ns }
setmetatable(t,mt)
return t
end
local globalMT, packages
local function set_global_mt()
packages = {}
globalMT = {
__index = function(T,classname)
for i,package in ipairs(packages) do
local class = package[classname]
if class then
_G[classname] = class
return class
end
end
end
}
setmetatable(_G, globalMT)
end
--- Create a new Package class
function CLRPackage(assemblyName, packageName)
-- a sensible default...
packageName = packageName or assemblyName
local ok = pcall(load_assembly,assemblyName) -- Make sure our assembly is loaded
return luanet.namespace(packageName)
end
function import (assemblyName, packageName)
if not globalMT then
set_global_mt()
end
if not packageName then
local i = assemblyName:find('%.dll$')
if i then packageName = assemblyName:sub(1,i-1)
else packageName = assemblyName end
end
local t = CLRPackage(assemblyName,packageName)
table.insert(packages,t)
return t
end
function luanet.make_array (tp,tbl)
local arr = tp[#tbl]
for i,v in ipairs(tbl) do
arr:SetValue(v,i-1)
end
return arr
end
function luanet.each(o)
local e = o:GetEnumerator()
return function()
if e:MoveNext() then
return e.Current
end
end
end
";
// The commented code bellow is the initLua, the code assigned here is minified for size/performance reasons.
private static string initLuanet = @"local a={}local rawget=rawget;local b=luanet.import_type;local c=luanet.load_assembly;luanet.error,luanet.type=error,type;function a:__index(d)local e=rawget(self,'.fqn')e=(e and e..'.'or'')..d;local f=rawget(luanet,d)or b(e)if f==nil then pcall(c,e)f={['.fqn']=e}setmetatable(f,a)end;rawset(self,d,f)return f end;function a:__call(...)error('No such type: '..rawget(self,'.fqn'),2)end;luanet['.fqn']=false;setmetatable(luanet,a)luanet.load_assembly('mscorlib')";
//@"local metatable = {}
// local rawget = rawget
// local import_type = luanet.import_type
// local load_assembly = luanet.load_assembly
// luanet.error, luanet.type = error, type
// -- Lookup a .NET identifier component.
// function metatable:__index(key) -- key is e.g. 'Form'
// -- Get the fully-qualified name, e.g. 'System.Windows.Forms.Form'
// local fqn = rawget(self,'.fqn')
// fqn = ((fqn and fqn .. '.') or '') .. key
// -- Try to find either a luanet function or a CLR type
// local obj = rawget(luanet,key) or import_type(fqn)
// -- If key is neither a luanet function or a CLR type, then it is simply
// -- an identifier component.
// if obj == nil then
// -- It might be an assembly, so we load it too.
// pcall(load_assembly,fqn)
// obj = { ['.fqn'] = fqn }
// setmetatable(obj, metatable)
// end
// -- Cache this lookup
// rawset(self, key, obj)
// return obj
// end
// -- A non-type has been called; e.g. foo = System.Foo()
// function metatable:__call(...)
// error('No such type: ' .. rawget(self,'.fqn'), 2)
// end
// -- This is the root of the .NET namespace
// luanet['.fqn'] = false
// setmetatable(luanet, metatable)
// -- Preload the mscorlib assembly
// luanet.load_assembly('mscorlib')";
private static string clr_package = @"if not luanet then require'luanet'end;local a,b=luanet.import_type,luanet.load_assembly;local c={__index=function(d,e)local f=rawget(d,e)if f==nil then f=a(d.packageName.."".""..e)if f==nil then f=a(e)end;d[e]=f end;return f end}function luanet.namespace(g)if type(g)=='table'then local h={}for i=1,#g do h[i]=luanet.namespace(g[i])end;return unpack(h)end;local j={packageName=g}setmetatable(j,c)return j end;local k,l;local function m()l={}k={__index=function(n,e)for i,d in ipairs(l)do local f=d[e]if f then _G[e]=f;return f end end end}setmetatable(_G,k)end;function CLRPackage(o,p)p=p or o;local q=pcall(b,o)return luanet.namespace(p)end;function import(o,p)if not k then m()end;if not p then local i=o:find('%.dll$')if i then p=o:sub(1,i-1)else p=o end end;local j=CLRPackage(o,p)table.insert(l,j)return j end;function luanet.make_array(r,s)local t=r[#s]for i,u in ipairs(s)do t:SetValue(u,i-1)end;return t end;function luanet.each(v)local w=v:GetEnumerator()return function()if w:MoveNext()then return w.Current end end end";
//@"---
//--- This lua module provides auto importing of .net classes into a named package.
//--- Makes for super easy use of LuaInterface glue
//---
//--- example:
//--- Threading = CLRPackage(""System"", ""System.Threading"")
//--- Threading.Thread.Sleep(100)
//---
//--- Extensions:
//--- import() is a version of CLRPackage() which puts the package into a list which is used by a global __index lookup,
//--- and thus works rather like C#'s using statement. It also recognizes the case where one is importing a local
//--- assembly, which must end with an explicit .dll extension.
//--- Alternatively, luanet.namespace can be used for convenience without polluting the global namespace:
//--- local sys,sysi = luanet.namespace {'System','System.IO'}
//-- sys.Console.WriteLine(""we are at {0}"",sysi.Directory.GetCurrentDirectory())
//-- LuaInterface hosted with stock Lua interpreter will need to explicitly require this...
//if not luanet then require 'luanet' end
//local import_type, load_assembly = luanet.import_type, luanet.load_assembly
//local mt = {
// --- Lookup a previously unfound class and add it to our table
// __index = function(package, classname)
// local class = rawget(package, classname)
// if class == nil then
// class = import_type(package.packageName .. ""."" .. classname)
// if class == nil then class = import_type(classname) end
// package[classname] = class -- keep what we found around, so it will be shared
// end
// return class
// end
//}
//function luanet.namespace(ns)
// if type(ns) == 'table' then
// local res = {}
// for i = 1,#ns do
// res[i] = luanet.namespace(ns[i])
// end
// return unpack(res)
// end
// -- FIXME - table.packageName could instead be a private index (see Lua 13.4.4)
// local t = { packageName = ns }
// setmetatable(t,mt)
// return t
//end
//local globalMT, packages
//local function set_global_mt()
// packages = {}
// globalMT = {
// __index = function(T,classname)
// for i,package in ipairs(packages) do
// local class = package[classname]
// if class then
// _G[classname] = class
// return class
// end
// end
// end
// }
// setmetatable(_G, globalMT)
//end
//--- Create a new Package class
//function CLRPackage(assemblyName, packageName)
// -- a sensible default...
// packageName = packageName or assemblyName
// local ok = pcall(load_assembly,assemblyName) -- Make sure our assembly is loaded
// return luanet.namespace(packageName)
//end
//function import (assemblyName, packageName)
// if not globalMT then
// set_global_mt()
// end
// if not packageName then
// local i = assemblyName:find('%.dll$')
// if i then packageName = assemblyName:sub(1,i-1)
// else packageName = assemblyName end
// end
// local t = CLRPackage(assemblyName,packageName)
// table.insert(packages,t)
// return t
//end
//function luanet.make_array (tp,tbl)
// local arr = tp[#tbl]
// for i,v in ipairs(tbl) do
// arr:SetValue(v,i-1)
// end
// return arr
//end
//function luanet.each(o)
// local e = o:GetEnumerator()
// return function()
// if e:MoveNext() then
// return e.Current
// end
// end
//end
//";
public bool UseTraceback { get; set; } = false;
#region Globals auto-complete
......@@ -224,24 +226,23 @@ end
get
{
// Only sort list when necessary
if (!globalsSorted)
if (!_globalsSorted)
{
globals.Sort();
globalsSorted = true;
_globals.Sort();
_globalsSorted = true;
}
return globals;
return _globals;
}
}
#endregion
public Lua()
{
luaState = new LuaState();
_luaState = new LuaState();
Init();
// We need to keep this in a managed reference so the delegate doesn't get garbage collected
panicCallback = PanicCallback;
luaState.AtPanic(panicCallback);
_luaState.AtPanic(PanicCallback);
}
/*
......@@ -257,53 +258,48 @@ end
luaState.SetTop(-2);
throw new LuaException("There is already a NLua.Lua instance associated with this Lua state");
}
else
{
this.luaState = luaState;
_StatePassed = true;
luaState.SetTop(-2);
Init();
}
_luaState = luaState;
_StatePassed = true;
luaState.SetTop(-2);
Init();
}
void Init()
{
luaState.PushString("NLua_Loaded");
luaState.PushBoolean(true);
luaState.SetTable((int)LuaRegistry.Index);
_luaState.PushString("NLua_Loaded");
_luaState.PushBoolean(true);
_luaState.SetTable((int)LuaRegistry.Index);
if (_StatePassed == false)
{
luaState.NewTable();
luaState.SetGlobal("luanet");
_luaState.NewTable();
_luaState.SetGlobal("luanet");
}
luaState.PushGlobalTable();
luaState.GetGlobal("luanet");
luaState.PushString("getmetatable");
luaState.GetGlobal("getmetatable");
luaState.SetTable(-3);
luaState.PopGlobalTable();
translator = new ObjectTranslator(this, luaState);
_luaState.PushGlobalTable();
_luaState.GetGlobal("luanet");
_luaState.PushString("getmetatable");
_luaState.GetGlobal("getmetatable");
_luaState.SetTable(-3);
_luaState.PopGlobalTable();
_translator = new ObjectTranslator(this, _luaState);
lock (translatorPoolLock)
{
ObjectTranslatorPool.Instance.Add(luaState, translator);
ObjectTranslatorPool.Instance.Add(_luaState, _translator);
}
luaState.PopGlobalTable();
luaState.DoString(initLuanet);
_luaState.PopGlobalTable();
_luaState.DoString(initLuanet);
}
public void Close()
{
if (_StatePassed)
if (_StatePassed || _luaState == null)
return;
if (luaState != null)
lock (translatorPoolLock)
{
lock (translatorPoolLock)
{
luaState.Close();
ObjectTranslatorPool.Instance.Remove(luaState);
luaState = null;
}
_luaState.Close();
ObjectTranslatorPool.Instance.Remove(_luaState);
_luaState = null;
}
}
......@@ -323,8 +319,8 @@ end
/// <exception cref = "LuaScriptException">Thrown if the script caused an exception</exception>
private void ThrowExceptionFromError(int oldTop)
{
object err = translator.GetObject(luaState, -1);
luaState.SetTop(oldTop);
object err = _translator.GetObject(_luaState, -1);
_luaState.SetTop(oldTop);
// A pre-wrapped exception - just rethrow it (stack trace of InnerException will be preserved)
var luaEx = err as LuaScriptException;
......@@ -347,9 +343,9 @@ end
luaState.GetGlobal("debug");
luaState.GetField(-1, "traceback");
luaState.Remove(-2);
int errindex = -argCount - 2;
luaState.Insert(errindex);
return errindex;
int errIndex = -argCount - 2;
luaState.Insert(errIndex);
return errIndex;
}
/// <summary>
......@@ -358,12 +354,12 @@ end
/// </summary>
public string GetDebugTraceback()
{
int oldTop = luaState.GetTop();
luaState.GetGlobal("debug"); // stack: debug
luaState.GetField(-1, "traceback"); // stack: debug,traceback
luaState.Remove(-2); // stack: traceback
luaState.PCall(0, -1, 0);
return translator.PopValues(luaState, oldTop)[0] as string;
int oldTop = _luaState.GetTop();
_luaState.GetGlobal("debug"); // stack: debug
_luaState.GetField(-1, "traceback"); // stack: debug,traceback
_luaState.Remove(-2); // stack: traceback
_luaState.PCall(0, -1, 0);
return _translator.PopValues(_luaState, oldTop)[0] as string;
}
/// <summary>
......@@ -375,14 +371,12 @@ end
{
var caughtExcept = e;
if (caughtExcept != null)
{
translator.ThrowError(luaState, caughtExcept);
luaState.PushNil();
return 1;
}
else
if (caughtExcept == null)
return 0;
_translator.ThrowError(_luaState, caughtExcept);
_luaState.PushNil();
return 1;
}
/// <summary>
......@@ -393,12 +387,12 @@ end
/// <returns></returns>
public LuaFunction LoadString(string chunk, string name)
{
int oldTop = luaState.GetTop();
int oldTop = _luaState.GetTop();
executing = true;
try
{
if (luaState.LoadString(chunk, name) != LuaStatus.OK)
if (_luaState.LoadString(chunk, name) != LuaStatus.OK)
ThrowExceptionFromError(oldTop);
}
finally
......@@ -406,8 +400,8 @@ end
executing = false;
}
var result = translator.GetFunction(luaState, -1);
translator.PopValues(luaState, oldTop);
var result = _translator.GetFunction(_luaState, -1);
_translator.PopValues(_luaState, oldTop);
return result;
}
......@@ -419,12 +413,12 @@ end
/// <returns></returns>
public LuaFunction LoadString(byte[] chunk, string name)
{
int oldTop = luaState.GetTop();
int oldTop = _luaState.GetTop();
executing = true;
try
{
if (luaState.LoadBuffer(chunk, name) != LuaStatus.OK)
if (_luaState.LoadBuffer(chunk, name) != LuaStatus.OK)
ThrowExceptionFromError(oldTop);
}
finally
......@@ -432,8 +426,8 @@ end
executing = false;
}
var result = translator.GetFunction(luaState, -1);
translator.PopValues(luaState, oldTop);
var result = _translator.GetFunction(_luaState, -1);
_translator.PopValues(_luaState, oldTop);
return result;
}
......@@ -444,13 +438,13 @@ end
/// <returns></returns>
public LuaFunction LoadFile(string fileName)
{
int oldTop = luaState.GetTop();
int oldTop = _luaState.GetTop();
if (luaState.LoadFile(fileName) != LuaStatus.OK)
if (_luaState.LoadFile(fileName) != LuaStatus.OK)
ThrowExceptionFromError(oldTop);
var result = translator.GetFunction(luaState, -1);
translator.PopValues(luaState, oldTop);
var result = _translator.GetFunction(_luaState, -1);
_translator.PopValues(_luaState, oldTop);
return result;
}
......@@ -462,34 +456,31 @@ end
/// <returns></returns>
public object[] DoString(byte[] chunk, string chunkName = "chunk")
{
int oldTop = luaState.GetTop();
int oldTop = _luaState.GetTop();
executing = true;
if (luaState.LoadBuffer(chunk, chunkName) == LuaStatus.OK)
{
int errfunction = 0;
if (UseTraceback)
{
errfunction = PushDebugTraceback(luaState, 0);
oldTop++;
}
if (_luaState.LoadBuffer(chunk, chunkName) != LuaStatus.OK)
ThrowExceptionFromError(oldTop);
try
{
if (luaState.PCall(0, -1, errfunction) == LuaStatus.OK)
return translator.PopValues(luaState, oldTop);
else
ThrowExceptionFromError(oldTop);
}
finally
{
executing = false;
}
int errorFunctionIndex = 0;
if (UseTraceback)
{
errorFunctionIndex = PushDebugTraceback(_luaState, 0);
oldTop++;
}
else
ThrowExceptionFromError(oldTop);
return null;
try
{
if (_luaState.PCall(0, -1, errorFunctionIndex) != LuaStatus.OK)
ThrowExceptionFromError(oldTop);
return _translator.PopValues(_luaState, oldTop);
}
finally
{
executing = false;
}
}
/// <summary>
......@@ -500,71 +491,64 @@ end
/// <returns></returns>
public object[] DoString(string chunk, string chunkName = "chunk")
{
int oldTop = luaState.GetTop();
int oldTop = _luaState.GetTop();
executing = true;
if (luaState.LoadString(chunk, chunkName) == LuaStatus.OK)
{
int errfunction = 0;
if (UseTraceback)
{
errfunction = PushDebugTraceback(luaState, 0);
oldTop++;
}
if (_luaState.LoadString(chunk, chunkName) != LuaStatus.OK)
ThrowExceptionFromError(oldTop);
try
{
if (luaState.PCall(0, -1, errfunction) == LuaStatus.OK)
return translator.PopValues(luaState, oldTop);
else
ThrowExceptionFromError(oldTop);
}
finally
{
executing = false;
}
int errorFunctionIndex = 0;
if (UseTraceback)
{
errorFunctionIndex = PushDebugTraceback(_luaState, 0);
oldTop++;
}
else
ThrowExceptionFromError(oldTop);
return null;
try
{
if (_luaState.PCall(0, -1, errorFunctionIndex) != LuaStatus.OK)
ThrowExceptionFromError(oldTop);
return _translator.PopValues(_luaState, oldTop);
}
finally
{
executing = false;
}
}
/*
* Excutes a Lua file and returns all the chunk's return
* values in an array
*/
* Executes a Lua file and returns all the chunk's return
* values in an array
*/
public object[] DoFile(string fileName)
{
int oldTop = luaState.GetTop();
int oldTop = _luaState.GetTop();
if (luaState.LoadFile(fileName) == LuaStatus.OK)
{
executing = true;
if (_luaState.LoadFile(fileName) != LuaStatus.OK)
ThrowExceptionFromError(oldTop);
int errfunction = 0;
if (UseTraceback)
{
errfunction = PushDebugTraceback(luaState, 0);
oldTop++;
}
executing = true;
try
{
if (luaState.PCall(0, -1, errfunction) == LuaStatus.OK)
return translator.PopValues(luaState, oldTop);
else
ThrowExceptionFromError(oldTop);
}
finally
{
executing = false;
}
int errorFunctionIndex = 0;
if (UseTraceback)
{
errorFunctionIndex = PushDebugTraceback(_luaState, 0);
oldTop++;
}
else
ThrowExceptionFromError(oldTop);
return null;
try
{
if (_luaState.PCall(0, -1, errorFunctionIndex) != LuaStatus.OK)
ThrowExceptionFromError(oldTop);
return _translator.PopValues(_luaState, oldTop);
}
finally
{
executing = false;
}
}
......@@ -575,11 +559,10 @@ end
public object this[string fullPath] {
get
{
object returnValue = null;
int oldTop = luaState.GetTop();
int oldTop = _luaState.GetTop();
string[] path = FullPathToArray(fullPath);
luaState.GetGlobal(path[0]);
returnValue = translator.GetObject(luaState, -1);
_luaState.GetGlobal(path[0]);
object returnValue = _translator.GetObject(_luaState, -1);
if (path.Length > 1)
{
......@@ -591,38 +574,38 @@ end
dispose.Dispose();
}
luaState.SetTop(oldTop);
_luaState.SetTop(oldTop);
return returnValue;
}
set
{
int oldTop = luaState.GetTop();
int oldTop = _luaState.GetTop();
string[] path = FullPathToArray(fullPath);
if (path.Length == 1)
{
translator.Push(luaState, value);
luaState.SetGlobal(fullPath);
_translator.Push(_luaState, value);
_luaState.SetGlobal(fullPath);
}
else
{
luaState.GetGlobal(path[0]);
_luaState.GetGlobal(path[0]);
string[] remainingPath = new string[path.Length - 1];
Array.Copy(path, 1, remainingPath, 0, path.Length - 1);
SetObject(remainingPath, value);
}
luaState.SetTop(oldTop);
_luaState.SetTop(oldTop);
// Globals auto-complete
if (value == null)
{
// Remove now obsolete entries
globals.Remove(fullPath);
_globals.Remove(fullPath);
}
else
{
// Add new entries
if (!globals.Contains(fullPath))
if (!_globals.Contains(fullPath))
RegisterGlobal(fullPath, value.GetType(), 0);
}
}
......@@ -630,7 +613,7 @@ end
#region Globals auto-complete
/// <summary>
/// Adds an entry to <see cref = "globals"/> (recursivley handles 2 levels of members)
/// Adds an entry to <see cref = "_globals"/> (recursivley handles 2 levels of members)
/// </summary>
/// <param name = "path">The index accessor path ot the entry</param>
/// <param name = "type">The type of the entry</param>
......@@ -641,7 +624,7 @@ end
if (type == typeof(LuaFunction))
{
// Format for easy method invocation
globals.Add(path + "(");
_globals.Add(path + "(");
}
// If the type is a class or an interface and recursion hasn't been running too long, list the members
else if ((type.IsClass || type.IsInterface) && type != typeof(string) && recursionCounter < 2)
......@@ -668,7 +651,7 @@ end
if (method.GetParameters().Length == 0)
command += ")";
globals.Add(command);
_globals.Add(command);
}
}
#endregion
......@@ -704,10 +687,10 @@ end
#endregion
}
else
globals.Add(path); // Otherwise simply add the element to the list
_globals.Add(path); // Otherwise simply add the element to the list
// List will need to be sorted on next access
globalsSorted = false;
_globalsSorted = false;
}
#endregion
......@@ -721,9 +704,9 @@ end
for (int i = 0; i < remainingPath.Length; i++)
{
luaState.PushString(remainingPath[i]);
luaState.GetTable(-2);
returnValue = translator.GetObject(luaState, -1);
_luaState.PushString(remainingPath[i]);
_luaState.GetTable(-2);
returnValue = _translator.GetObject(_luaState, -1);
if (returnValue == null)
break;
......@@ -795,7 +778,7 @@ end
public void LoadCLRPackage()
{
luaState.DoString(Lua.clr_package);
_luaState.DoString(Lua.clr_package);
}
/*
* Gets a function global variable as a delegate of
......@@ -823,19 +806,19 @@ end
internal object[] CallFunction(object function, object[] args, Type[] returnTypes)
{
int nArgs = 0;
int oldTop = luaState.GetTop();
int oldTop = _luaState.GetTop();
if (!luaState.CheckStack(args.Length + 6))
if (!_luaState.CheckStack(args.Length + 6))
throw new LuaException("Lua stack overflow");
translator.Push(luaState, function);
_translator.Push(_luaState, function);
if (args.Length > 0)
{
nArgs = args.Length;
for (int i = 0; i < args.Length; i++)
translator.Push(luaState, args[i]);
_translator.Push(_luaState, args[i]);
}
executing = true;
......@@ -845,11 +828,11 @@ end
int errfunction = 0;
if (UseTraceback)
{
errfunction = PushDebugTraceback(luaState, nArgs);
errfunction = PushDebugTraceback(_luaState, nArgs);
oldTop++;
}
LuaStatus error = luaState.PCall(nArgs, -1, errfunction);
LuaStatus error = _luaState.PCall(nArgs, -1, errfunction);
if (error != LuaStatus.OK)
ThrowExceptionFromError(oldTop);
}
......@@ -859,9 +842,9 @@ end
}
if (returnTypes != null)
return translator.PopValues(luaState, oldTop, returnTypes);
return _translator.PopValues(_luaState, oldTop, returnTypes);
return translator.PopValues(luaState, oldTop);
return _translator.PopValues(_luaState, oldTop);
}
/*
......@@ -871,13 +854,13 @@ end
{
for (int i = 0; i < remainingPath.Length - 1; i++)
{
luaState.PushString(remainingPath[i]);
luaState.GetTable(-2);
_luaState.PushString(remainingPath[i]);
_luaState.GetTable(-2);
}
luaState.PushString(remainingPath[remainingPath.Length - 1]);
translator.Push(luaState, val);
luaState.SetTable(-3);
_luaState.PushString(remainingPath[remainingPath.Length - 1]);
_translator.Push(_luaState, val);
_luaState.SetTable(-3);
}
string[] FullPathToArray(string fullPath)
......@@ -891,45 +874,45 @@ end
public void NewTable(string fullPath)
{
string[] path = FullPathToArray(fullPath);
int oldTop = luaState.GetTop();
int oldTop = _luaState.GetTop();
if (path.Length == 1)
{
luaState.NewTable();
luaState.SetGlobal(fullPath);
_luaState.NewTable();
_luaState.SetGlobal(fullPath);
}
else
{
luaState.GetGlobal(path[0]);
_luaState.GetGlobal(path[0]);
for (int i = 1; i < path.Length - 1; i++)
{
luaState.PushString(path[i]);
luaState.GetTable(-2);
_luaState.PushString(path[i]);
_luaState.GetTable(-2);
}
luaState.PushString(path[path.Length - 1]);
luaState.NewTable();
luaState.SetTable(-3);
_luaState.PushString(path[path.Length - 1]);
_luaState.NewTable();
_luaState.SetTable(-3);
}
luaState.SetTop( oldTop);
_luaState.SetTop( oldTop);
}
public Dictionary<object, object> GetTableDict(LuaTable table)
{
var dict = new Dictionary<object, object>();
int oldTop = luaState.GetTop();
translator.Push(luaState, table);
luaState.PushNil();
int oldTop = _luaState.GetTop();
_translator.Push(_luaState, table);
_luaState.PushNil();
while (luaState.Next(-2))
while (_luaState.Next(-2))
{
dict[translator.GetObject(luaState, -2)] = translator.GetObject(luaState, -1);
luaState.SetTop(-2);
dict[_translator.GetObject(_luaState, -2)] = _translator.GetObject(_luaState, -1);
_luaState.SetTop(-2);
}
luaState.SetTop(oldTop);
_luaState.SetTop(oldTop);
return dict;
}
......@@ -946,10 +929,10 @@ end
/// <returns>see lua docs. -1 if hook is already set</returns>
public int SetDebugHook(LuaHookMask mask, int count)
{
if (hookCallback == null)
if (_hookCallback == null)
{
hookCallback = new LuaHookFunction(Lua.DebugHookCallback);
luaState.SetHook(hookCallback, mask, count);
_hookCallback = new LuaHookFunction(Lua.DebugHookCallback);
_luaState.SetHook(_hookCallback, mask, count);
}
return -1;
......@@ -961,8 +944,8 @@ end
/// <returns>see lua docs</returns>
public void RemoveDebugHook()
{
hookCallback = null;
luaState.SetHook(null, LuaHookMask.Disabled, 0);
_hookCallback = null;
_luaState.SetHook(null, LuaHookMask.Disabled, 0);
}
/// <summary>
......@@ -971,7 +954,7 @@ end
/// <returns>hook mask</returns>
public LuaHookMask GetHookMask()
{
return luaState.HookMask;
return _luaState.HookMask;
}
/// <summary>
......@@ -980,7 +963,7 @@ end
/// <returns>see lua docs</returns>
public int GetHookCount()
{
return luaState.HookCount;
return _luaState.HookCount;
}
......@@ -992,7 +975,7 @@ end
/// <returns>see lua docs</returns>
public string GetLocal(LuaDebug luaDebug, int n)
{
return luaState.GetLocal(luaDebug, n);
return _luaState.GetLocal(luaDebug, n);
}
/// <summary>
......@@ -1003,17 +986,17 @@ end
/// <returns>see lua docs</returns>
public string SetLocal(LuaDebug luaDebug, int n)
{
return luaState.SetLocal(luaDebug, n);
return _luaState.SetLocal(luaDebug, n);
}
public int GetStack(int level, ref LuaDebug ar)
{
return luaState.GetStack(level, ref ar);
return _luaState.GetStack(level, ref ar);
}
public bool GetInfo(string what, ref LuaDebug ar)
{
return luaState.GetInfo(what, ref ar);
return _luaState.GetInfo(what, ref ar);
}
/// <summary>
......@@ -1024,7 +1007,7 @@ end
/// <returns>see lua docs</returns>
public string GetUpValue(int funcindex, int n)
{
return luaState.GetUpValue(funcindex, n);
return _luaState.GetUpValue(funcindex, n);
}
/// <summary>
......@@ -1035,7 +1018,7 @@ end
/// <returns>see lua docs</returns>
public string SetUpValue(int funcindex, int n)
{
return luaState.SetUpValue(funcindex, n);
return _luaState.SetUpValue(funcindex, n);
}
/// <summary>
......@@ -1060,10 +1043,10 @@ end
ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(state);
Lua lua = translator.Interpreter;
lua.DebugHookCallbackInternal(state, debug);
lua.DebugHookCallbackInternal(debug);
}
private void DebugHookCallbackInternal(LuaState luaState, LuaDebug luaDebug)
private void DebugHookCallbackInternal(LuaDebug luaDebug)
{
try
{
......@@ -1091,8 +1074,8 @@ end
/// <returns>Returns the top value from the lua stack.</returns>
public object Pop()
{
int top = luaState.GetTop();
return translator.PopValues(luaState, top - 1)[0];
int top = _luaState.GetTop();
return _translator.PopValues(_luaState, top - 1)[0];
}
/// <summary>
......@@ -1101,14 +1084,14 @@ end
/// <param name = "value">Value to push.</param>
public void Push(object value)
{
translator.Push(luaState, value);
_translator.Push(_luaState, value);
}
#endregion
internal void DisposeInternal(int reference)
{
if (luaState != null)
luaState.Unref(reference);
if (_luaState != null)
_luaState.Unref(reference);
}
/*
......@@ -1117,12 +1100,12 @@ end
*/
internal object RawGetObject(int reference, string field)
{
int oldTop = luaState.GetTop();
luaState.GetRef(reference);
luaState.PushString(field);
luaState.RawGet(-2);
object obj = translator.GetObject(luaState, -1);
luaState.SetTop(oldTop);
int oldTop = _luaState.GetTop();
_luaState.GetRef(reference);
_luaState.PushString(field);
_luaState.RawGet(-2);
object obj = _translator.GetObject(_luaState, -1);
_luaState.SetTop(oldTop);
return obj;
}
......@@ -1131,10 +1114,10 @@ end
*/
internal object GetObject(int reference, string field)
{
int oldTop = luaState.GetTop();
luaState.GetRef(reference);
int oldTop = _luaState.GetTop();
_luaState.GetRef(reference);
object returnValue = GetObject(FullPathToArray(field));
luaState.SetTop(oldTop);
_luaState.SetTop(oldTop);
return returnValue;
}
......@@ -1143,12 +1126,12 @@ end
*/
internal object GetObject(int reference, object field)
{
int oldTop = luaState.GetTop();
luaState.GetRef(reference);
translator.Push(luaState, field);
luaState.GetTable(-2);
object returnValue = translator.GetObject(luaState, -1);
luaState.SetTop(oldTop);
int oldTop = _luaState.GetTop();
_luaState.GetRef(reference);
_translator.Push(_luaState, field);
_luaState.GetTable(-2);
object returnValue = _translator.GetObject(_luaState, -1);
_luaState.SetTop(oldTop);
return returnValue;
}
......@@ -1158,10 +1141,10 @@ end
*/
internal void SetObject(int reference, string field, object val)
{
int oldTop = luaState.GetTop();
luaState.GetRef(reference);
int oldTop = _luaState.GetTop();
_luaState.GetRef(reference);
SetObject(FullPathToArray(field), val);
luaState.SetTop(oldTop);
_luaState.SetTop(oldTop);
}
/*
......@@ -1170,12 +1153,12 @@ end
*/
internal void SetObject(int reference, object field, object val)
{
int oldTop = luaState.GetTop();
luaState.GetRef(reference);
translator.Push(luaState, field);
translator.Push(luaState, val);
luaState.SetTable(-3);
luaState.SetTop(oldTop);
int oldTop = _luaState.GetTop();
_luaState.GetRef(reference);
_translator.Push(_luaState, field);
_translator.Push(_luaState, val);
_luaState.SetTable(-3);
_luaState.SetTop(oldTop);
}
public LuaFunction RegisterFunction(string path, MethodBase function /*MethodInfo function*/)
......@@ -1190,12 +1173,12 @@ 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)
{
// We leave nothing on the stack when we are done
int oldTop = luaState.GetTop();
var wrapper = new LuaMethodWrapper(translator, target, new ProxyType(function.DeclaringType), function);
translator.Push(luaState, new LuaNativeFunction(wrapper.invokeFunction));
this[path] = translator.GetObject(luaState, -1);
int oldTop = _luaState.GetTop();
var wrapper = new LuaMethodWrapper(_translator, target, new ProxyType(function.DeclaringType), function);
_translator.Push(_luaState, new LuaNativeFunction(wrapper.InvokeFunction));
this[path] = _translator.GetObject(_luaState, -1);
var f = GetFunction(path);
luaState.SetTop(oldTop);
_luaState.SetTop(oldTop);
return f;
}
......@@ -1204,28 +1187,28 @@ end
*/
internal bool CompareRef(int ref1, int ref2)
{
int top = luaState.GetTop();
luaState.GetRef(ref1);
luaState.GetRef(ref2);
bool equal = luaState.AreEqual(-1, -2);
luaState.SetTop(top);
int top = _luaState.GetTop();
_luaState.GetRef(ref1);
_luaState.GetRef(ref2);
bool equal = _luaState.AreEqual(-1, -2);
_luaState.SetTop(top);
return equal;
}
internal void PushCSFunction(LuaNativeFunction function)
{
translator.PushFunction(luaState, function);
_translator.PushFunction(_luaState, function);
}
#region IDisposable Members
public virtual void Dispose()
{
if (translator != null)
if (_translator != null)
{
translator.pendingEvents.Dispose();
if (translator.Tag != IntPtr.Zero)
Marshal.FreeHGlobal(translator.Tag);
translator = null;
_translator.PendingEvents.Dispose();
if (_translator.Tag != IntPtr.Zero)
Marshal.FreeHGlobal(_translator.Tag);
_translator = null;
}
Close();
......
......@@ -7,11 +7,14 @@ namespace NLua
/// </summary>
public abstract class LuaBase : IDisposable
{
private bool _Disposed;
protected int
_Reference;
protected Lua
_Interpreter;
private bool _disposed;
protected readonly int _Reference;
protected Lua _Interpreter;
protected LuaBase(int reference)
{
_Reference = reference;
}
~LuaBase()
{
......@@ -26,28 +29,23 @@ namespace NLua
public virtual void Dispose(bool disposeManagedResources)
{
if (!_Disposed)
{
if (disposeManagedResources)
{
if (_Reference != 0)
_Interpreter.DisposeInternal(_Reference);
}
_Interpreter = null;
_Disposed = true;
}
if (_disposed)
return;
if (_Reference != 0 && disposeManagedResources)
_Interpreter.DisposeInternal(_Reference);
_Interpreter = null;
_disposed = true;
}
public override bool Equals(object o)
{
if (o is LuaBase)
{
var l = (LuaBase)o;
return _Interpreter.CompareRef(l._Reference, _Reference);
}
else
var reference = o as LuaBase;
if (reference == null)
return false;
return _Interpreter.CompareRef(reference._Reference, _Reference);
}
public override int GetHashCode()
......
......@@ -8,18 +8,16 @@ namespace NLua
{
public class LuaFunction : LuaBase
{
internal LuaNativeFunction function;
internal readonly LuaNativeFunction function;
public LuaFunction(int reference, Lua interpreter)
public LuaFunction(int reference, Lua interpreter):base(reference)
{
_Reference = reference;
function = null;
_Interpreter = interpreter;
}
public LuaFunction(LuaNativeFunction nativeFunction, Lua interpreter)
public LuaFunction(LuaNativeFunction nativeFunction, Lua interpreter):base (0)
{
_Reference = 0;
function = nativeFunction;
_Interpreter = interpreter;
}
......@@ -60,17 +58,15 @@ namespace NLua
public override bool Equals(object o)
{
if (o is LuaFunction)
{
var l = (LuaFunction)o;
var l = o as LuaFunction;
if (this._Reference != 0 && l._Reference != 0)
return _Interpreter.CompareRef(l._Reference, this._Reference);
else
return this.function == l.function;
}
else
if (l == null)
return false;
if (_Reference != 0 && l._Reference != 0)
return _Interpreter.CompareRef(l._Reference, _Reference);
return function == l.function;
}
public override int GetHashCode()
......
using System;
using System.Reflection;
using System.Diagnostics.CodeAnalysis;
using NLua.Extensions;
namespace NLua
{
......@@ -18,10 +16,10 @@ namespace NLua
{
#region Sanity checks
if (lua == null)
throw new ArgumentNullException("lua");
throw new ArgumentNullException(nameof(lua));
if (o == null)
throw new ArgumentNullException("o");
throw new ArgumentNullException(nameof(o));
#endregion
foreach (var method in o.GetType().GetMethods(BindingFlags.Instance | BindingFlags.Public))
......@@ -47,13 +45,13 @@ namespace NLua
{
#region Sanity checks
if (lua == null)
throw new ArgumentNullException("lua");
throw new ArgumentNullException(nameof(lua));
if (type == null)
throw new ArgumentNullException("type");
throw new ArgumentNullException(nameof(type));
if (!type.IsClass)
throw new ArgumentException("The type must be a class!", "type");
throw new ArgumentException("The type must be a class!", nameof(type));
#endregion
foreach (var method in type.GetMethods(BindingFlags.Static | BindingFlags.Public))
......@@ -78,7 +76,7 @@ namespace NLua
public static void Enumeration<T>(Lua lua)
{
if (lua == null)
throw new ArgumentNullException("lua");
throw new ArgumentNullException(nameof(lua));
var type = typeof(T);
......
......@@ -9,9 +9,8 @@ namespace NLua
{
public class LuaTable : LuaBase
{
public LuaTable(int reference, Lua interpreter)
public LuaTable(int reference, Lua interpreter):base(reference)
{
_Reference = reference;
_Interpreter = interpreter;
}
......@@ -48,13 +47,11 @@ namespace NLua
return _Interpreter.GetTableDict(this).GetEnumerator();
}
public ICollection Keys {
get { return _Interpreter.GetTableDict(this).Keys; }
}
public ICollection Keys => _Interpreter.GetTableDict(this).Keys;
public ICollection Values => _Interpreter.GetTableDict(this).Values;
public ICollection Values {
get { return _Interpreter.GetTableDict(this).Values; }
}
/*
* Gets an string fields of a table ignoring its metatable,
......
......@@ -3,9 +3,8 @@ namespace NLua
{
public class LuaUserData : LuaBase
{
public LuaUserData(int reference, Lua interpreter)
public LuaUserData(int reference, Lua interpreter):base(reference)
{
_Reference = reference;
_Interpreter = interpreter;
}
......
......@@ -43,13 +43,13 @@ namespace NLua
public LuaNativeFunction LessThanFunction { get; }
public LuaNativeFunction LessThanOrEqualFunction { get; }
Dictionary<object, object> memberCache = new Dictionary<object, object>();
ObjectTranslator translator;
readonly Dictionary<object, Dictionary<object, object>> memberCache = new Dictionary<object, Dictionary<object, object>>();
readonly ObjectTranslator translator;
/*
* __index metafunction for CLR objects. Implemented in Lua.
*/
static string luaIndexFunction =
static readonly string luaIndexFunction =
@"local function index(obj,name)
local meta = getmetatable(obj)
local cached = meta.cache[name]
......@@ -411,43 +411,43 @@ namespace NLua
foreach (var methodInfo in methods)
{
if (methodInfo.Name == "get_Item")
if (methodInfo.Name != "get_Item")
continue;
// Check if the signature matches the input
if (methodInfo.GetParameters().Length != 1)
continue;
var actualParams = methodInfo.GetParameters();
if (actualParams.Length != 1)
{
// Check if the signature matches the input
if (methodInfo.GetParameters().Length == 1)
{
var actualParams = methodInfo.GetParameters();
translator.ThrowError(luaState, "method not found (or no indexer): " + index);
luaState.PushNil();
}
else
{
// Get the index in a form acceptable to the getter
index = translator.GetAsType(luaState, 2, actualParams[0].ParameterType);
object[] args = new object[1];
// Just call the indexer - if out of bounds an exception will happen
args[0] = index;
if (actualParams.Length != 1)
{
translator.ThrowError(luaState, "method not found (or no indexer): " + index);
luaState.PushNil();
}
try
{
object result = methodInfo.Invoke(obj, args);
translator.Push(luaState, result);
}
catch (TargetInvocationException e)
{
// Provide a more readable description for the common case of key not found
if (e.InnerException is KeyNotFoundException)
translator.ThrowError(luaState, "key '" + index + "' not found ");
else
{
// Get the index in a form acceptable to the getter
index = translator.GetAsType(luaState, 2, actualParams[0].ParameterType);
object[] args = new object[1];
// Just call the indexer - if out of bounds an exception will happen
args[0] = index;
try
{
object result = methodInfo.Invoke(obj, args);
translator.Push(luaState, result);
}
catch (TargetInvocationException e)
{
// Provide a more readable description for the common case of key not found
if (e.InnerException is KeyNotFoundException)
translator.ThrowError(luaState, "key '" + index + "' not found ");
else
translator.ThrowError(luaState, "exception indexing '" + index + "' " + e.Message);
luaState.PushNil();
}
}
translator.ThrowError(luaState, "exception indexing '" + index + "' " + e.Message);
luaState.PushNil();
}
}
}
......@@ -545,7 +545,7 @@ namespace NLua
MethodInfo methodInfo = translator.GetExtensionMethod(type, name);
var methodWrapper = new LuaMethodWrapper(translator, obj, new ProxyType(type), methodInfo);
var invokeDelegate = new LuaNativeFunction(methodWrapper.invokeFunction);
var invokeDelegate = new LuaNativeFunction(methodWrapper.InvokeFunction);
SetMemberCache(type, name, invokeDelegate);
......@@ -644,7 +644,7 @@ namespace NLua
if (cachedMember == null)
SetMemberCache(objType, methodName, member);
translator.Push(luaState, new RegisterEventHandler(translator.pendingEvents, obj, eventInfo));
translator.Push(luaState, new RegisterEventHandler(translator.PendingEvents, obj, eventInfo));
}
else if (!implicitStatic)
{
......@@ -666,7 +666,7 @@ namespace NLua
{
// Member type must be 'method'
var methodWrapper = new LuaMethodWrapper(translator, objType, methodName, bindingType);
var wrapper = methodWrapper.invokeFunction;
var wrapper = methodWrapper.InvokeFunction;
if (cachedMember == null)
SetMemberCache(objType, methodName, wrapper);
......@@ -710,21 +710,17 @@ namespace NLua
object CheckMemberCache(ProxyType objType, string memberName)
{
object members = null;
Dictionary<object, object> members;
if (memberCache.TryGetValue(objType, out members))
{
var membersDict = members as Dictionary<object, object>;
if (!memberCache.TryGetValue(objType, out members))
return null;
object memberValue = null;
object memberValue;
if (members != null && membersDict.TryGetValue(memberName, out memberValue))
{
return memberValue;
}
}
if (members == null || !members.TryGetValue(memberName, out memberValue))
return null;
return null;
return memberValue;
}
/*
......@@ -737,12 +733,12 @@ namespace NLua
void SetMemberCache(ProxyType objType, string memberName, object member)
{
Dictionary<object, object> members = null;
object memberCacheValue = null;
Dictionary<object, object> members;
Dictionary<object, object> memberCacheValue;
if (memberCache.TryGetValue(objType, out memberCacheValue))
{
members = (Dictionary<object, object>)memberCacheValue;
members = memberCacheValue;
}
else
{
......@@ -807,7 +803,7 @@ namespace NLua
var args = setter.GetParameters();
var valueType = args[1].ParameterType;
// The new val ue the user specified
// The new value the user specified
object val = translator.GetAsType(luaState, 3, valueType);
var indexType = args[0].ParameterType;
object index = translator.GetAsType(luaState, 2, indexType);
......@@ -822,13 +818,11 @@ namespace NLua
else
translator.ThrowError(luaState, detailMessage); // Pass the original message from trySetMember because it is probably best
}
#if !SILVERLIGHT
}
catch (SEHException)
{
// If we are seeing a C++ exception - this must actually be for Lua's private use. Let it handle it
throw;
#endif
}
catch (Exception e)
{
......@@ -874,16 +868,14 @@ namespace NLua
{
var members = targetType.GetMember(fieldName, bindingType | BindingFlags.Public);
if (members.Length > 0)
{
member = members[0];
SetMemberCache(targetType, fieldName, member);
}
else
if (members.Length <= 0)
{
detailMessage = "field or property '" + fieldName + "' does not exist";
return false;
}
member = members[0];
SetMemberCache(targetType, fieldName, member);
}
if (member.MemberType == MemberTypes.Field)
......@@ -970,24 +962,22 @@ namespace NLua
private int GetClassMethodInternal(LuaState luaState)
{
ProxyType klass;
object obj = translator.GetRawNetObject(luaState, 1);
var klass = translator.GetRawNetObject(luaState, 1) as ProxyType;
if (obj == null || !(obj is ProxyType))
if (klass == null)
{
translator.ThrowError(luaState, "Trying to index an invalid type reference");
luaState.PushNil();
return 1;
}
klass = (ProxyType)obj;
if (luaState.IsNumber(2))
{
int size = (int)luaState.ToNumber(2);
translator.Push(luaState, Array.CreateInstance(klass.UnderlyingSystemType, size));
return 1;
}
string methodName = luaState.ToString(2);
if (string.IsNullOrEmpty(methodName))
......@@ -1014,17 +1004,14 @@ namespace NLua
private int SetClassFieldOrPropertyInternal(LuaState luaState)
{
ProxyType target;
object obj = translator.GetRawNetObject(luaState, 1);
var target = translator.GetRawNetObject(luaState, 1) as ProxyType;
if (obj == null || !(obj is ProxyType))
if (target == null)
{
translator.ThrowError(luaState, "trying to index an invalid type reference");
return 0;
}
target = (ProxyType)obj;
return SetMember(luaState, target, null, BindingFlags.Static);
}
......@@ -1044,9 +1031,9 @@ namespace NLua
int CallDelegateInternal(LuaState luaState)
{
object objDelegate = translator.GetRawNetObject(luaState, 1);
var del = translator.GetRawNetObject(luaState, 1) as Delegate;
if (objDelegate == null || !(objDelegate is Delegate))
if (del == null)
{
translator.ThrowError(luaState, "Trying to invoke a not delegate or callable value");
luaState.PushNil();
......@@ -1056,7 +1043,6 @@ namespace NLua
luaState.Remove(1);
var validDelegate = new MethodCache();
var del = (Delegate)objDelegate;
MethodBase methodDelegate = del.Method;
bool isOk = MatchParameters(luaState, methodDelegate, ref validDelegate);
......@@ -1097,18 +1083,16 @@ namespace NLua
private int CallConstructorInternal(LuaState luaState)
{
var validConstructor = new MethodCache();
ProxyType klass;
object obj = translator.GetRawNetObject(luaState, 1);
var klass = translator.GetRawNetObject(luaState, 1) as ProxyType;
if (obj == null || !(obj is ProxyType))
if (klass == null)
{
translator.ThrowError(luaState, "Trying to call constructor on an invalid type reference");
luaState.PushNil();
return 1;
}
klass = (ProxyType)obj;
var validConstructor = new MethodCache();
luaState.Remove(1);
ConstructorInfo[] constructors = klass.UnderlyingSystemType.GetConstructors();
......@@ -1117,23 +1101,23 @@ namespace NLua
{
bool isConstructor = MatchParameters(luaState, constructor, ref validConstructor);
if (isConstructor)
if (!isConstructor)
continue;
try
{
try
{
translator.Push(luaState, constructor.Invoke(validConstructor.args));
}
catch (TargetInvocationException e)
{
ThrowError(luaState, e);
luaState.PushNil();
}
catch
{
luaState.PushNil();
}
return 1;
translator.Push(luaState, constructor.Invoke(validConstructor.args));
}
catch (TargetInvocationException e)
{
ThrowError(luaState, e);
luaState.PushNil();
}
catch
{
luaState.PushNil();
}
return 1;
}
if (klass.UnderlyingSystemType.IsValueType)
......@@ -1215,14 +1199,15 @@ namespace NLua
return 1;
}
internal Array TableToArray(Func<int, object> luaParamValueExtractor, Type paramArrayType, int startIndex, int count)
internal Array TableToArray(LuaState luaState, ExtractValue extractValue, Type paramArrayType, ref int startIndex, int count)
{
Array paramArray;
if (count == 0)
return Array.CreateInstance(paramArrayType, 0);
var luaParamValue = luaParamValueExtractor(startIndex);
var luaParamValue = extractValue(luaState, startIndex);
startIndex++;
if (luaParamValue is LuaTable)
{
......@@ -1239,30 +1224,27 @@ namespace NLua
if (paramArrayType == typeof(object))
{
if (value != null && value.GetType() == typeof(double) && IsInteger((double)value))
if (value != null && value is double && IsInteger((double)value))
value = Convert.ToInt32((double)value);
}
#if SILVERLIGHT
paramArray.SetValue (Convert.ChangeType (value, paramArrayType, System.Globalization.CultureInfo.InvariantCulture), paramArrayIndex);
#else
paramArray.SetValue(Convert.ChangeType(value, paramArrayType), paramArrayIndex);
#endif
paramArrayIndex++;
}
}
else
{
paramArray = Array.CreateInstance(paramArrayType, count);
paramArray.SetValue(luaParamValue, 0);
for (int i = 1; i < count; i++)
{
startIndex++;
var value = luaParamValueExtractor(startIndex);
var value = extractValue(luaState, startIndex);
paramArray.SetValue(value, i);
startIndex++;
}
}
return paramArray;
......@@ -1298,19 +1280,14 @@ namespace NLua
int count = (nLuaParams - currentLuaParam) + 1;
Type paramArrayType = currentNetParam.ParameterType.GetElementType();
Func<int, object> extractDelegate = (currentParam) => {
currentLuaParam++;
return extractValue(luaState, currentParam);
};
Array paramArray = TableToArray(extractDelegate, paramArrayType, currentLuaParam, count);
Array paramArray = TableToArray(luaState, extractValue, paramArrayType, ref currentLuaParam, count);
paramList.Add(paramArray);
int index = paramList.LastIndexOf(paramArray);
var methodArg = new MethodArgs();
methodArg.index = index;
methodArg.extractValue = extractValue;
methodArg.isParamsArray = true;
methodArg.paramsArrayType = paramArrayType;
methodArg.Index = index;
methodArg.ExtractValue = extractValue;
methodArg.IsParamsArray = true;
methodArg.ParamsArrayType = paramArrayType;
argTypes.Add(methodArg);
}
......@@ -1330,8 +1307,8 @@ namespace NLua
paramList.Add(value);
int index = paramList.LastIndexOf(value);
var methodArg = new MethodArgs();
methodArg.index = index;
methodArg.extractValue = extractValue;
methodArg.Index = index;
methodArg.ExtractValue = extractValue;
argTypes.Add(methodArg);
if (currentNetParam.ParameterType.IsByRef)
......@@ -1386,59 +1363,28 @@ namespace NLua
private bool IsParamsArray(LuaState luaState, int nLuaParams, int currentLuaParam, ParameterInfo currentNetParam, out ExtractValue extractValue)
{
extractValue = null;
bool isParamArray = false;
if (currentNetParam.GetCustomAttributes(typeof(ParamArrayAttribute), false).Any())
{
isParamArray = nLuaParams < currentLuaParam;
LuaType luaType;
if (!currentNetParam.GetCustomAttributes(typeof(ParamArrayAttribute), false).Any())
return false;
try
{
luaType = luaState.Type(currentLuaParam);
}
catch (Exception ex)
{
Debug.WriteLine("Could not retrieve lua type while attempting to determine params Array Status.");
Debug.WriteLine(ex.Message);
extractValue = null;
return false;
}
bool isParamArray = nLuaParams < currentLuaParam;
if (luaType == LuaType.Table)
{
try
{
extractValue = translator.typeChecker.GetExtractor(typeof(LuaTable));
}
catch (Exception)
{
Debug.WriteLine("An error occurred during an attempt to retrieve a LuaTable extractor while checking for params array status.");
}
LuaType luaType = luaState.Type(currentLuaParam);
if (extractValue != null)
{
return true;
}
}
else
{
var paramElementType = currentNetParam.ParameterType.GetElementType();
if (luaType == LuaType.Table)
{
extractValue = translator.typeChecker.GetExtractor(typeof(LuaTable));
if (extractValue != null)
return true;
}
else
{
Type paramElementType = currentNetParam.ParameterType.GetElementType();
try
{
extractValue = translator.typeChecker.CheckLuaType(luaState, currentLuaParam, paramElementType);
}
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));
}
extractValue = translator.typeChecker.CheckLuaType(luaState, currentLuaParam, paramElementType);
if (extractValue != null)
{
return true;
}
}
if (extractValue != null)
return true;
}
return isParamArray;
}
......
......@@ -9,16 +9,16 @@ namespace NLua.Method
/// </summary>
class EventHandlerContainer : IDisposable
{
private Dictionary<Delegate, RegisterEventHandler> dict = new Dictionary<Delegate, RegisterEventHandler>();
private readonly Dictionary<Delegate, RegisterEventHandler> _dict = new Dictionary<Delegate, RegisterEventHandler>();
public void Add(Delegate handler, RegisterEventHandler eventInfo)
{
dict.Add(handler, eventInfo);
_dict.Add(handler, eventInfo);
}
public void Remove(Delegate handler)
{
bool found = dict.Remove(handler);
bool found = _dict.Remove(handler);
Debug.Assert(found);
}
......@@ -27,10 +27,10 @@ namespace NLua.Method
/// </summary>
public void Dispose()
{
foreach (KeyValuePair<Delegate, RegisterEventHandler> pair in dict)
foreach (KeyValuePair<Delegate, RegisterEventHandler> pair in _dict)
pair.Value.RemovePending(pair.Key);
dict.Clear();
_dict.Clear();
}
}
}
\ No newline at end of file
......@@ -2,12 +2,6 @@ using System;
namespace NLua.Method
{
/*
* Static helper methods for Lua tables acting as CLR objects.
*
* Author: Fabio Mascarenhas
* Version: 1.0
*/
public class LuaClassHelper
{
/*
......@@ -19,12 +13,11 @@ namespace NLua.Method
if (luaTable == null)
return null;
object funcObj = luaTable.RawGet(name);
var funcObj = luaTable.RawGet(name) as LuaFunction;
if (funcObj is LuaFunction)
return (LuaFunction)funcObj;
else
return null;
if (funcObj != null)
return funcObj;
return null;
}
/*
......
......@@ -2,13 +2,13 @@ namespace NLua.Method
{
public class LuaEventHandler
{
public LuaFunction handler = null;
public LuaFunction Handler = null;
// CP: Fix provided by Ben Bryant for delegates with one param
// link: http://luaforge.net/forum/message.php?msg_id=9318
public void HandleEvent(object[] args)
{
handler.Call(args);
Handler.Call(args);
}
}
}
\ No newline at end of file
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