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

Improving nomsu codegen.

Browse Source
This commit is contained in:
Bruce Hill 2018-07-20 20:13:01 -07:00
parent 385beb4998
commit 2577c4511e
4 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nomsu_compiler.lua
View File

@ -807,15 +807,14 @@ do
end end
return nomsu return nomsu
elseif "Text" == _exp_0 then elseif "Text" == _exp_0 then
local make_text local add_text
make_text = function(tree) add_text = function(nomsu, tree)
local nomsu = NomsuCode(tree.source)
for i, bit in ipairs(tree) do for i, bit in ipairs(tree) do
if type(bit) == 'string' then if type(bit) == 'string' then
bit = Parser.inline_escape(bit) local escaped = Parser.inline_escape(bit)
nomsu:append(bit) nomsu:append(Parser.inline_escape(bit))
elseif bit.type == "Text" then elseif bit.type == "Text" then
nomsu:append(make_text(bit)) add_text(nomsu, bit)
else else
local interp_nomsu = recurse(bit, nomsu) local interp_nomsu = recurse(bit, nomsu)
if bit.type ~= "Var" and bit.type ~= "List" and bit.type ~= "Dict" then if bit.type ~= "Var" and bit.type ~= "List" and bit.type ~= "Dict" then
@ -829,9 +828,10 @@ do
check(len, nomsu, tree) check(len, nomsu, tree)
end end
end end
return nomsu
end end
return NomsuCode(tree.source, '"', make_text(tree), '"') local nomsu = NomsuCode(tree.source)
add_text(nomsu, tree)
return NomsuCode(tree.source, '"', nomsu, '"')
elseif "List" == _exp_0 then elseif "List" == _exp_0 then
local nomsu = NomsuCode(tree.source, "[") local nomsu = NomsuCode(tree.source, "[")
for i, item in ipairs(tree) do for i, item in ipairs(tree) do
@ -1109,6 +1109,7 @@ do
nomsu:append(pop_comments(tree.source.stop, '\n')) nomsu:append(pop_comments(tree.source.stop, '\n'))
return NomsuCode(tree.source, ":\n ", nomsu) return NomsuCode(tree.source, ":\n ", nomsu)
elseif "Text" == _exp_0 then elseif "Text" == _exp_0 then
local max_line = math.floor(1.5 * MAX_LINE)
local add_text local add_text
add_text = function(nomsu, tree) add_text = function(nomsu, tree)
for i, bit in ipairs(tree) do for i, bit in ipairs(tree) do
@ -1118,12 +1119,12 @@ do
for j, line in ipairs(bit_lines) do for j, line in ipairs(bit_lines) do
if j > 1 then if j > 1 then
nomsu:append("\n") nomsu:append("\n")
elseif #line > 10 and nomsu:trailing_line_len() > MAX_LINE then elseif #line > 10 and nomsu:trailing_line_len() > max_line then
nomsu:append("\\\n..") nomsu:append("\\\n..")
end end
while #line > 0 do while #line > 0 do
local space = MAX_LINE - nomsu:trailing_line_len() local space = max_line - nomsu:trailing_line_len()
local split = find(line, " ", space, true) local split = find(line, "[%p%s]", space)
if not split or split > space + 10 then if not split or split > space + 10 then
split = space + 10 split = space + 10
end end

22
nomsu_compiler.moon
View File

@ -525,14 +525,13 @@ with NomsuCompiler
return nomsu return nomsu
when "Text" when "Text"
make_text = (tree)-> add_text = (nomsu, tree)->
nomsu = NomsuCode(tree.source)
for i, bit in ipairs tree for i, bit in ipairs tree
if type(bit) == 'string' if type(bit) == 'string'
bit = Parser.inline_escape(bit) escaped = Parser.inline_escape(bit)
nomsu\append bit nomsu\append Parser.inline_escape(bit)
elseif bit.type == "Text" elseif bit.type == "Text"
nomsu\append(make_text(bit)) add_text(nomsu, bit)
else else
interp_nomsu = recurse(bit, nomsu) interp_nomsu = recurse(bit, nomsu)
if bit.type != "Var" and bit.type != "List" and bit.type != "Dict" if bit.type != "Var" and bit.type != "List" and bit.type != "Dict"
@ -541,8 +540,9 @@ with NomsuCompiler
interp_nomsu\parenthesize! interp_nomsu\parenthesize!
nomsu\append "\\", interp_nomsu nomsu\append "\\", interp_nomsu
check(len, nomsu, tree) if check check(len, nomsu, tree) if check
return nomsu nomsu = NomsuCode(tree.source)
return NomsuCode(tree.source, '"', make_text(tree), '"') add_text(nomsu, tree)
return NomsuCode(tree.source, '"', nomsu, '"')
when "List" when "List"
nomsu = NomsuCode(tree.source, "[") nomsu = NomsuCode(tree.source, "[")
@ -720,6 +720,8 @@ with NomsuCompiler
return NomsuCode(tree.source, ":\n ", nomsu) return NomsuCode(tree.source, ":\n ", nomsu)
when "Text" when "Text"
-- Multi-line text has more generous wrap margins
max_line = math.floor(1.5*MAX_LINE)
add_text = (nomsu, tree)-> add_text = (nomsu, tree)->
for i, bit in ipairs tree for i, bit in ipairs tree
if type(bit) == 'string' if type(bit) == 'string'
@ -728,12 +730,12 @@ with NomsuCompiler
for j, line in ipairs bit_lines for j, line in ipairs bit_lines
if j > 1 if j > 1
nomsu\append "\n" nomsu\append "\n"
elseif #line > 10 and nomsu\trailing_line_len! > MAX_LINE elseif #line > 10 and nomsu\trailing_line_len! > max_line
nomsu\append "\\\n.." nomsu\append "\\\n.."
while #line > 0 while #line > 0
space = MAX_LINE - nomsu\trailing_line_len! space = max_line - nomsu\trailing_line_len!
split = find(line, " ", space, true) split = find(line, "[%p%s]", space)
if not split or split > space + 10 if not split or split > space + 10
split = space + 10 split = space + 10
if #line - split < 10 if #line - split < 10

