fix gc issue

WaxPatch/WaxPatch/wax/wax_gc.m

@@ -48,6 +48,10 @@ + (void)cleanupUnusedObject {
             lua_rawset(L, -4); // Clear it!
             if(instanceUserdata->waxRetain) {
                 [instanceUserdata->instance release];
+<<<<<<< HEAD
+=======
+                instanceUserdata->waxRetain = NO; // fix gc bad exec
+>>>>>>> fix gc issue
             }
         }        
     }

WaxPatch/WaxPatch/wax/wax_instance.h

@@ -20,7 +20,11 @@ typedef struct _wax_instance_userdata {
     BOOL isClass;
     Class isSuper; // isSuper not only stores whether the class is a super, but it also contains the value of the next superClass.
 	BOOL actAsSuper; // It only acts like a super once, when it is called for the first time.
+<<<<<<< HEAD
     BOOL waxRetain; // retained by wax, release instance when wax_gc
+=======
+    BOOL waxRetain; // TODO: need release instance when gc
+>>>>>>> fix gc issue
 } wax_instance_userdata;
 
 int luaopen_wax_instance(lua_State *L);

WaxPatch/WaxPatch/wax/wax_instance.m

@@ -81,6 +81,7 @@ int luaopen_wax_instance(lua_State *L) {
     instanceUserdata->isClass = isClass;
     instanceUserdata->isSuper = nil;
 	instanceUserdata->actAsSuper = NO;
+    instanceUserdata->waxRetain = NO;
 
     if (!isClass) {
         //wax_log(LOG_GC, @"Retaining %@ for %@(%p -> %p)", isClass ? @"class" : @"instance", [instance class], instance, instanceUserdata);
@@ -129,6 +130,7 @@ int luaopen_wax_instance(lua_State *L) {
     superInstanceUserdata->instance = instanceUserdata->instance;
     superInstanceUserdata->isClass = instanceUserdata->isClass;
 	superInstanceUserdata->actAsSuper = YES;
+    superInstanceUserdata->waxRetain = NO;
 
 	// isSuper not only stores whether the class is a super, but it also contains the value of the next superClass
 	if (instanceUserdata->isSuper) {
@@ -218,7 +220,11 @@ BOOL wax_instance_pushFunction(lua_State *L, id self, SEL selector) {
     if (lua_isnil(L, -1)) {
         // TODO:
         // quick and dirty solution to let obj-c call directly into lua
+<<<<<<< HEAD
         // to avoid obj-c leak, we release instance when wax_gc
+=======
+        // cause a obj-c leak, should we release it later?
+>>>>>>> fix gc issue
         wax_instance_userdata *data = wax_instance_create(L, self, NO);
         data->waxRetain = YES;
 //        [self release];