Partially revert/rewrite 39b4231 (#511)

Author: Foereaper

ElunaTemplate.cpp

@@ -50,38 +50,3 @@ ElunaConstrainedObjectRef<Vehicle> GetWeakPtrFor(Vehicle const* obj)
 }
 #endif
 #endif
-
-template<> inline int ElunaTemplate<unsigned long long>::Add(lua_State* L) { return ElunaTemplateHelper<unsigned long long>::PerformOp(L, std::plus()); }
-template<> inline int ElunaTemplate<unsigned long long>::Subtract(lua_State* L) { return ElunaTemplateHelper<unsigned long long>::PerformOp(L, std::minus()); }
-template<> inline int ElunaTemplate<unsigned long long>::Multiply(lua_State* L) { return ElunaTemplateHelper<unsigned long long>::PerformOp(L, std::multiplies()); }
-template<> inline int ElunaTemplate<unsigned long long>::Divide(lua_State* L) { return ElunaTemplateHelper<unsigned long long>::PerformOp(L, std::divides()); }
-template<> inline int ElunaTemplate<unsigned long long>::Mod(lua_State* L) { return ElunaTemplateHelper<unsigned long long>::PerformOp(L, std::modulus()); }
-template<> inline int ElunaTemplate<unsigned long long>::Equal(lua_State* L) { return ElunaTemplateHelper<unsigned long long>::PerformOp(L, std::equal_to()); }
-template<> inline int ElunaTemplate<unsigned long long>::Less(lua_State* L) { return ElunaTemplateHelper<unsigned long long>::PerformOp(L, std::less()); }
-template<> inline int ElunaTemplate<unsigned long long>::LessOrEqual(lua_State* L) { return ElunaTemplateHelper<unsigned long long>::PerformOp(L, std::less_equal()); }
-template<> inline int ElunaTemplate<unsigned long long>::ToString(lua_State* L) { return ElunaTemplateHelper<unsigned long long>::ToString(L); }
-template<> inline int ElunaTemplate<unsigned long long>::Pow(lua_State* L) { return ElunaTemplateHelper<unsigned long long>::Pow(L); }
-
-template<> inline int ElunaTemplate<long long>::Add(lua_State* L) { return ElunaTemplateHelper<long long>::PerformOp(L, std::plus()); }
-template<> inline int ElunaTemplate<long long>::Subtract(lua_State* L) { return ElunaTemplateHelper<long long>::PerformOp(L, std::minus()); }
-template<> inline int ElunaTemplate<long long>::Multiply(lua_State* L) { return ElunaTemplateHelper<long long>::PerformOp(L, std::multiplies()); }
-template<> inline int ElunaTemplate<long long>::Divide(lua_State* L) { return ElunaTemplateHelper<long long>::PerformOp(L, std::divides()); }
-template<> inline int ElunaTemplate<long long>::Mod(lua_State* L) { return ElunaTemplateHelper<long long>::PerformOp(L, std::modulus()); }
-template<> inline int ElunaTemplate<long long>::UnaryMinus(lua_State* L) { return ElunaTemplateHelper<long long>::PerformOp(L, std::negate()); }
-template<> inline int ElunaTemplate<long long>::Equal(lua_State* L) { return ElunaTemplateHelper<long long>::PerformOp(L, std::equal_to()); }
-template<> inline int ElunaTemplate<long long>::Less(lua_State* L) { return ElunaTemplateHelper<long long>::PerformOp(L, std::less()); }
-template<> inline int ElunaTemplate<long long>::LessOrEqual(lua_State* L) { return ElunaTemplateHelper<long long>::PerformOp(L, std::less_equal()); }
-template<> inline int ElunaTemplate<long long>::ToString(lua_State* L) { return ElunaTemplateHelper<long long>::ToString(L); }
-template<> inline int ElunaTemplate<long long>::Pow(lua_State* L) { return ElunaTemplateHelper<long long>::Pow(L); }
-
-template<> inline int ElunaTemplate<ObjectGuid>::Equal(lua_State* L) { Eluna* E = Eluna::GetEluna(L); E->Push(E->CHECKVAL<ObjectGuid>(1) == E->CHECKVAL<ObjectGuid>(2)); return 1; }
-template<> inline int ElunaTemplate<ObjectGuid>::ToString(lua_State* L)
-{
-    Eluna* E = Eluna::GetEluna(L);
-#if defined ELUNA_TRINITY
-    E->Push(E->CHECKVAL<ObjectGuid>(1).ToString());
-#else
-    E->Push(E->CHECKVAL<ObjectGuid>(1).GetString());
-#endif
-    return 1;
-}

