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

Fixed tree_to_nomsu to produce "blah\%x" instead of "blah\(%x)"

Browse Source
This commit is contained in:
Bruce Hill 2018-06-13 14:53:47 -07:00
parent 12d52f743c
commit 282565a309
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nomsu.lua
View File

@ -904,11 +904,11 @@ do
for _index_0 = 1, #tree do for _index_0 = 1, #tree do
local bit = tree[_index_0] local bit = tree[_index_0]
if type(bit) == 'string' then if type(bit) == 'string' then
nomsu:append((gsub(gsub(bit, "\\", "\\\\"), "\n", "\\n"))) nomsu:append((gsub(gsub(gsub(bit, "\\", "\\\\"), "\n", "\\n"), '"', '\\"')))
else else
local interp_nomsu = self:tree_to_nomsu(bit, true) local interp_nomsu = self:tree_to_nomsu(bit, true)
if interp_nomsu then if interp_nomsu then
if bit.type ~= "List" and bit.type ~= "Dict" and bit.type ~= "Text" then if bit.type ~= "Var" and bit.type ~= "List" and bit.type ~= "Dict" and bit.type ~= "Text" then
interp_nomsu:parenthesize() interp_nomsu:parenthesize()
end end
nomsu:append("\\", interp_nomsu) nomsu:append("\\", interp_nomsu)
@ -960,7 +960,7 @@ do
else else
local interp_nomsu = self:tree_to_nomsu(bit, true) local interp_nomsu = self:tree_to_nomsu(bit, true)
if interp_nomsu then if interp_nomsu then
if bit.type ~= "List" and bit.type ~= "Dict" and bit.type ~= "Text" then if bit.type ~= "Var" and bit.type ~= "List" and bit.type ~= "Dict" and bit.type ~= "Text" then
interp_nomsu:parenthesize() interp_nomsu:parenthesize()
end end
nomsu:append("\\", interp_nomsu) nomsu:append("\\", interp_nomsu)

6
nomsu.moon
View File

@ -751,11 +751,11 @@ class NomsuCompiler
for bit in *tree for bit in *tree
if type(bit) == 'string' if type(bit) == 'string'
-- TODO: unescape better? -- TODO: unescape better?
nomsu\append (gsub(gsub(bit,"\\","\\\\"),"\n","\\n")) nomsu\append (gsub(gsub(gsub(bit,"\\","\\\\"),"\n","\\n"),'"','\\"'))
else else
interp_nomsu = @tree_to_nomsu(bit, true) interp_nomsu = @tree_to_nomsu(bit, true)
if interp_nomsu if interp_nomsu
if bit.type != "List" and bit.type != "Dict" and bit.type != "Text" if bit.type != "Var" and bit.type != "List" and bit.type != "Dict" and bit.type != "Text"
interp_nomsu\parenthesize! interp_nomsu\parenthesize!
nomsu\append "\\", interp_nomsu nomsu\append "\\", interp_nomsu
else return nil else return nil
@ -791,7 +791,7 @@ class NomsuCompiler
else else
interp_nomsu = @tree_to_nomsu(bit, true) interp_nomsu = @tree_to_nomsu(bit, true)
if interp_nomsu if interp_nomsu
if bit.type != "List" and bit.type != "Dict" and bit.type != "Text" if bit.type != "Var" and bit.type != "List" and bit.type != "Dict" and bit.type != "Text"
interp_nomsu\parenthesize! interp_nomsu\parenthesize!
nomsu\append "\\", interp_nomsu nomsu\append "\\", interp_nomsu
else else