File tree Expand file tree Collapse file tree 3 files changed +6
-8
lines changed
YukimiScript.CommandLineTool Expand file tree Collapse file tree 3 files changed +6
-8
lines changed Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ Options:
3131 --lib <LIB_DIR> Include external libraries.
3232
3333Targets:
34- lua Lua 5.1 for Lua Runtime 5.1 or LuaJIT
34+ lua Lua 5.1 for Lua Runtime 5.1 or LuaJIT (UTF-8)
3535
3636Example:
3737 ykmc ./Example/main.ykm --target-lua ./main.lua --lib ./Example/lib/
Original file line number Diff line number Diff line change @@ -5,15 +5,13 @@ open YukimiScript.Parser.Dom
55open YukimiScript.Parser .Elements
66
77
8- let generateLua ( functionName : string ) ( x : Dom ) : string =
8+ let generateLua ( x : Dom ) : string =
99 let luaCall ( x : string ) =
1010 let i = x.LastIndexOf '.'
1111 x.[.. i-1 ] + " :" + x.[ i+ 1 ..]
1212
1313 let sb = System.Text.StringBuilder ()
14- sb .Append( " function " )
15- .Append( functionName)
16- .AppendLine( " (api) return {" ) |> ignore
14+ sb.Append( " return function(api) return {" ) |> ignore
1715
1816 x.Scenes
1917 |> List.iter ( fun ( defination , block , debugInfo ) ->
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ let help () =
2020 " --lib <LIB_DIR> Include external libraries."
2121 " "
2222 " Targets:"
23- " lua Lua 5.1 for Lua Runtime 5.1 or LuaJIT"
23+ " lua Lua 5.1 for Lua Runtime 5.1 or LuaJIT (UTF-8) "
2424 " "
2525 " Example:"
2626 " ykmc ./Example/main.ykm --target-lua ./main.lua --lib ./Example/lib/"
@@ -102,7 +102,7 @@ let doAction errStringing =
102102 |> List.iter ( function
103103 | Lua output ->
104104 let functionName = Path.GetFileNameWithoutExtension inputFile
105- let lua = YukimiScript.CodeGen.Lua.generateLua functionName dom
105+ let lua = YukimiScript.CodeGen.Lua.generateLua dom
106106 File.WriteAllText( output, lua, Text.Encoding.UTF8))
107107
108108 | Dgml ( inputDir, outDgml, options) ->
@@ -118,7 +118,7 @@ let doAction errStringing =
118118 |> fun dgml -> File.WriteAllText( outDgml, dgml, Text.Encoding.UTF8)
119119
120120 | Charset ( inputDir, outCharset, options) ->
121- let lib = loadLibs errStringing options.Lib // 注意!!多次导入了lib!!!
121+ let lib = loadLibs errStringing options.Lib
122122 getYkmFiles inputDir
123123 |> Array.map ( fun filePath ->
124124 loadSrc errStringing lib filePath
You can’t perform that action at this time.
0 commit comments