ElunaTemplate.h

@@ -141,6 +141,18 @@ class ElunaObjectValueImpl : public ElunaObject
     T _obj;
 };
 
+#define ELUNA_MATH_OP(type, func, op) \
+template<> \
+static int ElunaTemplate<type>::func(lua_State* L) { \
+    return ElunaTemplateHelper<type>::PerformOp(L, std::op()); \
+}
+
+#define ELUNA_SIMPLE_FORWARD(type, func) \
+template<> \
+static int ElunaTemplate<type>::func(lua_State* L) { \
+    return ElunaTemplateHelper<type>::func(L); \
+}
+
 #define MAKE_ELUNA_OBJECT_VALUE_IMPL(type) \
 template <> \
 class ElunaObjectImpl<type> : public ElunaObjectValueImpl<type> \

methods/Methods.cpp

@@ -33,6 +33,47 @@
 #include "BattleGroundMethods.h"
 #include "CustomMethodsInterface.h"
 
+ELUNA_MATH_OP(unsigned long long, Add, plus)
+ELUNA_MATH_OP(unsigned long long, Subtract, minus)
+ELUNA_MATH_OP(unsigned long long, Multiply, multiplies)
+ELUNA_MATH_OP(unsigned long long, Divide, divides)
+ELUNA_MATH_OP(unsigned long long, Mod, modulus)
+ELUNA_MATH_OP(unsigned long long, Equal, equal_to)
+ELUNA_MATH_OP(unsigned long long, Less, less)
+ELUNA_MATH_OP(unsigned long long, LessOrEqual, less_equal)
+ELUNA_SIMPLE_FORWARD(unsigned long long, ToString)
+ELUNA_SIMPLE_FORWARD(unsigned long long, Pow)
+
+ELUNA_MATH_OP(long long, Add, plus)
+ELUNA_MATH_OP(long long, Subtract, minus)
+ELUNA_MATH_OP(long long, Multiply, multiplies)
+ELUNA_MATH_OP(long long, Divide, divides)
+ELUNA_MATH_OP(long long, Mod, modulus)
+ELUNA_MATH_OP(long long, UnaryMinus, negate)
+ELUNA_MATH_OP(long long, Equal, equal_to)
+ELUNA_MATH_OP(long long, Less, less)
+ELUNA_MATH_OP(long long, LessOrEqual, less_equal)
+ELUNA_SIMPLE_FORWARD(long long, ToString)
+ELUNA_SIMPLE_FORWARD(long long, Pow)
+
+template<> int ElunaTemplate<ObjectGuid>::Equal(lua_State* L)
+{
+    Eluna* E = Eluna::GetEluna(L);
+    E->Push(E->CHECKVAL<ObjectGuid>(1) == E->CHECKVAL<ObjectGuid>(2));
+    return 1;
+}
+
+template<> int ElunaTemplate<ObjectGuid>::ToString(lua_State* L)
+{
+    Eluna* E = Eluna::GetEluna(L);
+#if defined ELUNA_TRINITY
+    E->Push(E->CHECKVAL<ObjectGuid>(1).ToString());
+#else
+    E->Push(E->CHECKVAL<ObjectGuid>(1).GetString());
+#endif
+    return 1;
+}
+
 void RegisterMethods(Eluna* E)
 {
     ElunaTemplate<>::SetMethods(E, LuaGlobalFunctions::GlobalMethods);