Got LuaObjects working again, and in a quite better shape I would add.

1 files changed, 145 insertions, 0 deletions

diff --git a/tests/test-Lua.cc b/tests/test-Lua.cc
index 8ba3785..39ccbee 100644
--- a/tests/test-Lua.cc
+++ b/tests/test-Lua.cc
@@ -3,6 +3,107 @@
 
 using namespace Balau;
 
+static int objGotDestroyed = 0;
+
+static int callCount = 0;
+
+class ObjectTest {
+  public:
+      ObjectTest() { Printer::log(M_DEBUG, "ObjectTest at %p created.", this); }
+      ~ObjectTest() { Printer::log(M_DEBUG, "ObjectTest at %p destroyed.", this); objGotDestroyed++; }
+    void someMethod1() { Printer::log(M_DEBUG, "ObjectTest::someMethod1() called on %p.", this); callCount++; }
+    int someMethod2(int p) { Printer::log(M_DEBUG, "ObjectTest::someMethod2() called on %p.", this); callCount++; return p * 2; }
+    static void someFunction() { Printer::log(M_DEBUG, "ObjectTest::someFunction() called."); callCount++; }
+};
+
+enum ObjectTest_methods_t {
+    OBJECTTEST_SOMEMETHOD1,
+    OBJECTTEST_SOMEMETHOD2,
+};
+
+enum ObjectTest_functions_t {
+    OBJECTTEST_CREATEOBJECTTEST,
+    OBJECTTEST_SOMEFUNCTION,
+};
+
+struct lua_functypes_t ObjectTest_methods[] = {
+    { OBJECTTEST_SOMEMETHOD1,           "someMethod1",          0, 0, { } },
+    { OBJECTTEST_SOMEMETHOD2,           "someMethod2",          1, 1, { BLUA_NUMBER } },
+    { -1, 0, 0, 0, 0 },
+};
+
+struct lua_functypes_t ObjectTest_functions[] = {
+    { OBJECTTEST_CREATEOBJECTTEST,      "createObjectTest",     0, 0, { } },
+    { OBJECTTEST_SOMEFUNCTION,          "ObjectTestFunction",   0, 0, { } },
+    { -1, 0, 0, 0, 0 },
+};
+
+class sLua_ObjectTest {
+  public:
+    DECLARE_METHOD(ObjectTest, OBJECTTEST_SOMEMETHOD1);
+    DECLARE_METHOD(ObjectTest, OBJECTTEST_SOMEMETHOD2);
+
+    DECLARE_FUNCTION(ObjectTest, OBJECTTEST_CREATEOBJECTTEST);
+    DECLARE_FUNCTION(ObjectTest, OBJECTTEST_SOMEFUNCTION);
+  private:
+    static int ObjectTest_proceed(Lua & L, int n, ObjectTest * obj, int caller);
+    static int ObjectTest_proceed_statics(Lua & L, int n, int caller);
+};
+
+class LuaObjectTestFactory : public LuaObjectFactory {
+  public:
+      LuaObjectTestFactory(ObjectTest * obj) : m_obj(obj) { }
+    static void pushStatics(Lua & L) {
+        CHECK_METHODS(ObjectTest);
+        CHECK_FUNCTIONS(ObjectTest);
+
+        PUSH_FUNCTION(ObjectTest, OBJECTTEST_CREATEOBJECTTEST);
+        PUSH_FUNCTION(ObjectTest, OBJECTTEST_SOMEFUNCTION);
+    }
+  private:
+    void pushObjectAndMembers(Lua & L) {
+        pushObj(L, m_obj, "ObjectTest");
+
+        PUSH_METHOD(ObjectTest, OBJECTTEST_SOMEMETHOD1);
+        PUSH_METHOD(ObjectTest, OBJECTTEST_SOMEMETHOD2);
+    }
+    ObjectTest * m_obj;
+};
+
+int sLua_ObjectTest::ObjectTest_proceed(Lua & L, int n, ObjectTest * obj, int caller) {
+    switch (caller) {
+    case OBJECTTEST_SOMEMETHOD1:
+        obj->someMethod1();
+        break;
+
+    case OBJECTTEST_SOMEMETHOD2:
+        L.push((lua_Number) obj->someMethod2(L.tonumber(-1)));
+        return 1;
+        break;
+    }
+
+    return 0;
+}
+
+int sLua_ObjectTest::ObjectTest_proceed_statics(Lua & L, int n, int caller) {
+    switch (caller) {
+    case OBJECTTEST_CREATEOBJECTTEST:
+        {
+            ObjectTest * ot = new ObjectTest;
+            LuaObjectTestFactory factory(ot);
+            factory.pushDestruct(L);
+        }
+        return 1;
+        break;
+
+    case OBJECTTEST_SOMEFUNCTION:
+        ObjectTest::someFunction();
+        break;
+    }
+
+    return 0;
+}
+
 void MainTask::Do() {
     Printer::log(M_STATUS, "Test::Lua running.");
 
@@ -18,6 +119,9 @@ void MainTask::Do() {
     L.open_debug();
     L.open_bit();
     L.open_jit();
+    L.open_ffi();
+
+    LuaObjectTestFactory::pushStatics(L);
 
     TAssert(L.gettop() == 0);
     L.load("return 42");
@@ -27,5 +131,46 @@ void MainTask::Do() {
     L.pop();
     TAssert(L.gettop() == 0);
 
+    L.push("obj");
+    {
+        ObjectTest * ot = new ObjectTest;
+        LuaObjectTestFactory factory(ot);
+        factory.pushDestruct(L);
+    }
+    L.settable(LUA_GLOBALSINDEX);
+
+    L.load("return type(obj)");
+    TAssert(L.gettop() == 1);
+    String t = L.tostring();
+    TAssert(t == "table");
+    L.pop();
+
+    TAssert(callCount == 0);
+
+    L.load("obj:someMethod1()");
+    TAssert(L.gettop() == 0);
+
+    TAssert(callCount == 1);
+
+    L.load("return obj:someMethod2(21)");
+    TAssert(L.gettop() == 1);
+    TAssert(L.tonumber() == 42);
+    L.pop();
+
+    TAssert(callCount == 2);
+
+    L.load("ObjectTestFunction()");
+    TAssert(L.gettop() == 0);
+
+    TAssert(callCount == 3);
+
+    TAssert(objGotDestroyed == 0);
+    L.load("obj2 = createObjectTest() obj2:destroy()");
+    TAssert(objGotDestroyed == 1);
+    L.load("createObjectTest() collectgarbage('collect')");
+    TAssert(objGotDestroyed == 2);
+    L.close();
+    TAssert(objGotDestroyed == 3);
+
     Printer::log(M_STATUS, "Test::Lua passed.");
 }