文件模块继续小修

Author: MrZ626

fileExtend.lua

@@ -3,7 +3,7 @@ if not love.filesystem then
     return setmetatable({},{
         __index=function(_,k)
             error("attempt to use FILE."..k..", but FILE lib is not loaded (need love.filesystem)")
-        end
+        end,
     })
 end
 
@@ -49,13 +49,10 @@ function FILE.load(path,args,venv)
         'string'
 
     if mode=='luaon' then
-        local lackReturn=s:match("^%s*{")
-        if s:sub(1,1)~='\27' then
-            s="--[["..STRING.simplifyPath(path)..']]'..(lackReturn and 'return' or '')..s
-        else
-            s=(lackReturn and 'return' or '')..s
-        end
-        local func,err_mes=loadstring(s)
+        local rtnPrefix=s:match("^%s*{") and "return" or ""
+        print(rtnPrefix)
+        s=rtnPrefix..s
+        local func,err_mes=loadstring(s,STRING.simplifyPath(path))
         if func then
             setfenv(func,venv or {})
             local res=func()
@@ -64,8 +61,7 @@ function FILE.load(path,args,venv)
             error("FILE.load: Decode error: "..err_mes)
         end
     elseif mode=='lua' then
-        if s:sub(1,1)~='\27' then s="--[["..STRING.simplifyPath(path)..']]'..s end
-        local func,err_mes=loadstring(s)
+        local func,err_mes=loadstring(s,STRING.simplifyPath(path))
         if func then
             local res=func()
             return assert(res,"FILE.load: run error")
@@ -93,8 +89,10 @@ function FILE.save(data,path,args)
     if type(data)=='table' then
         local suc
         if STRING.sArg(args,'-luaon') then
-            suc,data=pcall(STRING.sArg(args,'-expand') and TABLE.dump or TABLE.dumpDeflate,data)
+            local expand=STRING.sArg(args,'-expand')
+            suc,data=pcall(expand and TABLE.dump or TABLE.dumpDeflate,data)
             assert(suc,"FILE.save: Luaon-encoding error: "..data)
+            data=(expand and "return " or "return")..data
         else
             suc,data=pcall(JSON.encode,data)
             assert(suc,"FILE.save: Json-encoding error: "..data)