完全去除非标准语法支持

敛心 · 敛心 · commit 34a7295402b6 · 2017-06-15T12:16:08.000+08:00
diff --git a/IOS/SDK/LuaViewSDK/Classes/LView.m b/IOS/SDK/LuaViewSDK/Classes/LView.m
@@ -5,15 +5,6 @@
 
 @implementation LView
 
-
--(BOOL) changeGrammar{
-    return self.luaviewCore.changeGrammar;
-}
-
--(void) setChangeGrammar:(BOOL)changeGrammar{
-    self.luaviewCore.changeGrammar = changeGrammar;
-}
-
 -(BOOL) checkDebugerServer{
     return self.luaviewCore.checkDebugerServer;
 }
diff --git a/IOS/SDK/LuaViewSDK/Classes/LuaView.h b/IOS/SDK/LuaViewSDK/Classes/LuaView.h
@@ -94,8 +94,6 @@
  */
 -(NSString*) runData:(NSData*) data fileName:(NSString*) fileName;
 
--(NSString*) runData:(NSData*) data fileName:(NSString*) fileName changeGrammar:(BOOL) changeGrammar;
-
 /**
  * 加载签名的脚本文件，读取文件并调用lvL_loadbuffer
  *
diff --git a/IOS/SDK/LuaViewSDK/Classes/LuaView.m b/IOS/SDK/LuaViewSDK/Classes/LuaView.m
@@ -153,10 +153,6 @@ -(NSString*) runData:(NSData*) data fileName:(NSString*) fileName{
     return [self.luaviewCore runData:data fileName:fileName];
 }
 
--(NSString*) runData:(NSData*) data fileName:(NSString*) fileName changeGrammar:(BOOL) changeGrammar{
-    return [self.luaviewCore runData:data fileName:fileName changeGrammar:changeGrammar];
-}
-
 /**
  * 加载签名的脚本文件，读取文件并调用lvL_loadbuffer
  *
diff --git a/IOS/SDK/LuaViewSDK/Classes/LuaViewCore.h b/IOS/SDK/LuaViewSDK/Classes/LuaViewCore.h
@@ -27,7 +27,8 @@
 /**
  * 是否需要语法转换（原先luaview语法和lua标准语法的区别是‘.’和':'互换了），默认是标准语法，使用非标准语法需要转换成标准语法才设置成true
  */
-@property (nonatomic,assign) BOOL changeGrammar;
+//不再支持changeGrammer, 缺省只支持标准语法，不进行转换
+//@property (nonatomic,assign) BOOL changeGrammar;
 
 //---------------------------------------------------------------------
 /**
@@ -119,8 +120,8 @@
 *  @return 运行结果
 */
 -(NSString*) runData:(NSData*) data fileName:(NSString*) fileName;