2
parser.lua
View File

@ -234,7 +234,7 @@ end
Parser.is_identifier = function(s) Parser.is_identifier = function(s)
return not not (NOMSU_DEFS.ident_char ^ 1 * -1):match(s) return not not (NOMSU_DEFS.ident_char ^ 1 * -1):match(s)
end end
local inline_escaper = re.compile("{~ (%utf8_char / ('\\' -> '\\\\') / [ -~] / ('\n' -> '\\n') / ('\t' -> '\\t') / ('\b' -> '\\b') / ('\a' -> '\\a') / ('\v' -> '\\v') / ('\f' -> '\\f') / ('\r' -> '\\r') / ('\"' -> '\\\"') / (. -> escape))* ~}", { local inline_escaper = re.compile("{~ (%utf8_char / ('\"' -> '\\\"') / ('\n' -> '\\n') / ('\t' -> '\\t') / ('\b' -> '\\b') / ('\a' -> '\\a') / ('\v' -> '\\v') / ('\f' -> '\\f') / ('\r' -> '\\r') / ('\\' -> '\\\\') / ([^ -~] -> escape) / .)* ~}", {
utf8_char = NOMSU_DEFS.utf8_char, utf8_char = NOMSU_DEFS.utf8_char,
escape = (function(self) escape = (function(self)
return ("\\%03d"):format(self:byte()) return ("\\%03d"):format(self:byte())

2
parser.moon
View File

@ -144,7 +144,7 @@ Parser.is_operator = (s)->
Parser.is_identifier = (s)-> Parser.is_identifier = (s)->
return not not (NOMSU_DEFS.ident_char^1 * -1)\match(s) return not not (NOMSU_DEFS.ident_char^1 * -1)\match(s)
inline_escaper = re.compile "{~ (%utf8_char / ('\\' -> '\\\\') / [ -~] / ('\n' -> '\\n') / ('\t' -> '\\t') / ('\b' -> '\\b') / ('\a' -> '\\a') / ('\v' -> '\\v') / ('\f' -> '\\f') / ('\r' -> '\\r') / ('\"' -> '\\\"') / (. -> escape))* ~}", {utf8_char: NOMSU_DEFS.utf8_char, escape:(=> ("\\%03d")\format(@byte!))} inline_escaper = re.compile "{~ (%utf8_char / ('\"' -> '\\\"') / ('\n' -> '\\n') / ('\t' -> '\\t') / ('\b' -> '\\b') / ('\a' -> '\\a') / ('\v' -> '\\v') / ('\f' -> '\\f') / ('\r' -> '\\r') / ('\\' -> '\\\\') / ([^ -~] -> escape) / .)* ~}", {utf8_char: NOMSU_DEFS.utf8_char, escape:(=> ("\\%03d")\format(@byte!))}
Parser.inline_escape = (s)-> Parser.inline_escape = (s)->
return inline_escaper\match(s) return inline_escaper\match(s)
escaper = re.compile "{~ (%utf8_char / ('\\' -> '\\\\') / [\n\r\t -~] / (. -> escape))* ~}", {utf8_char: NOMSU_DEFS.utf8_char, escape:(=> ("\\%03d")\format(@byte!))} escaper = re.compile "{~ (%utf8_char / ('\\' -> '\\\\') / [\n\r\t -~] / (. -> escape))* ~}", {utf8_char: NOMSU_DEFS.utf8_char, escape:(=> ("\\%03d")\format(@byte!))}