iOS / OSX 平台下增加初始化上下文时传入配置接口，允许导出类方法名称使用完整名称。

vimfung · Apr 4, 2019 · 9af33ee · 9af33ee
1 parent 51696b1
commit 9af33ee
Show file tree

Hide file tree

Showing 13 changed files with 188 additions and 37 deletions.
diff --git a/Source/iOS_OSX/Code-Swift/LuaConfig.swift b/Source/iOS_OSX/Code-Swift/LuaConfig.swift
@@ -0,0 +1,9 @@
+//
+//  LuaConfig.swift
+//  LuaScriptCore
+//
+//  Created by 冯鸿杰 on 2019/4/4.
+//  Copyright © 2019年 vimfung. All rights reserved.
+//
+
+public typealias LuaConfig = LSCConfig;
diff --git a/Source/iOS_OSX/Code-Swift/LuaContext.swift b/Source/iOS_OSX/Code-Swift/LuaContext.swift
@@ -18,6 +18,11 @@ public class LuaContext: NSObject
         self.rawContext = LSCContext();
     }
 
+    public init (config : LuaConfig)
+    {
+        self.rawContext = LSCContext(config: config);
+    }
+
     /// 添加搜索路径，对于不在应用主Bundle根目录的lua脚本如果需要require时，则需要指定其搜索路径。
     ///
     /// - Parameter path: 路径字符串

diff --git a/Source/iOS_OSX/Code/LSCContext.h b/Source/iOS_OSX/Code/LSCContext.h
@@ -11,12 +11,34 @@
 
 @class LSCFunction;
 @class LSCScriptController;
+@class LSCConfig;
 
 /**
  *  Lua上下文对象
  */
 @interface LSCContext : NSObject
 
+/**
+ 配置信息
+ */
+@property (nonatomic, strong, readonly) LSCConfig *config;
+
+
+/**
+ 初始化
+
+ @return 上下文对象
+ */
+- (instancetype)init;
+
+/**
+ 初始化
+
+ @param config 配置信息
+ @return 上下文对象
+ */
+- (instancetype)initWithConfig:(LSCConfig *)config;
+
 /**
  抛出异常
  

diff --git a/Source/iOS_OSX/Code/LSCContext.m b/Source/iOS_OSX/Code/LSCContext.m
@@ -14,6 +14,7 @@
 #import "LSCTuple.h"
 #import "LSCCoroutine+Private.h"
 #import "LSCError.h"
+#import "LSCConfig.h"
 #import <objc/runtime.h>
 
 /**
@@ -32,25 +33,17 @@ @interface LSCContext ()
 
 @implementation LSCContext
 
-- (instancetype)init
-{
-    return [self initWithCreateStateHandler:^lua_State *{
-
-        return [LSCEngineAdapter newState];
-
-    }];
-}
-
-- (instancetype)initWithCreateStateHandler:(lua_State* (^)(void))handler
+- (instancetype)initWithConfig:(LSCConfig *)config
 {
     if (self = [super init])
     {
+        _config = config;
         self.methodBlocks = [NSMutableDictionary dictionary];
 
         self.optQueue = [[LSCOperationQueue alloc] init];
         [self.optQueue performAction:^{
 
-            lua_State *state = handler();
+            lua_State *state = [LSCEngineAdapter newState];
 
             [LSCEngineAdapter gc:state what:LSCGCTypeStop data:0];
 
@@ -86,9 +79,15 @@ - (instancetype)initWithCreateStateHandler:(lua_State* (^)(void))handler
 
         }];
     }
+
     return self;
 }
 
+- (instancetype)init
+{
+    return [self initWithConfig:[LSCConfig defaultConfig]];
+}
+
 - (void)dealloc
 {
     //由于LSCSession在销毁前会进行一次GC，但是在该情况下lua_State已经被close。

diff --git a/Source/iOS_OSX/Code/LSCContext_Private.h b/Source/iOS_OSX/Code/LSCContext_Private.h
@@ -52,14 +52,6 @@
  */
 @property (nonatomic, strong) LSCExportsTypeManager *exportsTypeManager;
 
