diff options
| author | Bruce Hill <bitbucket@bruce-hill.com> | 2018-07-10 17:34:39 -0700 |
|---|---|---|
| committer | Bruce Hill <bitbucket@bruce-hill.com> | 2018-07-10 17:34:50 -0700 |
| commit | 194146d36591e6c3a964667ead9109bbc6e00524 (patch) | |
| tree | fa2801b488f55f48bbd9a41f49585d125a54b180 /nomsu_compiler.moon | |
| parent | 26a6174f28191fe3364e30c76c1c7a5814e7c5ab (diff) | |
Improving codegen line wrapping.
Diffstat (limited to 'nomsu_compiler.moon')
| -rw-r--r-- | nomsu_compiler.moon | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/nomsu_compiler.moon b/nomsu_compiler.moon index 747ddc6..5f766a8 100644 --- a/nomsu_compiler.moon +++ b/nomsu_compiler.moon @@ -92,7 +92,7 @@ dict = (t)-> setmetatable(t, _dict_mt) MAX_LINE = 80 -- For beautification purposes, try not to make lines much longer than this value NomsuCompiler = setmetatable({}, {__index: (k)=> if _self = rawget(@, "self") then _self[k] else nil}) with NomsuCompiler - .NOMSU_COMPILER_VERSION = 3 + .NOMSU_COMPILER_VERSION = 4 .NOMSU_SYNTAX_VERSION = Parser.version ._ENV = NomsuCompiler .nomsu = NomsuCompiler @@ -157,18 +157,13 @@ with NomsuCompiler return operate_on_text code add_lua_string_bits = (val_or_stmt, code)=> - line_len = 0 cls_str = val_or_stmt == "value" and "LuaCode.Value(" or "LuaCode(" if code.type != "Text" return LuaCode(code.source, cls_str, repr(tostring(code.source)), ", ", @compile(code), ")") add_bit_lua = (lua, bit_lua)-> - line_len += #tostring(bit_lua) - if line_len > MAX_LINE - lua\append ",\n " - line_len = 4 - else - lua\append ", " - lua\append bit_lua + bit_leading_len = #(tostring(bit_lua)\match("^[^\n]*")) + lua\append(lua.trailing_line_len + bit_leading_len > MAX_LINE and ",\n " or ", ") + lua\append(bit_lua) operate_on_text = (text)-> lua = LuaCode.Value(text.source, cls_str, repr(tostring(text.source))) for bit in *text |