-
--(NSString*) runData:(NSData*) data fileName:(NSString*) fileName changeGrammar:(BOOL) changeGrammar;
+//
+//-(NSString*) runData:(NSData*) data fileName:(NSString*) fileName changeGrammar:(BOOL) changeGrammar;
 
 /**
 *
diff --git a/IOS/SDK/LuaViewSDK/Classes/LuaViewCore.m b/IOS/SDK/LuaViewSDK/Classes/LuaViewCore.m
@@ -137,9 +137,7 @@ -(NSString*) runPackage:(NSString*) packageName args:(NSArray*) args{
     NSString *packagePath = [LVPkgManager rootDirectoryOfPackage:packageName];
     [self.bundle addScriptPath:packagePath];
     [self.bundle addResourcePath:packagePath];
-    
-    self.changeGrammar = [[LVPkgManager changeGrammarOfPackage:packageName] isEqualToString:@"true"];
-    
+
     NSString* fileName = @"main.lv";
     NSString* ret = [self runSignFile:fileName];
     lua_State* L = self.l;
@@ -182,16 +180,12 @@ -(NSString*) loadScript:(NSString *)script fileName:(NSString *)fileName{
     return [self loadData:[script dataUsingEncoding:NSUTF8StringEncoding] fileName:fileName];
 }
 
-- (NSString*)loadData:(NSData *)data fileName:(NSString *)fileName {
-    return [self loadData:data fileName:fileName changeGrammar:self.changeGrammar];
-}
-
 #ifdef DEBUG
 extern char g_debug_lua[];
 
 -(NSString*) loadDebugModel{
     NSData* data = [[NSData alloc] initWithBytes:g_debug_lua length:strlen(g_debug_lua)];
-    return [self runData:data fileName:@"debug.lua" changeGrammar:NO];
+    return [self runData:data fileName:@"debug.lua"];
 }
 
 - (void) callLuaToExecuteServerCmd{
@@ -313,15 +307,18 @@ -(void) registerAllClass{
 }
 
 -(NSString*) runData:(NSData *)data fileName:(NSString*)fileName{
-    return [self runData:data fileName:fileName changeGrammar:self.changeGrammar];
+    lua_State* L = self.l;
+    NSString* ret = [self loadData:data fileName:fileName];
+    if ( ret ) {
+        return ret;
+    } else {
+        return lv_runFunction(L);
+    }
 }
     
-- (NSString*)loadData:(NSData *)data fileName:(NSString *)fileName changeGrammar:(BOOL)changeGrammar{
+- (NSString*)loadData:(NSData *)data fileName:(NSString *)fileName{
     fileName = [fileName stringByReplacingOccurrencesOfString:@"//" withString:@"/"];
 
-    if( changeGrammar ) {
-        data = lv_toStandLuaGrammar(data);
-    }
     lua_State* L = self.l;
     if( L==NULL ){
         LVError( @"Lua State is released !!!");
@@ -355,16 +352,6 @@ - (NSString*)loadData:(NSData *)data fileName:(NSString *)fileName changeGrammar
     }
 }
 
--(NSString*) runData:(NSData*) data fileName:(NSString*) fileName changeGrammar:(BOOL) changeGrammar{
-    lua_State* L = self.l;
-    NSString* ret = [self loadData:data fileName:fileName changeGrammar:changeGrammar];
-    if ( ret ) {
-        return ret;
-    } else {
-        return lv_runFunction(L);
-    }
-}
-
 -(int) globalNumber:(const char*) globalName{
     lua_State* L = self.l;
     if ( L ==nil ){
diff --git a/IOS/SDK/LuaViewSDK/Classes/PKG/LVPkgInfo.h b/IOS/SDK/LuaViewSDK/Classes/PKG/LVPkgInfo.h
@@ -26,7 +26,7 @@
 @property(nonatomic,copy) NSString* url; // 下载地址
 @property(nonatomic,copy) NSString* sha256; // sha256
 @property(nonatomic,copy) NSString* timestamp; // 版本对比时间戳
-@property(nonatomic,assign) BOOL changeGrammar; // 是否需要语法转换（‘:’和'.'互换）
+//@property(nonatomic,assign) BOOL changeGrammar; // 是否需要语法转换（‘:’和'.'互换）
 @property(nonatomic,copy) NSString* package; // sha256
 
 /*
diff --git a/IOS/SDK/LuaViewSDK/Classes/PKG/LVPkgInfo.m b/IOS/SDK/LuaViewSDK/Classes/PKG/LVPkgInfo.m
@@ -14,24 +14,22 @@ @implementation LVPkgInfo
 -(instancetype) init:(NSDictionary*) dic{
     self = [super init];
     if( self ) {
-        NSString* url = nil;
-        NSString* sha = nil;
+        NSString* url = [LVPkgInfo safe_string:dic forKey:LV_PKGINFO_SURL];
+        
+        if (!url){
+            url = [LVPkgInfo safe_string:dic forKey:LV_PKGINFO_URL];
+        }
+        NSString* sha = [LVPkgInfo safe_string:dic forKey:LV_PKGINFO_SSHA key2:LV_PKGINFO_SSHA256];
+        
+        if (!sha){
+            sha = [LVPkgInfo safe_string:dic forKey:LV_PKGINFO_SHA key2:LV_PKGINFO_SHA256];
+        }
         
-        url = [LVPkgInfo safe_string:dic forKey:LV_PKGINFO_SURL];
-        sha = [LVPkgInfo safe_string:dic forKey:LV_PKGINFO_SSHA key2:LV_PKGINFO_SSHA256];
         if(  url && sha ) {
             self.url = url;
             self.sha256 = sha;
-            self.changeGrammar = NO;
-        } else {
-            self.url = [LVPkgInfo safe_string:dic forKey:LV_PKGINFO_URL key2:LV_PKGINFO_URL2];
-            self.sha256 = [LVPkgInfo safe_string:dic forKey:LV_PKGINFO_SHA key2:LV_PKGINFO_SHA256];
-            self.changeGrammar = YES;
-            // 检查后缀名, 如果是.szip, 说明是标准语法格式, 不需要转换(兼容安卓)
-            if( [self.url hasSuffix:@".szip"] ) {
-                self.changeGrammar = NO;
-            }
         }
+
         self.url = [self stringByDecodingURLFormat:self.url]; // 下载地址可能需要解码
         self.url = [self addHttpPrefix:self.url];// 下载地址可能需要加https前缀
         self.package = [LVPkgInfo safe_string:dic forKey:LV_PKGINFO_PACKAGE];
@@ -64,15 +62,9 @@ - (NSString *)stringByDecodingURLFormat:(NSString*) str
 
 - (NSDictionary*) dictionaryInfo{
     if( self.url && self.sha256 && self.package ) {
-        if( self.changeGrammar ) {
-            return @{LV_PKGINFO_URL:self.url,
-                     LV_PKGINFO_SHA:self.sha256,
-                     LV_PKGINFO_PACKAGE:self.package};
-        } else {
-            return @{LV_PKGINFO_SURL:self.url ,
-                     LV_PKGINFO_SSHA:self.sha256,
-                     LV_PKGINFO_PACKAGE:self.package};
-        }
+        return @{LV_PKGINFO_SURL:self.url ,
+                 LV_PKGINFO_SSHA:self.sha256,
+                 LV_PKGINFO_PACKAGE:self.package};
     }
     return nil;
 }
diff --git a/IOS/SDK/LuaViewSDK/Classes/PKG/LVPkgManager.h b/IOS/SDK/LuaViewSDK/Classes/PKG/LVPkgManager.h
@@ -34,13 +34,15 @@ typedef void(^LVDownloadCallback)(NSDictionary* info, NSString* error, LVDownloa
 + (NSString *)pathForFileName:(NSString *)fileName package:(NSString *)packageName;
 
 // 解压失败是-1， 无需解压本地更加新是0， 解压成功是1
-+(int) unpackageFile:(NSString*) fileName packageName:(NSString*) packageName changeGrammar:(BOOL) changeGrammar;
-+(int) unpackageData:(NSData*) data       packageName:(NSString*) packageName changeGrammar:(BOOL) changeGrammar;
++(int) unpackageFile:(NSString*) fileName packageName:(NSString*) packageName;
++(int) unpackageData:(NSData*) data       packageName:(NSString*) packageName;
 
 // 返回值说明   0:本地和线上版本一样;   1:即将去下载;   -1:错误
 +(NSInteger) downloadPackage:(NSString*)packageName withInfo:(NSDictionary*) info;
 // 返回值说明   0:本地和线上版本一样;   1:即将去下载;   -1:错误
 +(NSInteger) downloadPackage:(NSString*)packageName withInfo:(NSDictionary*) info callback:(LVDownloadCallback) callback;
++(NSInteger) unpackageData:(NSData*)data packageName:(NSString*)packageName withInfo:(LVPkgInfo*) info callback:(LVDownloadCallback) callback;
+
 
 +(NSData*) readLuaFile:(NSString*) fileName rsa:(LVRSA*) rsa;
 // download url
@@ -49,9 +51,6 @@ typedef void(^LVDownloadCallback)(NSDictionary* info, NSString* error, LVDownloa
 // timestamp
 +(NSString*) timestampOfPackage:(NSString*)packageName;
 +(BOOL) setPackage:(NSString*)packageName timestamp:(NSString*) time;
-// changeGrammar
-+(NSString*) changeGrammarOfPackage:(NSString*)packageName;
-+(BOOL) setPackage:(NSString*)packageName changeGrammar:(NSString*) timestamp;
 
 // 返回值说明   0:本地和线上版本一样;   -1:错误或者不相等
 +(int) compareDownloadUrlOfPackage:(NSString*)name withServerInfo:(NSDictionary*) info;
diff --git a/IOS/SDK/LuaViewSDK/Classes/PKG/LVPkgManager.m b/IOS/SDK/LuaViewSDK/Classes/PKG/LVPkgManager.m
@@ -14,7 +14,6 @@
 
 NSString * const LV_FILE_NAME_OF_PACKAGE_DOWNLOAD_URL = @"___download_url___";
 NSString * const LV_FILE_NAME_OF_PACKAGE_TIMESTAMP = @"___timestamp___";
-NSString * const LV_FILE_NAME_OF_CHANGE_GRAMMAR = @"___change_grammar___";
 
 @implementation LVPkgManager
 
@@ -52,9 +51,6 @@ +(NSString*) filePathOfPackageDownloadUrl:(NSString *)packageName {
 +(NSString*) filePathOfPackageTimestamp:(NSString *)packageName {
     return [self pathForFileName:LV_FILE_NAME_OF_PACKAGE_TIMESTAMP package:packageName];
 }
-+(NSString*) filePathOfChangeGrammar:(NSString *)packageName {
-    return [self pathForFileName:LV_FILE_NAME_OF_CHANGE_GRAMMAR package:packageName];
-}
 //------------------------------------------------------------------------------------------
 +(BOOL) deleteFileOfPackageDownloadUrl:(NSString*) packageName{
     NSString* path = [self filePathOfPackageDownloadUrl:packageName];
@@ -93,29 +89,15 @@ +(BOOL) setPackage:(NSString*)packageName timestamp:(NSString*) timestamp{
     NSData* data = [timestamp dataUsingEncoding:NSUTF8StringEncoding];
     return [self writeFile:data packageName:packageName fileName:LV_FILE_NAME_OF_PACKAGE_TIMESTAMP];
 }
-//------------------------------------ read/write change grammar -----------------------------------
-+(NSString*) changeGrammarOfPackage:(NSString*)packageName {
-    NSData* data = [self readFileFromPackage:packageName fileName:LV_FILE_NAME_OF_CHANGE_GRAMMAR];
-    if( data ) {
-        return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-    } else {
-        return nil;
-    }
-}
 
-+(BOOL) setPackage:(NSString*)packageName changeGrammar:(NSString*) timestamp{
-    // time file
-    NSData* data = [timestamp dataUsingEncoding:NSUTF8StringEncoding];
-    return [self writeFile:data packageName:packageName fileName:LV_FILE_NAME_OF_CHANGE_GRAMMAR];
-}
 
 //------------------------------------------------------------------------------------------
-+(int) unpackageFile:(NSString*) fileName packageName:(NSString*) packageName  changeGrammar:(BOOL) changeGrammar{
++(int) unpackageFile:(NSString*) fileName packageName:(NSString*) packageName{
     NSString *path = [LVUtil PathForBundle:nil relativePath:fileName];
     
     if( [LVUtil exist:path] ){
         NSData* pkgData = [LVUtil dataReadFromFile:path];
-        return [self unpackageData:pkgData packageName:packageName changeGrammar:changeGrammar];
+        return [self unpackageData:pkgData packageName:packageName];
     }
     return -1;
 }
@@ -124,7 +106,7 @@ +(BOOL) checkUpdateWithNewTS:(NSString*)newTS oldTS:(NSString*) oldTS{
     return newTS.length>0 && oldTS.length>0 && [newTS compare:oldTS]==NSOrderedDescending;
 }
 
-+(int) unpackageData:(NSData*) pkgData packageName:(NSString*) packageName changeGrammar:(BOOL) changeGrammar{
++(int) unpackageData:(NSData*) pkgData packageName:(NSString*) packageName{
     NSString *path = [self rootDirectoryOfPackage:packageName];
     if( pkgData && [LVUtil createPath:path] ){
         LVZipArchive *archive = [LVZipArchive archiveWithData:pkgData];
@@ -136,7 +118,6 @@ +(int) unpackageData:(NSData*) pkgData packageName:(NSString*) packageName chang
         if( (newTS && oldTS==nil) ||  [self checkUpdateWithNewTS:newTS oldTS:oldTS] ){
             BOOL result = [archive unzipToDirectory:path];
             if( result ) {
-                [self setPackage:packageName changeGrammar:(changeGrammar ? @"true":@"false") ];
                 [self setPackage:packageName timestamp:newTS];
                 return 1;
             }
@@ -176,8 +157,17 @@ +(NSInteger) downloadPackage:(NSString*)packageName withInfo:(NSDictionary*) inf
             [self doDownloadPackage:packageName withInfo:info callback:callback];
             return LV_DOWNLOAD_NET;
         }
+        
+        if (callback){
+            callback(info, nil, LV_DOWNLOAD_CACHE);
+        }
         return LV_DOWNLOAD_CACHE;
     }
+    
+    if (callback){
+        callback(info, nil, LV_DOWNLOAD_ERROR);
+    }
+    
     return LV_DOWNLOAD_ERROR;
 }
 
@@ -198,36 +188,43 @@ +(BOOL) sha256Check:(NSData*) data ret:(NSString*) string{
 +(void) doDownloadPackage:(NSString*)pkgName withInfo:(NSDictionary*) info callback:(LVDownloadCallback) callback{
     LVPkgInfo* pkgInfo = [[LVPkgInfo alloc] init:info];
     
-    if ( callback == nil ){// 回调一定不是空
-        callback = ^(NSDictionary* dic, NSString* erro , LVDownloadDataType dataType){
-        };
-    }
-    
+    __weak typeof (self) weakSelf = self;
     if( pkgName.length>0 && pkgInfo.url.length>0 && pkgInfo.timestamp.length>0){
         [LVUtil download:pkgInfo.url callback:^(NSData *data) {
             // 解包过程放在主线程执行!!!!
             dispatch_async(dispatch_get_main_queue(), ^{
-                if( data ){
-                    BOOL sha256OK = [self sha256Check:data ret:pkgInfo.sha256];
-                    if( sha256OK ){
-                        [self deleteFileOfPackageDownloadUrl:pkgName];// 开始解包, 删除时间戳文件
-                        if ( [self unpackageData:data packageName:pkgName changeGrammar:pkgInfo.changeGrammar]>=0 ) {
-                            // 解包成功
-                            if( [self setPackage:pkgName downloadUrl:pkgInfo.url] ){// 写标记成功
-                                callback(pkgInfo.originalDic, nil, LV_DOWNLOAD_NET);
-                                return ;
-                            }
-                        }
-                    }
-                } else {
-                    LVError(@"[downloadPackage] error: url=%@",pkgInfo.url);
-                }
-                callback(pkgInfo.originalDic, @"error", LV_DOWNLOAD_ERROR);
+                [weakSelf unpackageData:data packageName:pkgName withInfo:pkgInfo callback:callback];
             });
         }];
     }
 }
 
++(NSInteger) unpackageData:(NSData*)data packageName:(NSString*)pkgName withInfo:(LVPkgInfo*)pkgInfo callback:(LVDownloadCallback) callback{
+    
+    if( data ){
+        BOOL sha256OK = [self sha256Check:data ret:pkgInfo.sha256];
+        if( sha256OK ){
+            [self deleteFileOfPackageDownloadUrl:pkgName];// 开始解包, 删除时间戳文件
+            
+            NSInteger result = [self unpackageData:data packageName:pkgName];
+            if ( result >= 0 ) {
+                // 解包成功
+                if( [self setPackage:pkgName downloadUrl:pkgInfo.url] && callback){// 写标记成功
+                    callback(pkgInfo.originalDic, nil, LV_DOWNLOAD_NET);
+                }
+                
+                return result;
+            }
+        }
+    } else {
+        LVError(@"[downloadPackage] error: url=%@",pkgInfo.url);
+    }
+    
+    callback(pkgInfo.originalDic, @"error", LV_DOWNLOAD_ERROR);
+    
+    return -1;
+}
+
 +(NSData*) readLuaFile:(NSString*) fileName rsa:(LVRSA*)rsa{
     NSString* signfileName = [self signfileNameOfOriginFile:fileName];
     NSData* signData = [LVUtil dataReadFromFile:signfileName];
diff --git a/IOS/SDK/LuaViewSDK/Classes/lvsdk/LVGrammarChanger.h b/IOS/SDK/LuaViewSDK/Classes/lvsdk/LVGrammarChanger.h
diff --git a/IOS/SDK/LuaViewSDK/Classes/lvsdk/LVGrammarChanger.m b/IOS/SDK/LuaViewSDK/Classes/lvsdk/LVGrammarChanger.m
diff --git a/IOS/SDK/LuaViewSDK/Classes/lvsdk/LVHeads.h b/IOS/SDK/LuaViewSDK/Classes/lvsdk/LVHeads.h
diff --git a/IOS/SDK/LuaViewSDK/Classes/lvsdk/LVUtil.m b/IOS/SDK/LuaViewSDK/Classes/lvsdk/LVUtil.m

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,6 @@`
`94`	`94`	`*/`
`95`	`95`	`-(NSString) runData:(NSData) data fileName:(NSString*) fileName;`
`96`	`96`
`97`		`--(NSString) runData:(NSData) data fileName:(NSString*) fileName changeGrammar:(BOOL) changeGrammar;`
`98`		`-`
`99`	`97`	`/**`
`100`	`98`	`* 加载签名的脚本文件，读取文件并调用lvL_loadbuffer`
`101`	`99`	`*`
Original file line number	Diff line number	Diff line change
`@@ -153,10 +153,6 @@ -(NSString) runData:(NSData) data fileName:(NSString*) fileName{`
`153`	`153`	`return [self.luaviewCore runData:data fileName:fileName];`
`154`	`154`	`}`
`155`	`155`
`156`		`--(NSString) runData:(NSData) data fileName:(NSString*) fileName changeGrammar:(BOOL) changeGrammar{`
`157`		`- return [self.luaviewCore runData:data fileName:fileName changeGrammar:changeGrammar];`
`158`		`-}`
`159`		`-`
`160`	`156`	`/**`
`161`	`157`	`* 加载签名的脚本文件，读取文件并调用lvL_loadbuffer`
`162`	`158`	`*`