Bruce/nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added text comprehensions (in the style of the list/dict ones)

Browse Source
This commit is contained in:
Bruce Hill 2018-11-29 14:23:02 -08:00
parent 04c80440fb
commit 7a7dcefc44
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nomsu.4.peg
View File

@ -171,7 +171,7 @@ indented_plain_text (Text):
~} ~}
text_interpolation: text_interpolation:
inline_text_interpolation / ("\" indented_expression (blank_lines =curr_indent "..")?) inline_text_interpolation / ("\" (indented_expression / indented_block) (blank_lines =curr_indent "..")?)
number (Number): number (Number):
(&("-"? "0x" [0-9a-fA-F]+) {:hex: '' -> 'yes' :})? (&("-"? "0x" [0-9a-fA-F]+) {:hex: '' -> 'yes' :})?

3
nomsu_compiler.lua
View File

@ -330,6 +330,9 @@ local compile = setmetatable({
string_buffer = "" string_buffer = ""
end end
local bit_lua = compile(bit) local bit_lua = compile(bit)
if bit.type == "Block" then
bit_lua = LuaCode:from(bit.source, "(function()", "\n local _buffer = List{}", "\n local function add(bit) _buffer:add(bit) end", "\n local function join_with(glue) _buffer = _buffer:joined_with(glue) end", "\n ", bit_lua, "\n if lua_type_of(_buffer) == 'table' then _buffer = _buffer:joined() end", "\n return _buffer", "\nend)()")
end
if lua:trailing_line_len() + #bit_lua:text() > MAX_LINE then if lua:trailing_line_len() + #bit_lua:text() > MAX_LINE then
lua:append("\n ") lua:append("\n ")
end end

10
nomsu_compiler.moon
View File

@ -227,7 +227,17 @@ compile = setmetatable({
lua\append string_buffer lua\append string_buffer
added += 1 added += 1
string_buffer = "" string_buffer = ""
bit_lua = compile(bit) bit_lua = compile(bit)
if bit.type == "Block"
bit_lua = LuaCode\from bit.source, "(function()",
"\n local _buffer = List{}",
"\n local function add(bit) _buffer:add(bit) end",
"\n local function join_with(glue) _buffer = _buffer:joined_with(glue) end",
"\n ", bit_lua,
"\n if lua_type_of(_buffer) == 'table' then _buffer = _buffer:joined() end",
"\n return _buffer",
"\nend)()"
if lua\trailing_line_len! + #bit_lua\text! > MAX_LINE if lua\trailing_line_len! + #bit_lua\text! > MAX_LINE
lua\append "\n " lua\append "\n "
if added > 0 then lua\append ".." if added > 0 then lua\append ".."