修复iOS ／ OSX平台下调用方法导致内存泄漏问题。

Former-commit-id: 4a22ff77700e2898f6d7622e1eaebcec33354ab7

Author: vimfung

Source/iOS_OSX/Code/LSCExportMethodDescriptor.h

@@ -14,13 +14,38 @@
 @interface LSCExportMethodDescriptor : NSObject
 
 /**
- 方法签名，如：@@、@I@B
+ 选择子
  */
-@property (nonatomic, copy) NSString *methodSignature;
+@property (nonatomic, readonly) SEL selector;
 
 /**
- 调用器
+ 参数签名，如：@@、@I@B
  */
-@property (nonatomic, strong) NSInvocation *invocation;
+@property (nonatomic, copy, readonly) NSString *paramsSignature;
+
+
+/**
+ 方法签名
+ */
+@property (nonatomic, strong, readonly) NSMethodSignature *methodSignature;
+
+
+/**
+ 初始化
+
+ @param selector 选择子
+ @param methodSignature 方法签名
+ @param paramsSignature 参数签名
+ @return 方法描述
+ */
+- (instancetype)initWithSelector:(SEL)selector
+                 methodSignature:(NSMethodSignature *)methodSignature
+                 paramsSignature:(NSString *)paramsSignature;
+
+
+/**
+ 创建方法调用器
+ */
+- (NSInvocation *)createInvocation;
 
 @end

Source/iOS_OSX/Code/LSCExportMethodDescriptor.m

@@ -10,4 +10,25 @@
 
 @implementation LSCExportMethodDescriptor
 
+- (instancetype)initWithSelector:(SEL)selector
+                 methodSignature:(NSMethodSignature *)methodSignature
+                 paramsSignature:(NSString *)paramsSignature
+{
+    if (self = [super init])
+    {
+        _selector = selector;
+        _methodSignature = methodSignature;
+        _paramsSignature = paramsSignature;
+    }
+    return self;
+}
+
+- (NSInvocation *)createInvocation
+{
+    NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:self.methodSignature];
+    invocation.selector = self.selector;
+    
+    return invocation;
+}
+
 @end

Source/iOS_OSX/Code/LSCExportTypeDescriptor.m

