修改wax的pod spec，增加xml2和sqlite3的支持；

lib/extensions/json/wax_json.c

@@ -31,11 +31,11 @@ int luaopen_wax_json(lua_State *L) {
     return 0;
 }
 
-#include "yajl/yajl_parse.h"
+#include "yajl/api/yajl_parse.h"
 #include "yajl/yajl_lex.h"
 #include "yajl/yajl_parser.h"
 #include "yajl/yajl_bytestack.h"
-#include "yajl/yajl_gen.h"
+#include "yajl/api/yajl_gen.h"
 #include <string.h>
 
 static yajl_gen gen;

lib/extensions/json/yajl/yajl_alloc.h

@@ -39,7 +39,7 @@
 #ifndef __YAJL_ALLOC_H__
 #define __YAJL_ALLOC_H__
 
-#include "api/yajl_common.h"
+#include "yajl_common.h"
 
 #define YA_MALLOC(afs, sz) (afs)->malloc((afs)->ctx, (sz))
 #define YA_FREE(afs, ptr) (afs)->free((afs)->ctx, (ptr))

lib/extensions/json/yajl/yajl_buf.h

@@ -33,7 +33,7 @@
 #ifndef __YAJL_BUF_H__
 #define __YAJL_BUF_H__
 
-#include "api/yajl_common.h"
+#include "yajl_common.h"
 #include "yajl_alloc.h"
 
 /*

lib/extensions/json/yajl/yajl_bytestack.h

@@ -38,7 +38,7 @@
 #ifndef __YAJL_BYTESTACK_H__
 #define __YAJL_BYTESTACK_H__
 
-#include "api/yajl_common.h"
+#include "yajl_common.h"
 
 #define YAJL_BS_INC 128
 

lib/extensions/json/yajl/yajl_encode.h

@@ -34,7 +34,7 @@
 #define __YAJL_ENCODE_H__
 
 #include "yajl_buf.h"
-#include "api/yajl_gen.h"
+#include "yajl_gen.h"
 
 void yajl_string_encode2(const yajl_print_t printer,
                          void * ctx,

lib/extensions/json/yajl/yajl_lex.h

@@ -33,7 +33,7 @@
 #ifndef __YAJL_LEX_H__
 #define __YAJL_LEX_H__
 
-#include "api/yajl_common.h"
+#include "yajl_common.h"
 
 typedef enum {
     yajl_tok_bool,         

lib/extensions/json/yajl/yajl_parser.h

@@ -33,7 +33,7 @@
 #ifndef __YAJL_PARSER_H__
 #define __YAJL_PARSER_H__
 
-#include "api/yajl_parse.h"
+#include "yajl_parse.h"
 #include "yajl_bytestack.h"
 #include "yajl_buf.h"
 

lib/lua/loslib.c

@@ -38,7 +38,7 @@ static int os_pushresult (lua_State *L, int i, const char *filename) {
 static int os_execute (lua_State *L) {
 #ifndef WAX_TARGET_OS_WATCH
 #warning "compile not for TARGET_OS_WATCH"
-    lua_pushinteger(L, system(luaL_optstring(L, 1, NULL)));
+//    lua_pushinteger(L, system(luaL_optstring(L, 1, NULL)));
 #endif
     return 1;
 }

lib/wax.h

@@ -36,4 +36,12 @@ typedef  void (*WaxLuaRuntimeErrorHandler)(NSString *reason, BOOL willExit);
 
 void wax_setLuaRuntimeErrorHandler(WaxLuaRuntimeErrorHandler handler);
 
-WaxLuaRuntimeErrorHandler wax_getLuaRuntimeErrorHandler();
+WaxLuaRuntimeErrorHandler wax_getLuaRuntimeErrorHandler();
+
+
+//记录wax-lua定义的selector
+void addWaxDefinedSelectorDict(NSDictionary *dict);
+//记录wax-lua中定义的类
+void addWaxNewAddClassDict(NSDictionary *dict);
+//判断forward转发的class_selector是否在wax中定义
+BOOL isClassSelectorDefinedInWax(NSString *klassStr, NSString *selStr);

lib/wax.m

@@ -19,6 +19,7 @@
 #import "wax_gc.h"
 #import "wax_server.h"
 #import "wax_stdlib.h"
+#import "wax_capi.h"
 
 #import "lauxlib.h"
 #import "lobject.h"
@@ -40,6 +41,11 @@
 
 extern int luaSetWaxConfig(lua_State *L);
 
+//original runtime record
+static NSMutableDictionary *waxDefinedSelectorClassDictionary;
+static NSMutableArray *waxNewAddClassArray;
+static void wax_clear();
+
 //runtime error
 static void (*wax_luaRuntimeErrorHandler)(NSString *reason, BOOL willExit);
 
@@ -93,6 +99,7 @@ void wax_setup() {
     luaopen_wax_struct(L);
 
     addGlobals(L);
+    wax_openBindOCFunction(L);
 
 	[wax_gc start];
 }
@@ -188,6 +195,7 @@ void wax_startWithServer() {
 }
 
 void wax_end() {
+    wax_clear();
     [wax_gc stop];
     lua_close(wax_currentLuaState());
     currentL = 0;
@@ -352,4 +360,137 @@ void wax_setLuaRuntimeErrorHandler(void (*handler)(NSString *reason, BOOL willEx
 }
 WaxLuaRuntimeErrorHandler wax_getLuaRuntimeErrorHandler(){
     return wax_luaRuntimeErrorHandler;
+}
+
+#pragma mark original runtime-environment record
+
+void addWaxDefinedSelectorDict(NSDictionary *dict) {
+#if DEBUG
+    NSLog(@"methodDict===%@\n", dict);
+#endif
+    if (waxDefinedSelectorClassDictionary == nil) {
+        waxDefinedSelectorClassDictionary = [[NSMutableDictionary alloc] initWithCapacity:5];
+    }
+
+    if(dict[@"class"]){
+        NSMutableArray *replaceMethodList = nil;
+        if([waxDefinedSelectorClassDictionary objectForKey:dict[@"class"]] != nil){
+            replaceMethodList = [NSMutableArray arrayWithArray:[waxDefinedSelectorClassDictionary objectForKey:dict[@"class"]]];
+        } else {
+            replaceMethodList = [[NSMutableArray alloc] initWithCapacity:5];
+        }
+
+        [replaceMethodList addObject:dict];
+        [waxDefinedSelectorClassDictionary setObject:replaceMethodList forKey:dict[@"class"]];
+    }
+}
+
+void addWaxNewAddClassDict(NSDictionary *dict) {
+#if DEBUG
+    NSLog(@"classDict===%@\n", dict);
+#endif
+    if (waxNewAddClassArray == nil) {
+        waxNewAddClassArray = [[NSMutableArray alloc] initWithCapacity:5];
+    }
+    [waxNewAddClassArray addObject:dict];
+}
+
+BOOL isClassSelectorDefinedInWax(NSString *klassStr, NSString *selStr){
+    if(klassStr == nil || selStr == nil) return NO;
+
+    BOOL isDefined = NO;
+    if(waxDefinedSelectorClassDictionary){
+        //derived calss forwarding selector will use base class's forwarding
+        while (!isDefined && waxDefinedSelectorClassDictionary[klassStr]) {
+            NSArray *replaceMethodList = waxDefinedSelectorClassDictionary[klassStr];
+            for(NSDictionary *dict in replaceMethodList){
+                NSString *tmpClassStr = dict[@"class"];
+                NSString *tmpSelStr = dict[@"sel"];
+                if(tmpClassStr && [tmpClassStr isEqualToString:klassStr] &&
+                   tmpSelStr && [tmpSelStr isEqualToString:selStr]){
+                    isDefined = YES;
+                    break;
+                }
+            }//for
+
+            if(!isDefined){
+                Class klassSuper = [NSClassFromString(klassStr) superclass];
+                klassStr = NSStringFromClass(klassSuper);
+            }
+        }
+    }
+
+    return isDefined;
+}
+
+// clear the wax defined class and selectors
+static void wax_clear() {
+    [wax_globalLock() lock];
+    for (NSString *classStr in waxDefinedSelectorClassDictionary.allKeys) {
+        //wax defined class directly dispose
+        BOOL isWaxClass = class_getInstanceVariable(NSClassFromString(classStr), WAX_CLASS_INSTANCE_USERDATA_IVAR_NAME) != nil;
+        if(isWaxClass) continue;
+
+        NSArray *replaceMethodList = [waxDefinedSelectorClassDictionary objectForKey:classStr];
+        for(NSDictionary *dict in replaceMethodList){
+            Class class = NSClassFromString(dict[@"class"]);
+            NSString *sel_str = dict[@"sel"];
+            NSString *sel_orig_str = dict[@"sel_orig"];
+            NSString *typeDesc = dict[@"typeDesc"];
+
+            if (class && sel_str && ![sel_str isKindOfClass:[NSNull class]]
+                && sel_orig_str && ![sel_orig_str isKindOfClass:[NSNull class]]
+                && typeDesc && ![typeDesc isKindOfClass:[NSNull class]]) {
+                SEL sel = NSSelectorFromString(sel_str);
+                SEL sel_orig = NSSelectorFromString(sel_orig_str);
+                if(sel && sel_orig && (sel != sel_orig)){
+                    IMP imp = class_getMethodImplementation(class, sel_orig);
+                    BOOL isNull = NO;
+#if defined(__arm64__)
+                    if(imp == _objc_msgForward) {
+                        isNull = YES;
+                    }
+#else
+                    if(imp == _objc_msgForward || imp == (IMP)_objc_msgForward_stret){
+                        isNull = YES;
+                    }
+#endif
+                    if (isNull) {
+                        id metaclass = objc_getMetaClass(object_getClassName(class));
+                        IMP metaImp = class_respondsToSelector(metaclass, sel_orig) ? class_getMethodImplementation(metaclass, sel_orig) : NULL;
+                        class = metaclass;
+                        imp = metaImp;
+                    }
+
+                    if(imp && imp != NULL){
+                        class_replaceMethod(class, sel, imp, typeDesc.UTF8String);
+                        class_replaceMethod(class, sel_orig, _objc_msgForward, typeDesc);
+                    }
+                }//if(sel && sel_orig && (sel != sel_orig))
+            }//if
+        }//for replaceMethodlist
+    }//for class list
+
+    [waxDefinedSelectorClassDictionary removeAllObjects];
+    [waxDefinedSelectorClassDictionary release];
+    waxDefinedSelectorClassDictionary = nil;
+
+    // wax new add class rollback, inverse to dispose
+    // because almost subclasses added after baseclasses
+    // depends on require sequence
+    if(waxNewAddClassArray && waxNewAddClassArray.count > 0){
+        for (int i = waxNewAddClassArray.count-1; i >= 0; i--) {
+            NSDictionary *dict = [waxNewAddClassArray objectAtIndex:i];
+            NSString *newAddClassStr = dict[@"class"];
+            Class newAddClass = NSClassFromString(newAddClassStr);
+            if(newAddClass && !class_respondsToSelector(newAddClass, @selector(viewDidLoad))){
+                objc_disposeClassPair(newAddClass);
+            }
+        }
+    }
+
+    [waxNewAddClassArray removeAllObjects];
+    [waxNewAddClassArray release];
+    waxNewAddClassArray = nil;
+    [wax_globalLock() unlock];
 }

lib/wax_class.m

@@ -115,6 +115,13 @@ static int __call(lua_State *L) {
             class_addMethod(metaclass, @selector(wax_originalAllocWithZone:), method_getImplementation(m), method_getTypeEncoding(m));
             class_addMethod(metaclass, @selector(allocWithZone:), (IMP)allocWithZone, "@@:^{_NSZone=}");
         }
+
+        addWaxNewAddClassDict(@{@"class":NSStringFromClass(klass)});
+    }else{
+        //if wax_clear not disposed the class because of class's subclass or instance used, still record the klass
+        if(class_getInstanceVariable(klass, WAX_CLASS_INSTANCE_USERDATA_IVAR_NAME) != nil){
+            addWaxNewAddClassDict(@{@"class":NSStringFromClass(klass)});
+        }
     }
 
     wax_instance_create(L, klass, YES);

lib/wax_instance.h

@@ -18,7 +18,7 @@
 
 
 typedef struct _wax_instance_userdata {
-    id instance;
+    __unsafe_unretained id instance;
     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.