-/**
- 初始化
-
- @param handler 创建State处理器
- @return 上下文对象
- */
-- (instancetype)initWithCreateStateHandler:(lua_State* (^)(void))handler;
-
 /**
  通过状态设置当前会话
 

diff --git a/Source/iOS_OSX/Code/LSCExportsTypeManager.m b/Source/iOS_OSX/Code/LSCExportsTypeManager.m
@@ -17,6 +17,7 @@
 #import "LSCExportTypeAnnotation.h"
 #import "LSCExportPropertyDescriptor.h"
 #import "LSCVirtualInstance.h"
+#import "LSCConfig.h"
 #import <objc/runtime.h>
 
 /**
@@ -902,30 +903,60 @@ - (void)_exportsInstanceMethods:(LSCExportTypeDescriptor *)typeDescriptor
 - (NSString *)_getLuaMethodNameWithSelectorName:(NSString *)selectorName
 {
     NSString *luaName = selectorName;
-
-    NSRange range = [luaName rangeOfString:@":"];
-    if (range.location != NSNotFound)
-    {
-        luaName = [luaName substringToIndex:range.location];
-    }
 
-    range = [luaName rangeOfString:@"With"];
-    if (range.location != NSNotFound)
+    if ([luaName hasPrefix:@"init"])
     {
-        luaName = [luaName substringToIndex:range.location];
+        //检测是否为初始化方法
+        if (luaName.length > 4)
+        {
+            unichar ch = [luaName characterAtIndex:4];
+            if (ch > 'A' && ch < 'Z')
+            {
+                return @"init";
+            }
+        }
+        else
+        {
+            return @"init";
+        }
     }
-
-    range = [luaName rangeOfString:@"At"];
-    if (range.location != NSNotFound)
+
+    if (self.context.config.fullExportName)
     {
-        luaName = [luaName substringToIndex:range.location];
+        //使用完整限定名称
+        luaName = [selectorName stringByReplacingOccurrencesOfString:@":" withString:@"_"];
+        if ([luaName hasSuffix:@"_"])
+        {
+            luaName = [luaName substringWithRange:NSMakeRange(0, luaName.length - 1)];
+        }
     }
-
-    range = [luaName rangeOfString:@"By"];
-    if (range.location != NSNotFound)
+    else
     {
-        luaName = [luaName substringToIndex:range.location];
+        NSRange range = [luaName rangeOfString:@":"];
+        if (range.location != NSNotFound)
+        {
+            luaName = [luaName substringToIndex:range.location];
+        }
+
+        range = [luaName rangeOfString:@"With"];
+        if (range.location != NSNotFound)
+        {
+            luaName = [luaName substringToIndex:range.location];
+        }
+
+        range = [luaName rangeOfString:@"At"];
+        if (range.location != NSNotFound)
+        {
+            luaName = [luaName substringToIndex:range.location];
+        }
+
+        range = [luaName rangeOfString:@"By"];
+        if (range.location != NSNotFound)
+        {
+            luaName = [luaName substringToIndex:range.location];
+        }
     }
+
 
     return luaName;
 }

diff --git a/Source/iOS_OSX/Code/LuaScriptCore.h b/Source/iOS_OSX/Code/LuaScriptCore.h
@@ -15,6 +15,7 @@
 #import "LSCTuple.h"
 #import "LSCManagedValue.h"
 #import "LSCScriptController.h"
+#import "LSCConfig.h"
 
 #import "LSCExportType.h"
 #import "LSCExportTypeAnnotation.h"

diff --git a/Source/iOS_OSX/LSCConfig.h b/Source/iOS_OSX/LSCConfig.h
@@ -0,0 +1,33 @@
+//
+//  LSCConfig.h
+//  LuaScriptCore
+//
+//  Created by 冯鸿杰 on 2019/4/4.
+//  Copyright © 2019年 vimfung. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+
+/**
+ 配置信息
+ */
+@interface LSCConfig : NSObject
+
+/**
+ 是否使用完整名称导出
+ */
+@property (nonatomic) BOOL fullExportName;
+
+/**
+ 获取默认配置
+
+ @return 配置信息
+ */
++ (instancetype)defaultConfig;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Source/iOS_OSX/LSCConfig.m b/Source/iOS_OSX/LSCConfig.m
@@ -0,0 +1,26 @@
+//
+//  LSCConfig.m
+//  LuaScriptCore
+//
+//  Created by 冯鸿杰 on 2019/4/4.
+//  Copyright © 2019年 vimfung. All rights reserved.
+//
+
+#import "LSCConfig.h"
+
+@implementation LSCConfig
+
++ (instancetype)defaultConfig
+{
+    static LSCConfig *config = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+
+        config = [[LSCConfig alloc] init];
+
+    });
+
+    return config;
+}
+
+@end
diff --git a/Source/iOS_OSX/LuaScriptCore-OSX-Swift/LuaScriptCore_OSX_Swift.h b/Source/iOS_OSX/LuaScriptCore-OSX-Swift/LuaScriptCore_OSX_Swift.h
@@ -22,6 +22,7 @@ FOUNDATION_EXPORT const unsigned char LuaScriptCore_OSX_SwiftVersionString[];
 #import <LuaScriptCore_OSX_Swift/LSCTuple.h>
 #import <LuaScriptCore_OSX_Swift/LSCManagedValue.h>
 #import <LuaScriptCore_OSX_Swift/LSCScriptController.h>
+#import <LuaScriptCore_OSX_Swift/LSCConfig.h>
 
 #import <LuaScriptCore_OSX_Swift/LSCExportType.h>
 #import <LuaScriptCore_OSX_Swift/LSCExportTypeAnnotation.h>

diff --git a/Source/iOS_OSX/LuaScriptCore-iOS-Swift/LuaScriptCore_iOS_Swift.h b/Source/iOS_OSX/LuaScriptCore-iOS-Swift/LuaScriptCore_iOS_Swift.h
@@ -22,6 +22,7 @@ FOUNDATION_EXPORT const unsigned char LuaScriptCore_iOS_SwiftVersionString[];
 #import <LuaScriptCore_iOS_Swift/LSCTuple.h>
 #import <LuaScriptCore_iOS_Swift/LSCManagedValue.h>
 #import <LuaScriptCore_iOS_Swift/LSCScriptController.h>
+#import <LuaScriptCore_iOS_Swift/LSCConfig.h>
 
 #import <LuaScriptCore_iOS_Swift/LSCExportType.h>
 #import <LuaScriptCore_iOS_Swift/LSCExportTypeAnnotation.h>