diff --git a/include/Nazara/Lua/Enums.hpp b/include/Nazara/Lua/Enums.hpp index 9faa7d2ea..93068314f 100644 --- a/include/Nazara/Lua/Enums.hpp +++ b/include/Nazara/Lua/Enums.hpp @@ -7,49 +7,60 @@ #ifndef NAZARA_ENUMS_LUA_HPP #define NAZARA_ENUMS_LUA_HPP -enum LuaComparison +namespace Nz { - LuaComparison_Equality, - LuaComparison_Less, - LuaComparison_LessOrEqual, + enum LuaBindMode + { + LuaBindMode_Table, + LuaBindMode_Userdata, - LuaComparison_Max = LuaComparison_LessOrEqual -}; + LuaBindMode_Max = LuaBindMode_Userdata + }; -enum LuaOperation -{ - LuaOperation_Addition, - LuaOperation_BitwiseAnd, - LuaOperation_BitwiseLeftShift, - LuaOperation_BitwiseNot, - LuaOperation_BitwiseOr, - LuaOperation_BitwideRightShift, - LuaOperation_BitwiseXOr, - LuaOperation_Division, - LuaOperation_Exponentiation, - LuaOperation_FloorDivision, - LuaOperation_Modulo, - LuaOperation_Multiplication, - LuaOperation_Negation, - LuaOperation_Substraction, + enum LuaComparison + { + LuaComparison_Equality, + LuaComparison_Less, + LuaComparison_LessOrEqual, - LuaOperation_Max = LuaOperation_Substraction -}; + LuaComparison_Max = LuaComparison_LessOrEqual + }; -enum LuaType -{ - LuaType_Boolean, - LuaType_Function, - LuaType_LightUserdata, - LuaType_Nil, - LuaType_Number, - LuaType_None, - LuaType_String, - LuaType_Table, - LuaType_Thread, - LuaType_Userdata, + enum LuaOperation + { + LuaOperation_Addition, + LuaOperation_BitwiseAnd, + LuaOperation_BitwiseLeftShift, + LuaOperation_BitwiseNot, + LuaOperation_BitwiseOr, + LuaOperation_BitwideRightShift, + LuaOperation_BitwiseXOr, + LuaOperation_Division, + LuaOperation_Exponentiation, + LuaOperation_FloorDivision, + LuaOperation_Modulo, + LuaOperation_Multiplication, + LuaOperation_Negation, + LuaOperation_Substraction, - LuaType_Max = LuaType_Userdata -}; + LuaOperation_Max = LuaOperation_Substraction + }; + + enum LuaType + { + LuaType_Boolean, + LuaType_Function, + LuaType_LightUserdata, + LuaType_Nil, + LuaType_Number, + LuaType_None, + LuaType_String, + LuaType_Table, + LuaType_Thread, + LuaType_Userdata, + + LuaType_Max = LuaType_Userdata + }; +} #endif // NAZARA_ENUMS_LUA_HPP diff --git a/include/Nazara/Lua/LuaInstance.inl b/include/Nazara/Lua/LuaInstance.inl index 57da097bc..c2153a4e1 100644 --- a/include/Nazara/Lua/LuaInstance.inl +++ b/include/Nazara/Lua/LuaInstance.inl @@ -8,17 +8,17 @@ namespace Nz { // Functions args - bool LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) + inline bool LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) { return instance.CheckBoolean(index); } - double LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) + inline double LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) { return instance.CheckNumber(index); } - float LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) + inline float LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) { return static_cast(instance.CheckNumber(index)); } @@ -41,7 +41,7 @@ namespace Nz return static_cast(LuaImplQueryArg(instance, index, TypeTag::type>())); } - std::string LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) + inline std::string LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) { std::size_t strLength = 0; const char* str = instance.CheckString(index, &strLength); @@ -49,7 +49,7 @@ namespace Nz return std::string(str, strLength); } - String LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) + inline String LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) { std::size_t strLength = 0; const char* str = instance.CheckString(index, &strLength); @@ -64,19 +64,19 @@ namespace Nz } // Function returns - int LuaImplReplyVal(LuaInstance& instance, bool val, TypeTag) + inline int LuaImplReplyVal(LuaInstance& instance, bool val, TypeTag) { instance.PushBoolean(val); return 1; } - int LuaImplReplyVal(LuaInstance& instance, double val, TypeTag) + inline int LuaImplReplyVal(LuaInstance& instance, double val, TypeTag) { instance.PushNumber(val); return 1; } - int LuaImplReplyVal(LuaInstance& instance, float val, TypeTag) + inline int LuaImplReplyVal(LuaInstance& instance, float val, TypeTag) { instance.PushNumber(val); return 1; @@ -105,13 +105,13 @@ namespace Nz return LuaImplReplyVal(instance, static_cast(val), TypeTag()); } - int LuaImplReplyVal(LuaInstance& instance, std::string val, TypeTag) + inline int LuaImplReplyVal(LuaInstance& instance, std::string val, TypeTag) { instance.PushString(val.c_str(), val.size()); return 1; } - int LuaImplReplyVal(LuaInstance& instance, String val, TypeTag) + inline int LuaImplReplyVal(LuaInstance& instance, String val, TypeTag) { instance.PushString(std::move(val)); return 1;