Skip to content

Commit 939710a

Browse files
committed
Lua Codegen bug fixed
1 parent 62ad249 commit 939710a

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Options:
3131
--lib <LIB_DIR> Include external libraries.
3232
3333
Targets:
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
3636
Example:
3737
ykmc ./Example/main.ykm --target-lua ./main.lua --lib ./Example/lib/

YukimiScript.CodeGen.Lua/Lua.fs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ open YukimiScript.Parser.Dom
55
open 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) ->

YukimiScript.CommandLineTool/Program.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff 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

0 commit comments

Comments
 (0)