@@ -153,7 +153,7 @@ - (LSCExportMethodDescriptor *)_methodWithName:(NSString *)name
                 NSRegularExpression *regExp = [[NSRegularExpression alloc] initWithPattern:signStrRegexp options:0 error:nil];
                 [methods enumerateObjectsUsingBlock:^(LSCExportMethodDescriptor * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
 
-                    NSTextCheckingResult *result = [regExp firstMatchInString:obj.methodSignature options:0 range:NSMakeRange(0, obj.methodSignature.length)];
+                    NSTextCheckingResult *result = [regExp firstMatchInString:obj.paramsSignature options:0 range:NSMakeRange(0, obj.paramsSignature.length)];
                     if (result)
                     {
                         [matchMethods addObject:obj];
@@ -170,11 +170,11 @@ - (LSCExportMethodDescriptor *)_methodWithName:(NSString *)name
 
                         BOOL hasMatch = YES;
                         BOOL hasAlternate = NO;
-                        for (int i = 0; i < methodDesc.methodSignature.length; i++)
+                        for (int i = 0; i < methodDesc.paramsSignature.length; i++)
                         {
                             if (i < signArr.count)
                             {
-                                NSString *nativeSign = [methodDesc.methodSignature substringWithRange:NSMakeRange(i, 1)];
+                                NSString *nativeSign = [methodDesc.paramsSignature substringWithRange:NSMakeRange(i, 1)];
                                 NSString *luaSign = signArr[i];
 
                                 if ([luaSign isEqualToString:@"N"]
@@ -257,7 +257,7 @@ - (LSCExportMethodDescriptor *)_methodWithName:(NSString *)name
             //不带参数
             [methods enumerateObjectsUsingBlock:^(LSCExportMethodDescriptor * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
 
-                if ([obj.methodSignature isEqualToString:@""])
+                if ([obj.paramsSignature isEqualToString:@""])
                 {
                     targetMethod = obj;
                     *stop = NO;

Source/iOS_OSX/Code/LSCExportsTypeManager.m

@@ -423,7 +423,7 @@ - (void)_exportsClassMethods:(LSCExportTypeDescriptor *)typeDescriptor
                 hasExists = NO;
                 [methodList enumerateObjectsUsingBlock:^(LSCExportMethodDescriptor * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
 
-                    if ([obj.methodSignature isEqualToString:signStr])
+                    if ([obj.paramsSignature isEqualToString:signStr])
                     {
                         hasExists = YES;
                         *stop = YES;
@@ -433,12 +433,8 @@ - (void)_exportsClassMethods:(LSCExportTypeDescriptor *)typeDescriptor
 
                 if (!hasExists)
                 {
-                    LSCExportMethodDescriptor *methodDesc = [[LSCExportMethodDescriptor alloc] init];
-                    methodDesc.methodSignature = signStr;
-                    
                     NSMethodSignature *sign = [targetTypeDescriptor.nativeType methodSignatureForSelector:selector];
-                    methodDesc.invocation = [NSInvocation invocationWithMethodSignature:sign];
-                    [methodDesc.invocation setSelector:selector];
+                    LSCExportMethodDescriptor *methodDesc = [[LSCExportMethodDescriptor alloc] initWithSelector:selector methodSignature:sign paramsSignature:signStr];
 
                     [methodList addObject:methodDesc];
                 }
@@ -673,7 +669,7 @@ - (void)_exportsInstanceMethods:(LSCExportTypeDescriptor *)typeDescriptor
                 hasExists = NO;
                 [methodList enumerateObjectsUsingBlock:^(LSCExportMethodDescriptor * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
 
-                    if ([obj.methodSignature isEqualToString:signStr])
+                    if ([obj.paramsSignature isEqualToString:signStr])
                     {
                         hasExists = YES;
                         *stop = YES;
@@ -683,13 +679,9 @@ - (void)_exportsInstanceMethods:(LSCExportTypeDescriptor *)typeDescriptor
 
                 if (!hasExists)
                 {
-                    LSCExportMethodDescriptor *methodDesc = [[LSCExportMethodDescriptor alloc] init];
-                    methodDesc.methodSignature = signStr;
-                    
                     NSMethodSignature *sign = [typeDescriptor.nativeType instanceMethodSignatureForSelector:selector];
-                    methodDesc.invocation = [NSInvocation invocationWithMethodSignature:sign];
-                    [methodDesc.invocation setSelector:selector];
-                    
+                    LSCExportMethodDescriptor *methodDesc = [[LSCExportMethodDescriptor alloc] initWithSelector:selector methodSignature:sign paramsSignature:signStr];
+
                     [methodList addObject:methodDesc];
                 }
             }
@@ -949,7 +941,7 @@ - (NSInvocation *)_invocationWithMethodName:(NSString *)methodName
         methodDesc = [typeDesc instanceMethodWithName:methodName arguments:arguments];
     }
 
-    return methodDesc.invocation;
+    return [methodDesc createInvocation];
 }
 
 
@@ -1175,23 +1167,23 @@ static int instanceMethodRouteHandler(lua_State *state)
     index = [LSCEngineAdapter upvalueIndex:2];
     ptr = [LSCEngineAdapter toPointer:state index:index];
     LSCExportTypeDescriptor *typeDescriptor = (__bridge LSCExportTypeDescriptor *)ptr;
-    
+
     index = [LSCEngineAdapter upvalueIndex:3];
     const char *methodNameCStr = [LSCEngineAdapter toString:state index:index];
     NSString *methodName = [NSString stringWithUTF8String:methodNameCStr];
-    
+
     if ([LSCEngineAdapter type:state index:1] != LUA_TUSERDATA)
     {
         NSString *errMsg = [NSString stringWithFormat:@"call %@ method error : missing self parameter, please call by instance:methodName(param)", methodName];
         [LSCEngineAdapter error:state message:errMsg.UTF8String];
         return retCount;
     }
-    
+
     //创建调用会话
     LSCSession *callSession = [exporter.context makeSessionWithState:state];
     NSArray *arguments = [callSession parseArguments];
     id instance = [arguments[0] toObject];
-    
+
     NSInvocation *invocation = [exporter _invocationWithMethodName:methodName
                                                          arguments:arguments
                                                           typeDesc:typeDescriptor
@@ -1203,7 +1195,7 @@ static int instanceMethodRouteHandler(lua_State *state)
         LSCValue *retValue = [typeDescriptor _invokeMethodWithInstance:instance
                                                             invocation:invocation
                                                              arguments:arguments];
-        
+
         if (retValue)
         {
             retCount = [callSession setReturnValue:retValue];
@@ -1214,7 +1206,7 @@ static int instanceMethodRouteHandler(lua_State *state)
         NSString *errMsg = [NSString stringWithFormat:@"call `%@` method fail : argument type mismatch", methodName];
         [LSCEngineAdapter error:state message:errMsg.UTF8String];
     }
-    
+
     [exporter.context destroySession:callSession];
 
     return retCount;