sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lua/LuaInstance: Add support for multi-arg conversion 

Allows to convert 3 numbers to a single Vector3 argument (Yup, I'm
working on it)


Former-commit-id: 56766e8b3821c7c4aa44036306c6bcbe658554bb
This commit is contained in:
Lynix 2015-12-10 23:51:19 +01:00
parent f8f3dbd696
commit bfabf0cd5e
2 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Lua/LuaInstance.hpp
View File

@ -42,8 +42,8 @@ namespace Nz
bool Call(unsigned int argCount); bool Call(unsigned int argCount);
bool Call(unsigned int argCount, unsigned int resultCount); bool Call(unsigned int argCount, unsigned int resultCount);
template<typename T> T Check(int index); template<typename T> T Check(unsigned int* index);
template<typename T> T Check(int index, T defValue); template<typename T> T Check(unsigned int* index, T defValue);
void CheckAny(int index) const; void CheckAny(int index) const;
bool CheckBoolean(int index) const; bool CheckBoolean(int index) const;
bool CheckBoolean(int index, bool defValue) const; bool CheckBoolean(int index, bool defValue) const;

84
include/Nazara/Lua/LuaInstance.inl
View File

@ -9,124 +9,124 @@
namespace Nz namespace Nz
{ {
// Functions args // Functions args
inline bool LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<bool>) inline bool LuaImplQueryArg(LuaInstance& instance, unsigned int* index, TypeTag<bool>)
{ {
return instance.CheckBoolean(index); return instance.CheckBoolean((*index)++);
} }
inline bool LuaImplQueryArg(LuaInstance& instance, unsigned int index, bool defValue, TypeTag<bool>) inline bool LuaImplQueryArg(LuaInstance& instance, unsigned int* index, bool defValue, TypeTag<bool>)
{ {
return instance.CheckBoolean(index, defValue); return instance.CheckBoolean((*index)++, defValue);
} }
inline double LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<double>) inline double LuaImplQueryArg(LuaInstance& instance, unsigned int* index, TypeTag<double>)
{ {
return instance.CheckNumber(index); return instance.CheckNumber((*index)++);
} }
inline double LuaImplQueryArg(LuaInstance& instance, unsigned int index, double defValue, TypeTag<double>) inline double LuaImplQueryArg(LuaInstance& instance, unsigned int* index, double defValue, TypeTag<double>)
{ {
return instance.CheckNumber(index, defValue); return instance.CheckNumber((*index)++, defValue);
} }
inline float LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<float>) inline float LuaImplQueryArg(LuaInstance& instance, unsigned int* index, TypeTag<float>)
{ {
return static_cast<float>(instance.CheckNumber(index)); return static_cast<float>(instance.CheckNumber((*index)++));
} }
inline float LuaImplQueryArg(LuaInstance& instance, unsigned int index, float defValue, TypeTag<float>) inline float LuaImplQueryArg(LuaInstance& instance, unsigned int* index, float defValue, TypeTag<float>)
{ {
return static_cast<float>(instance.CheckNumber(index, defValue)); return static_cast<float>(instance.CheckNumber((*index)++, defValue));
} }
template<typename T> template<typename T>
std::enable_if_t<std::is_enum<T>::value, T> LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<T>) std::enable_if_t<std::is_enum<T>::value, T> LuaImplQueryArg(LuaInstance& instance, unsigned int* index, TypeTag<T>)
{ {
return static_cast<T>(LuaImplQueryArg(instance, index, TypeTag<typename std::underlying_type<T>::type>())); return static_cast<T>(LuaImplQueryArg(instance, index, TypeTag<typename std::underlying_type<T>::type>()));
} }
template<typename T> template<typename T>
std::enable_if_t<std::is_enum<T>::value, T> LuaImplQueryArg(LuaInstance& instance, unsigned int index, T defValue, TypeTag<T>) std::enable_if_t<std::is_enum<T>::value, T> LuaImplQueryArg(LuaInstance& instance, unsigned int* index, T defValue, TypeTag<T>)
{ {
using UnderlyingT = std::underlying_type_t<T>; using UnderlyingT = std::underlying_type_t<T>;
return static_cast<T>(LuaImplQueryArg(instance, index, static_cast<UnderlyingT>(defValue), TypeTag<UnderlyingT>())); return static_cast<T>(LuaImplQueryArg(instance, index, static_cast<UnderlyingT>(defValue), TypeTag<UnderlyingT>()));
} }
template<typename T> template<typename T>
std::enable_if_t<std::is_integral<T>::value && !std::is_unsigned<T>::value, T> LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<T>) std::enable_if_t<std::is_integral<T>::value && !std::is_unsigned<T>::value, T> LuaImplQueryArg(LuaInstance& instance, unsigned int* index, TypeTag<T>)
{ {
return static_cast<T>(instance.CheckInteger(index)); return static_cast<T>(instance.CheckInteger((*index)++));
} }
template<typename T> template<typename T>
std::enable_if_t<std::is_integral<T>::value && !std::is_unsigned<T>::value, T> LuaImplQueryArg(LuaInstance& instance, unsigned int index, T defValue, TypeTag<T>) std::enable_if_t<std::is_integral<T>::value && !std::is_unsigned<T>::value, T> LuaImplQueryArg(LuaInstance& instance, unsigned int* index, T defValue, TypeTag<T>)
{ {
return static_cast<T>(instance.CheckInteger(index, defValue)); return static_cast<T>(instance.CheckInteger((*index)++, defValue));
} }
template<typename T> template<typename T>
std::enable_if_t<std::is_unsigned<T>::value, T> LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<T>) std::enable_if_t<std::is_unsigned<T>::value, T> LuaImplQueryArg(LuaInstance& instance, unsigned int* index, TypeTag<T>)
{ {
using SignedT = std::make_signed_t<T>; using SignedT = std::make_signed_t<T>;
return static_cast<T>(LuaImplQueryArg(instance, index, TypeTag<SignedT>())); return static_cast<T>(LuaImplQueryArg(instance, index, TypeTag<SignedT>()));
} }
template<typename T> template<typename T>
std::enable_if_t<std::is_unsigned<T>::value, T> LuaImplQueryArg(LuaInstance& instance, unsigned int index, T defValue, TypeTag<T>) std::enable_if_t<std::is_unsigned<T>::value, T> LuaImplQueryArg(LuaInstance& instance, unsigned int* index, T defValue, TypeTag<T>)
{ {
using SignedT = std::make_signed_t<T>; using SignedT = std::make_signed_t<T>;
return static_cast<T>(LuaImplQueryArg(instance, index, static_cast<SignedT>(defValue), TypeTag<SignedT>())); return static_cast<T>(LuaImplQueryArg(instance, index, static_cast<SignedT>(defValue), TypeTag<SignedT>()));
} }
inline std::string LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<std::string>) inline std::string LuaImplQueryArg(LuaInstance& instance, unsigned int* index, TypeTag<std::string>)
{ {
std::size_t strLength = 0; std::size_t strLength = 0;
const char* str = instance.CheckString(index, &strLength); const char* str = instance.CheckString((*index)++, &strLength);
return std::string(str, strLength); return std::string(str, strLength);
} }
inline std::string LuaImplQueryArg(LuaInstance& instance, unsigned int index, const std::string& defValue, TypeTag<std::string>) inline std::string LuaImplQueryArg(LuaInstance& instance, unsigned int* index, const std::string& defValue, TypeTag<std::string>)
{ {
std::size_t strLength = 0; std::size_t strLength = 0;
const char* str = instance.CheckString(index, defValue.c_str(), &strLength); const char* str = instance.CheckString((*index)++, defValue.c_str(), &strLength);
return std::string(str, strLength); return std::string(str, strLength);
} }
inline String LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<String>) inline String LuaImplQueryArg(LuaInstance& instance, unsigned int* index, TypeTag<String>)
{ {
std::size_t strLength = 0; std::size_t strLength = 0;
const char* str = instance.CheckString(index, &strLength); const char* str = instance.CheckString((*index)++, &strLength);
return String(str, strLength); return String(str, strLength);
} }
inline String LuaImplQueryArg(LuaInstance& instance, unsigned int index, const String& defValue, TypeTag<String>) inline String LuaImplQueryArg(LuaInstance& instance, unsigned int* index, const String& defValue, TypeTag<String>)
{ {
std::size_t strLength = 0; std::size_t strLength = 0;
const char* str = instance.CheckString(index, defValue.GetConstBuffer(), &strLength); const char* str = instance.CheckString((*index)++, defValue.GetConstBuffer(), &strLength);
return String(str, strLength); return String(str, strLength);
} }
template<typename T> template<typename T>
T LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<const T&>) T LuaImplQueryArg(LuaInstance& instance, unsigned int* index, TypeTag<const T&>)
{ {
return LuaImplQueryArg(instance, index, TypeTag<T>()); return LuaImplQueryArg(instance, index, TypeTag<T>());
} }
template<typename T> template<typename T>
T LuaImplQueryArg(LuaInstance& instance, unsigned int index, const T& defValue, TypeTag<T> tag) T LuaImplQueryArg(LuaInstance& instance, unsigned int* index, const T& defValue, TypeTag<T> tag)
{ {
if (instance.IsValid(index)) if (instance.IsValid(*index))
return LuaImplQueryArg(instance, index, tag); return LuaImplQueryArg(instance, index, tag);
else else
return defValue; return defValue;
} }
template<typename T> template<typename T>
T LuaImplQueryArg(LuaInstance& instance, unsigned int index, const T& defValue, TypeTag<const T&>) T LuaImplQueryArg(LuaInstance& instance, unsigned int* index, const T& defValue, TypeTag<const T&>)
{ {
return LuaImplQueryArg(instance, index, defValue, TypeTag<T>()); return LuaImplQueryArg(instance, index, defValue, TypeTag<T>());
} }
@ -203,9 +203,9 @@ namespace Nz
struct LuaImplArgProcesser<true> struct LuaImplArgProcesser<true>
{ {
template<std::size_t N, std::size_t FirstDefArg, typename ArgType, typename ArgContainer, typename DefArgContainer> template<std::size_t N, std::size_t FirstDefArg, typename ArgType, typename ArgContainer, typename DefArgContainer>
static void Process(LuaInstance& instance, ArgContainer& args, DefArgContainer& defArgs) static void Process(LuaInstance& instance, unsigned int* argIndex, ArgContainer& args, DefArgContainer& defArgs)
{ {
std::get<N>(args) = std::move(LuaImplQueryArg(instance, N + 1, std::get<std::tuple_size<DefArgContainer>() - N + FirstDefArg - 1>(defArgs), TypeTag<ArgType>())); std::get<N>(args) = std::move(LuaImplQueryArg(instance, argIndex, std::get<std::tuple_size<DefArgContainer>() - N + FirstDefArg - 1>(defArgs), TypeTag<ArgType>()));
} }
}; };
@ -213,11 +213,11 @@ namespace Nz
struct LuaImplArgProcesser<false> struct LuaImplArgProcesser<false>
{ {
template<std::size_t N, std::size_t FirstDefArg, typename ArgType, typename ArgContainer, typename DefArgContainer> template<std::size_t N, std::size_t FirstDefArg, typename ArgType, typename ArgContainer, typename DefArgContainer>
static void Process(LuaInstance& instance, ArgContainer& args, DefArgContainer& defArgs) static void Process(LuaInstance& instance, unsigned int* argIndex, ArgContainer& args, DefArgContainer& defArgs)
{ {
NazaraUnused(defArgs); NazaraUnused(defArgs);
std::get<N>(args) = std::move(LuaImplQueryArg(instance, N + 1, TypeTag<ArgType>())); std::get<N>(args) = std::move(LuaImplQueryArg(instance, argIndex, TypeTag<ArgType>()));
} }
}; };
@ -244,6 +244,7 @@ namespace Nz
void ProcessArgs() void ProcessArgs()
{ {
m_index = 1;
ProcessArgs<0, Args...>(); ProcessArgs<0, Args...>();
} }
@ -272,7 +273,7 @@ namespace Nz
template<std::size_t N, typename ArgType> template<std::size_t N, typename ArgType>
void ProcessArgs() void ProcessArgs()
{ {
LuaImplArgProcesser<(N >= FirstDefArg)>::template Process<N, FirstDefArg, ArgType>(m_instance, m_args, m_defaultArgs); LuaImplArgProcesser<(N >= FirstDefArg)>::template Process<N, FirstDefArg, ArgType>(m_instance, &m_index, m_args, m_defaultArgs);
} }
template<std::size_t N, typename ArgType1, typename ArgType2, typename... Rest> template<std::size_t N, typename ArgType1, typename ArgType2, typename... Rest>
@ -285,6 +286,7 @@ namespace Nz
ArgContainer m_args; ArgContainer m_args;
DefArgContainer m_defaultArgs; DefArgContainer m_defaultArgs;
LuaInstance& m_instance; LuaInstance& m_instance;
unsigned int m_index;
}; };
}; };
@ -312,6 +314,7 @@ namespace Nz
void ProcessArgs() void ProcessArgs()
{ {
m_index = 1;
ProcessArgs<0, Args...>(); ProcessArgs<0, Args...>();
} }
@ -354,7 +357,7 @@ namespace Nz
template<std::size_t N, typename ArgType> template<std::size_t N, typename ArgType>
void ProcessArgs() void ProcessArgs()
{ {
LuaImplArgProcesser<(N >= FirstDefArg)>::template Process<N, FirstDefArg, ArgType>(m_instance, m_args, m_defaultArgs); LuaImplArgProcesser<(N >= FirstDefArg)>::template Process<N, FirstDefArg, ArgType>(m_instance, &m_index, m_args, m_defaultArgs);
} }
template<std::size_t N, typename ArgType1, typename ArgType2, typename... Rest> template<std::size_t N, typename ArgType1, typename ArgType2, typename... Rest>
@ -368,17 +371,18 @@ namespace Nz
DefArgContainer m_defaultArgs; DefArgContainer m_defaultArgs;
LuaInstance& m_instance; LuaInstance& m_instance;
T& m_object; T& m_object;
unsigned int m_index;
}; };
}; };
template<typename T> template<typename T>
T LuaInstance::Check(int index) T LuaInstance::Check(unsigned int* index)
{ {
return LuaImplQueryArg(*this, index, TypeTag<T>()); return LuaImplQueryArg(*this, index, TypeTag<T>());
} }
template<typename T> template<typename T>
T LuaInstance::Check(int index, T defValue) T LuaInstance::Check(unsigned int* index, T defValue)
{ {
return LuaImplQueryArg(*this, index, defValue, TypeTag<T>()); return LuaImplQueryArg(*this, index, defValue, TypeTag<T>());
} }