From ec5d730fa0ac26ace7fdd6a1de5fed9e05c133c0 Mon Sep 17 00:00:00 2001
From: Bruce Hill <bitbucket@bruce-hill.com>
Date: Tue, 24 Apr 2018 20:38:25 -0700
Subject: [PATCH] Switched repr() to only return ""-style strings, and not
 [[]]-style, which helps with indenting generated lua code correctly. Also
 made a few ergonomic fixes/changes for line breaking.

---
 core/metaprogramming.nom |  24 ++-
 nomsu_tree.lua           | 339 ++++++++++++++++++++++++++++++++++++++-
 nomsu_tree.moon          |   5 +-
 utils.lua                |  40 +----
 4 files changed, 361 insertions(+), 47 deletions(-)

diff --git a/core/metaprogramming.nom b/core/metaprogramming.nom
index aea756a..f03f8d5 100644
--- a/core/metaprogramming.nom
+++ b/core/metaprogramming.nom
@@ -11,7 +11,13 @@ immediately:
             for i, action in ipairs(\%actions.value) do
                 stubs[i] = action:get_stub(true);
             end
-            lua:append(repr(stubs), ", ", repr(tree.source:get_line()), ", function(tree");
+            stubs = repr(stubs);
+            if #stubs > 80 then
+                lua:append("\\n    ",stubs,",\\n    ");
+            else
+                lua:append(stubs,", ");
+            end
+            lua:append(repr(tree.source:get_line()), ", function(tree");
             local args = {};
             for i,tok in ipairs(\%actions.value[1].value) do
                 if tok.type == "Var" then args[#args+1] = nomsu:var_to_lua_identifier(tok.value); end
@@ -40,7 +46,13 @@ immediately:
             for i, action in ipairs(\%actions.value) do
                 stubs[i] = action:get_stub(true);
             end
-            lua:append(repr(stubs), ", ", repr(tree.source:get_line()), ", function(");
+            stubs = repr(stubs);
+            if #stubs > 80 then
+                lua:append("\\n    ",stubs,",\\n    ");
+            else
+                lua:append(stubs,", ");
+            end
+            lua:append(repr(tree.source:get_line()), ", function(");
             local args = {};
             for i,tok in ipairs(\%actions.value[1].value) do
                 if tok.type == "Var" then args[#args+1] = nomsu:var_to_lua_identifier(tok.value); end
@@ -65,7 +77,13 @@ immediately:
             for i, action in ipairs(\%shorthand.value) do
                 stubs[i] = action:get_stub(true);
             end
-            lua:append(repr(stubs), ", ", repr(tree.source:get_line()), ", function(tree");
+            stubs = repr(stubs);
+            if #stubs > 80 then
+                lua:append("\\n    ",stubs,",\\n    ");
+            else
+                lua:append(stubs,", ");
+            end
+            lua:append(repr(tree.source:get_line()), ", function(tree");
             local args = {};
             for i,tok in ipairs(\%shorthand.value[1].value) do
                 if tok.type == "Var" then args[#args+1] = nomsu:var_to_lua_identifier(tok.value); end
diff --git a/nomsu_tree.lua b/nomsu_tree.lua
index a693d95..b0109d2 100644
--- a/nomsu_tree.lua
+++ b/nomsu_tree.lua
@@ -1,5 +1,6 @@
 local utils = require('utils')
 local re = require('re')
+local lpeg = require('lpeg')
 local repr, stringify, min, max, equivalent, set, is_list, sum
 repr, stringify, min, max, equivalent, set, is_list, sum = utils.repr, utils.stringify, utils.min, utils.max, utils.equivalent, utils.set, utils.is_list, utils.sum
 local immutable = require('immutable')
@@ -63,7 +64,7 @@ Tree("File", {
       if not line_lua then
         error("No lua produced by " .. tostring(repr(line)), 0)
       end
-      if i < #self.value then
+      if i > 1 then
         lua:append("\n")
       end
       lua:convert_to_statements()
@@ -71,11 +72,38 @@ Tree("File", {
     end
     lua:declare_locals()
     return lua
+  end,
+  as_nomsu = function(self, inline)
+    if inline == nil then
+      inline = false
+    end
+    if inline then
+      return nil
+    end
+    local nomsu = Nomsu(self.source)
+    for i, line in ipairs(self.value) do
+      nomsu:append(assert(line:as_nomsu(), "Could not convert line to nomsu: " .. tostring(line)))
+      if i < #self.value then
+        nomsu:append("\n")
+      end
+    end
+    return nomsu
   end
 })
 Tree("Nomsu", {
   as_lua = function(self, nomsu)
     return Lua.Value(self.source, "nomsu:parse(Nomsu(", repr(self.value.source), ", ", repr(tostring(self.value.source:get_text())), ")).value[1]")
+  end,
+  as_nomsu = function(self, inline)
+    if inline == nil then
+      inline = false
+    end
+    local nomsu = self.value:as_nomsu(true)
+    if nomsu == nil and not inline then
+      nomsu = self.value:as_nomsu()
+      return nomsu and Nomsu(self.source, "\\:\n    ", nomsu)
+    end
+    return nomsu and Nomsu(self.source, "\\(", nomsu, ")")
   end
 })
 Tree("Block", {
@@ -86,13 +114,33 @@ Tree("Block", {
     local lua = Lua(self.source)
     for i, line in ipairs(self.value) do
       local line_lua = line:as_lua(nomsu)
-      if i < #self.value then
+      if i > 1 then
         lua:append("\n")
       end
       line_lua:convert_to_statements()
       lua:append(line_lua)
     end
     return lua
+  end,
+  as_nomsu = function(self, inline)
+    if inline == nil then
+      inline = false
+    end
+    if inline then
+      if #self.value == 1 then
+        return self.value[1]:as_nomsu(true)
+      else
+        return nil
+      end
+    end
+    local nomsu = Nomsu(self.source)
+    for i, line in ipairs(self.value) do
+      nomsu:append(assert(line:as_nomsu(), "Could not convert line to nomsu: " .. tostring(line)))
+      if i < #self.value then
+        nomsu:append("\n")
+      end
+    end
+    return nomsu
   end
 })
 local math_expression = re.compile([[ "%" (" " [*/^+-] " %")+ ]])
@@ -228,6 +276,70 @@ Tree("Action", {
       end
     end
     return concat(bits, " ")
+  end,
+  as_nomsu = function(self, inline)
+    if inline == nil then
+      inline = false
+    end
+    if inline then
+      local nomsu = Nomsu(self.source)
+      for i, bit in ipairs(self.value) do
+        if bit.type == "Word" then
+          if i > 1 then
+            nomsu:append(" ")
+          end
+          nomsu:append(bit.value)
+        else
+          local arg_nomsu = bit:as_nomsu(true)
+          if not (arg_nomsu) then
+            return nil
+          end
+          if not (i == 1) then
+            nomsu:append(" ")
+          end
+          if bit.type == "Action" then
+            arg_nomsu:parenthesize()
+          end
+          nomsu:append(arg_nomsu)
+        end
+      end
+      return nomsu
+    else
+      local inline_version = self:as_nomsu(true)
+      if inline_version and #inline_version <= 80 then
+        return inline_version
+      end
+      local nomsu = Nomsu(self.source)
+      local spacer = nil
+      for i, bit in ipairs(self.value) do
+        if spacer then
+          nomsu:append(spacer)
+        end
+        if bit.type == "Word" then
+          nomsu:append(bit.value)
+          spacer = " "
+        else
+          local arg_nomsu = bit:as_nomsu(true)
+          if arg_nomsu and #arg_nomsu < 80 then
+            if bit.type == "Action" then
+              arg_nomsu:parenthesize()
+            end
+            spacer = " "
+          else
+            arg_nomsu = bit:as_nomsu()
+            if not (nomsu) then
+              return nil
+            end
+            if bit.type == "Action" then
+              nomsu:append("\n    ", nomsu)
+            end
+            spacer = "\n.."
+          end
+          nomsu:append(arg_nomsu)
+        end
+      end
+      return nomsu
+    end
   end
 })
 Tree("Text", {
@@ -279,6 +391,62 @@ Tree("Text", {
       lua:parenthesize()
     end
     return lua
+  end,
+  as_nomsu = function(self, inline)
+    if inline == nil then
+      inline = false
+    end
+    if inline then
+      local nomsu = Nomsu(self.source, '"')
+      local _list_0 = self.value
+      for _index_0 = 1, #_list_0 do
+        local bit = _list_0[_index_0]
+        if type(bit) == 'string' then
+          if bit:find("\n") then
+            return nil
+          end
+          nomsu:append((bit:gsub("\\", "\\\\"):gsub("\n", "\\n")))
+        else
+          local interp_nomsu = bit:as_nomsu(true)
+          if interp_nomsu then
+            if bit.type ~= "Word" and bit.type ~= "List" and bit.type ~= "Dict" and bit.type ~= "Text" then
+              interp_nomsu:parenthesize()
+            end
+            nomsu:append("\\", interp_nomsu)
+          else
+            return nil
+          end
+        end
+      end
+      nomsu:append('"')
+      if #nomsu > 80 then
+        return nil
+      end
+    else
+      local nomsu = Nomsu(self.source, '".."\n    ')
+      for i, bit in ipairs(self.value) do
+        if type(bit) == 'string' then
+          nomsu:append((bit:gsub("\\", "\\\\"):gsub("\n", "\n    ")))
+        else
+          if interp_nomsu then
+            if bit.type ~= "Word" and bit.type ~= "List" and bit.type ~= "Dict" and bit.type ~= "Text" then
+              interp_nomsu:parenthesize()
+            end
+            nomsu:append("\\", interp_nomsu)
+          else
+            local interp_nomsu = bit:as_nomsu()
+            if not (interp_nomsu) then
+              return nil
+            end
+            nomsu:append("\\\n    ", interp_nomsu)
+            if i < #self.value then
+              nomsu:append("\n..")
+            end
+          end
+        end
+      end
+      return nomsu
+    end
   end
 })
 Tree("List", {
@@ -292,8 +460,9 @@ Tree("List", {
         error(tostring(line) .. ": Cannot use " .. tostring(colored.yellow(src)) .. " as a list item, since it's not an expression.", 0)
       end
       lua:append(item_lua)
-      local newlines, last_line = tostring(item_lua):match("^(.-)([^\n]*)$")
-      if #newlines > 0 then
+      local item_string = tostring(item_lua)
+      local last_line = item_string:match("[^\n]*$")
+      if item_string:match("\n") then
         line_length = #last_line
       else
         line_length = line_length + #last_line
@@ -310,6 +479,56 @@ Tree("List", {
     end
     lua:append("}")
     return lua
+  end,
+  as_nomsu = function(self, inline)
+    if inline == nil then
+      inline = false
+    end
+    if inline then
+      local nomsu = Nomsu(self.source, "[")
+      for i, item in ipairs(self.value) do
+        local item_nomsu = item:as_nomsu(true)
+        if not (item_nomsu) then
+          return nil
+        end
+        if i > 1 then
+          nomsu:append(", ")
+        end
+        nomsu:append(item_nomsu)
+      end
+      nomsu:append("]")
+      return nomsu
+    else
+      local nomsu = Nomsu(self.source, "[..]")
+      local line = Nomsu(self.source, "\n    ")
+      local _list_0 = self.value
+      for _index_0 = 1, #_list_0 do
+        local item = _list_0[_index_0]
+        local item_nomsu = item:as_nomsu(true)
+        if item_nomsu and #line + #", " + #item_nomsu <= 80 then
+          if #line.bits > 1 then
+            line:append(", ")
+          end
+          line:append(item_nomsu)
+        else
+          if not (item_nomsu) then
+            item_nomsu = item:as_nomsu()
+            if not (item_nomsu) then
+              return nil
+            end
+          end
+          if #line.bits > 1 then
+            nomsu:append(line)
+            line = Nomsu(bit.source, "\n    ")
+          end
+          line:append(item_nomsu)
+        end
+      end
+      if #line.bits > 1 then
+        nomsu:append(line)
+      end
+      return nomsu
+    end
   end
 })
 Tree("Dict", {
@@ -353,6 +572,70 @@ Tree("Dict", {
     end
     lua:append("}")
     return lua
+  end,
+  as_nomsu = function(self, inline)
+    if inline == nil then
+      inline = false
+    end
+    if inline then
+      local nomsu = Nomsu(self.source, "{")
+      for i, entry in ipairs(self.value) do
+        local key_nomsu = entry.key:as_nomsu(true)
+        if not (key_nomsu) then
+          return nil
+        end
+        if entry.key.type == "Action" then
+          key_nomsu:parenthesize()
+        end
+        local value_nomsu = entry.value:as_nomsu(true)
+        if not (value_nomsu) then
+          return nil
+        end
+        if i > 1 then
+          nomsu:append(", ")
+        end
+        nomsu:append(key_nomsu, ":", value_nomsu)
+      end
+      nomsu:append("}")
+      return nomsu
+    else
+      local nomsu = Nomsu(self.source, "{..}")
+      local line = Nomsu(self.source, "\n    ")
+      local _list_0 = self.value
+      for _index_0 = 1, #_list_0 do
+        local entry = _list_0[_index_0]
+        local key_nomsu = entry.key:as_nomsu(true)
+        if not (key_nomsu) then
+          return nil
+        end
+        if entry.key.type == "Action" then
+          key_nomsu:parenthesize()
+        end
+        local value_nomsu = entry.value:as_nomsu(true)
+        if value_nomsu and #line + #", " + #key_nomsu + #":" + #value_nomsu <= 80 then
+          if #line.bits > 1 then
+            line:append(", ")
+          end
+          line:append(key_nomsu, ":", value_nomsu)
+        else
+          if not (value_nomsu) then
+            value_nomsu = entry.value:as_nomsu()
+            if not (value_nomsu) then
+              return nil
+            end
+          end
+          if #line.bits > 1 then
+            nomsu:append(line)
+            line = Nomsu(bit.source, "\n    ")
+          end
+          line:append(key_nomsu, ":", value_nomsu)
+        end
+      end
+      if #line.bits > 1 then
+        nomsu:append(line)
+      end
+      return nomsu
+    end
   end
 })
 Tree("IndexChain", {
@@ -392,11 +675,34 @@ Tree("IndexChain", {
       end
     end
     return lua
+  end,
+  as_nomsu = function(self, inline)
+    if inline == nil then
+      inline = false
+    end
+    local nomsu = Nomsu(self.source)
+    for i, bit in ipairs(self.value) do
+      if i > 1 then
+        nomsu:append(".")
+      end
+      local bit_nomsu = bit:as_nomsu(true)
+      if not (bit_nomsu) then
+        return nil
+      end
+      nomsu:append(bit_nomsu)
+    end
+    return nomsu
   end
 })
 Tree("Number", {
   as_lua = function(self, nomsu)
     return Lua.Value(self.source, tostring(self.value))
+  end,
+  as_nomsu = function(self, inline)
+    if inline == nil then
+      inline = false
+    end
+    return Nomsu(self.source, tostring(self.value))
   end
 })
 Tree("Var", {
@@ -409,16 +715,41 @@ Tree("Var", {
       end
     end))
     return Lua.Value(self.source, lua_id)
+  end,
+  as_nomsu = function(self, inline)
+    if inline == nil then
+      inline = false
+    end
+    return Nomsu(self.source, "%", self.value)
   end
 })
 Tree("Word", {
   as_lua = function(self, nomsu)
     return error("Attempt to convert Word to lua")
+  end,
+  as_nomsu = function(self, inline)
+    if inline == nil then
+      inline = false
+    end
+    return Nomsu(self.source, self.value)
   end
 })
 Tree("Comment", {
   as_lua = function(self, nomsu)
     return Lua(self.source, "--" .. self.value:gsub("\n", "\n--") .. "\n")
+  end,
+  as_nomsu = function(self, inline)
+    if inline == nil then
+      inline = false
+    end
+    if inline then
+      return nil
+    end
+    if self.value:match("\n") then
+      return Nomsu(self.source, "#..", self.value:gsub("\n", "\n    "))
+    else
+      return Nomsu(self.source, "#", self.value)
+    end
   end
 })
 return Types
diff --git a/nomsu_tree.moon b/nomsu_tree.moon
index fcef992..ff71c54 100644
--- a/nomsu_tree.moon
+++ b/nomsu_tree.moon
@@ -278,8 +278,9 @@ Tree "List",
                 line, src = item.source\get_line!, item.source\get_text!
                 error "#{line}: Cannot use #{colored.yellow src} as a list item, since it's not an expression.", 0
             lua\append item_lua
-            newlines, last_line = tostring(item_lua)\match("^(.-)([^\n]*)$")
-            if #newlines > 0
+            item_string = tostring(item_lua)
+            last_line = item_string\match("[^\n]*$")
+            if item_string\match("\n")
                 line_length = #last_line
             else
                 line_length += #last_line
diff --git a/utils.lua b/utils.lua
index 3374e4a..0d0e034 100644
--- a/utils.lua
+++ b/utils.lua
@@ -25,25 +25,6 @@ local function size(t)
     return n
 end
 
-local _quote_state = {}
-local max = math.max
-local _quote_patt = re.compile("(({'\n' / '\"' / \"'\" / '\\'}->mark_char) / (']' ({'='*}->mark_eq) (']' / !.)) / .)*",
-    {mark_char=function(q)
-        if q == "\n" or q == "\\" then
-            _quote_state["'"] = false
-            _quote_state['"'] = false
-            if _quote_state.min_eq == nil then
-                _quote_state.min_eq = 0
-            end
-        elseif q == "'" then
-            _quote_state["'"] = false
-        elseif q == '"' then
-            _quote_state['"'] = false
-        end
-    end,
-    mark_eq=function(eq)
-        _quote_state.min_eq = max(_quote_state.min_eq or 0, #eq+1)
-    end})
 local function repr(x, depth)
     -- Create a string representation of the object that is close to the lua code that will
     -- reproduce the object (similar to Python's "repr" function)
@@ -74,25 +55,8 @@ local function repr(x, depth)
         if x == "\n" then
             return "'\\n'"
         end
-        _quote_state = {}
-        _quote_patt:match(x)
-        if _quote_state["'"] ~= false then
-            return "\'" .. x .. "\'"
-        elseif _quote_state['"'] ~= false then
-            return "\"" .. x .. "\""
-        else
-            local eq = ("="):rep(_quote_state.min_eq or 0)
-            -- BEWARE!!!
-            -- Lua's parser and syntax are dumb, so Lua interprets x[[=[asdf]=]] as
-            -- a function call to x (i.e. x("=[asdf]=")), instead of indexing x
-            -- (i.e. x["asdf"]), which it obviously should be. This can be fixed by
-            -- slapping spaces or parens around the [=[asdf]=].
-            if x:sub(1, 1) == "\n" then
-                return "["..eq.."[\n"..x.."]"..eq.."]"
-            else
-                return "["..eq.."["..x.."]"..eq.."]"
-            end
-        end
+        local escaped = x:gsub("\\", "\\\\"):gsub("\n","\\n"):gsub('"', '\\"')
+        return '"'..escaped..'"'
     else
         return tostring(x)
     end