rufus-lua-moon 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64a42dafd47150d25613181b8f9898f7456e89ce
-  data.tar.gz: 22e9a59e022d27df880130803b6fa7a2aad8be10
+  metadata.gz: e343762d37d17e9fc502fa6221ed3e376cb1a1a7
+  data.tar.gz: 3d1b775db07fa27e42fbb475ba48bd06421b8822
 SHA512:
-  metadata.gz: 602ddba5e7e2abfca7c15ec506332e19ab5ddc7f81a3dc454488ced77b97e6559d9d9381cabbac08dde5cf6a86be575e68155ce7b3a7580a7187e714a0b66b32
-  data.tar.gz: ff8982b11792e45e2d21007527d0b0f84a8f1e58fa2e848caf05e9561255450822bc3868de0e36999b8d5e4662dc19b2b24862a0840a88ab35e8ffc86b044c78
+  metadata.gz: 13b413ebc32760c0d5bc13ea70450957554491bb46d34fea38aea574ab2602bd6f27aedfce728c68a8fcad10410b36dd2a854163e8e793ebb06754e15771cafe
+  data.tar.gz: 9534f6e6fea762307abf43fb83029e7740444e013a295f8e9829f486db66cfc8f4e9f22e0415e815274fb690dcfd9a274a136a7aeecb124a32eb3ad76b9b17b5

data/vendor/lua/moon/init.moon

@@ -134,3 +134,4 @@ fold = (items, fn)->
   else
     items[1]
 
+nil

data/vendor/lua/moonscript/compile.lua

@@ -18,12 +18,142 @@ do
 end
 local concat, insert = table.concat, table.insert
 local pos_to_line, get_closest_line, trim = util.pos_to_line, util.get_closest_line, util.trim
-local Line
-Line = (function()
+local mtype = util.moon.type
+local Line, Lines
+do
   local _parent_0 = nil
   local _base_0 = {
+    mark_pos = function(self, pos, line)
+      if line == nil then
+        line = #self
+      end
+      if not (self.posmap[line]) then
+        self.posmap[line] = pos
+      end
+    end,
+    add = function(self, item)
+      local _exp_0 = mtype(item)
+      if Line == _exp_0 then
+        item:render(self)
+      elseif Block == _exp_0 then
+        item:render(self)
+      else
+        self[#self + 1] = item
+      end
+      return self
+    end,
+    flatten_posmap = function(self, line_no, out)
+      if line_no == nil then
+        line_no = 0
+      end
+      if out == nil then
+        out = { }
+      end
+      local posmap = self.posmap
+      for i, l in ipairs(self) do
+        local _exp_0 = type(l)
+        if "table" == _exp_0 then
+          local _
+          _, line_no = l:flatten_posmap(line_no, out)
+        elseif "string" == _exp_0 then
+          line_no = line_no + 1
+          out[line_no] = posmap[i]
+        end
+      end
+      return out, line_no
+    end,
+    flatten = function(self, indent, buffer)
+      if indent == nil then
+        indent = nil
+      end
+      if buffer == nil then
+        buffer = { }
+      end
+      for i = 1, #self do
+        local l = self[i]
+        local _exp_0 = type(l)
+        if "string" == _exp_0 then
+          if indent then
+            insert(buffer, indent)
+          end
+          insert(buffer, l)
+          if "string" == type(self[i + 1]) then
+            local lc = l:sub(-1)
+            if (lc == ")" or lc == "]") and self[i + 1]:sub(1, 1) == "(" then
+              insert(buffer, ";")
+            end
+          end
+          insert(buffer, "\n")
+          local last = l
+        elseif "table" == _exp_0 then
+          l:flatten(indent and indent .. indent_char or indent_char, buffer)
+        end
+      end
+      return buffer
+    end,
+    __tostring = function(self)
+      local strip
+      strip = function(t)
+        if "table" == type(t) then
+          return (function()
+            local _accum_0 = { }
+            local _len_0 = 0
+            local _list_0 = t
+            for _index_0 = 1, #_list_0 do
+              local v = _list_0[_index_0]
+              _len_0 = _len_0 + 1
+              _accum_0[_len_0] = strip(v)
+            end
+            return _accum_0
+          end)()
+        else
+          return t
+        end
+      end
+      return "Lines<" .. tostring(util.dump(strip(self)):sub(1, -2)) .. ">"
+    end
+  }
+  _base_0.__index = _base_0
+  if _parent_0 then
+    setmetatable(_base_0, _parent_0.__base)
+  end
+  local _class_0 = setmetatable({
+    __init = function(self)
+      self.posmap = { }
+    end,
+    __base = _base_0,
+    __name = "Lines",
+    __parent = _parent_0
+  }, {
+    __index = function(cls, name)
+      local val = rawget(_base_0, name)
+      if val == nil and _parent_0 then
+        return _parent_0[name]
+      else
+        return val
+      end
+    end,
+    __call = function(cls, ...)
+      local _self_0 = setmetatable({}, _base_0)
+      cls.__init(_self_0, ...)
+      return _self_0
+    end
+  })
+  _base_0.__class = _class_0
+  if _parent_0 and _parent_0.__inherited then
+    _parent_0.__inherited(_parent_0, _class_0)
+  end
+  Lines = _class_0
+end
+do
+  local _parent_0 = nil
+  local _base_0 = {
+    pos = nil,
     _append_single = function(self, item)
-      if util.moon.type(item) == Line then
+      if Line == mtype(item) then
+        if not (self.pos) then
+          self.pos = item.pos
+        end
         local _list_0 = item
         for _index_0 = 1, #_list_0 do
           value = _list_0[_index_0]
@@ -41,6 +171,7 @@ Line = (function()
           insert(self, delim)
         end
       end
+      return nil
     end,
     append = function(self, ...)
       local _list_0 = {
@@ -52,20 +183,40 @@ Line = (function()
       end
       return nil
     end,
-    render = function(self)
-      local buff = { }
-      for i = 1, #self do
-        local c = self[i]
-        insert(buff, (function()
-          if util.moon.type(c) == Block then
-            c:bubble()
-            return c:render()
-          else
-            return c
+    render = function(self, buffer)
+      local current = { }
+      local add_current
+      add_current = function()
+        buffer:add(concat(current))
+        return buffer:mark_pos(self.pos)
+      end
+      local _list_0 = self
+      for _index_0 = 1, #_list_0 do
+        local chunk = _list_0[_index_0]
+        local _exp_0 = mtype(chunk)
+        if Block == _exp_0 then
+          local _list_1 = chunk:render(Lines())
+          for _index_1 = 1, #_list_1 do
+            local block_chunk = _list_1[_index_1]
+            if "string" == type(block_chunk) then
+              insert(current, block_chunk)
+            else
+              add_current()
+              buffer:add(block_chunk)
+              current = { }
+            end
           end
-        end)())
+        else
+          insert(current, chunk)
+        end
+      end
+      if #current > 0 then
+        add_current()
       end
-      return concat(buff)
+      return buffer
+    end,
+    __tostring = function(self)
+      return "Line<" .. tostring(util.dump(self):sub(1, -2)) .. ">"
     end
   }
   _base_0.__index = _base_0
@@ -97,9 +248,12 @@ Line = (function()
     end
   })
   _base_0.__class = _class_0
-  return _class_0
-end)()
-Block = (function()
+  if _parent_0 and _parent_0.__inherited then
+    _parent_0.__inherited(_parent_0, _class_0)
+  end
+  Line = _class_0
+end
+do
   local _parent_0 = nil
   local _base_0 = {
     header = "do",
@@ -107,17 +261,13 @@ Block = (function()
     export_all = false,
     export_proper = false,
     __tostring = function(self)
-      return "Block<> <- " .. tostring(self.parent)
-    end,
-    bubble = function(self, other)
-      if other == nil then
-        other = self.parent
+      local h
+      if "string" == type(self.header) then
+        h = self.header
+      else
+        h = unpack(self.header:render({ }))
       end
-      local has_varargs = self.has_varargs and not self:has_name("...")
-      other.has_varargs = other.has_varargs or has_varargs
-    end,
-    line_table = function(self)
-      return self._posmap
+      return "Block<" .. tostring(h) .. "> <- " .. tostring(self.parent)
     end,
     set = function(self, name, value)
       self._state[name] = value
@@ -125,6 +275,20 @@ Block = (function()
     get = function(self, name)
       return self._state[name]
     end,
+    listen = function(self, name, fn)
+      self._listeners[name] = fn
+    end,
+    unlisten = function(self, name)
+      self._listeners[name] = nil
+    end,
+    send = function(self, name, ...)
+      do
+        local fn = self._listeners[name]
+        if fn then
+          return fn(self, ...)
+        end
+      end
+    end,
     declare = function(self, names)
       local undeclared = (function()
         local _accum_0 = { }
@@ -134,7 +298,7 @@ Block = (function()
           local name = _list_0[_index_0]
           local is_local = false
           local real_name
-          local _exp_0 = util.moon.type(name)
+          local _exp_0 = mtype(name)
           if LocalName == _exp_0 then
             is_local = true
             real_name = name:get_name(self)
@@ -164,11 +328,15 @@ Block = (function()
     whitelist_names = function(self, names)
       self._name_whitelist = Set(names)
     end,
-    put_name = function(self, name)
-      if util.moon.type(name) == NameProxy then
+    put_name = function(self, name, ...)
+      value = ...
+      if select("#", ...) == 0 then
+        value = true
+      end
+      if NameProxy == mtype(name) then
         name = name:get_name(self)
       end
-      self._names[name] = true
+      self._names[name] = value
     end,
     has_name = function(self, name, skip_exports)
       if not skip_exports then
@@ -219,99 +387,26 @@ Block = (function()
       })
       return name
     end,
-    mark_pos = function(self, node)
-      if node[-1] then
-        self.last_pos = node[-1]
-        if not self._posmap[self.current_line] then
-          self._posmap[self.current_line] = self.last_pos
-        end
-      end
+    add = function(self, item)
+      self._lines:add(item)
+      return item
     end,
-    add_line_text = function(self, text)
-      return insert(self._lines, text)
-    end,
-    append_line_table = function(self, sub_table, offset)
-      offset = offset + self.current_line
-      for line, source in pairs(sub_table) do
-        local line = line + offset
-        if not self._posmap[line] then
-          self._posmap[line] = source
-        end
-      end
-    end,
-    add_line_tables = function(self, line)
-      local _list_0 = line
-      for _index_0 = 1, #_list_0 do
-        local chunk = _list_0[_index_0]
-        if util.moon.type(chunk) == Block then
-          local current = chunk
-          while current do
-            if util.moon.type(current.header) == Line then
-              self:add_line_tables(current.header)
-            end
-            self:append_line_table(current:line_table(), 0)
-            self.current_line = self.current_line + current.current_line
-            current = current.next
-          end
-        end
-      end
-    end,
-    add = function(self, line)
-      local t = util.moon.type(line)
-      if t == "string" then
-        self:add_line_text(line)
-      elseif t == Block then
-        self:add(self:line(line))
-      elseif t == Line then
-        self:add_line_tables(line)
-        self:add_line_text(line:render())
-        self.current_line = self.current_line + 1
+    render = function(self, buffer)
+      buffer:add(self.header)
+      buffer:mark_pos(self.pos)
+      if self.next then
+        buffer:add(self._lines)
+        self.next:render(buffer)
       else
-        error("Adding unknown item")
-      end
-      return nil
-    end,
-    _insert_breaks = function(self)
-      for i = 1, #self._lines - 1 do
-        local left, right = self._lines[i], self._lines[i + 1]
-        if left:sub(-1) == ")" and right:sub(1, 1) == "(" then
-          self._lines[i] = self._lines[i] .. ";"
-        end
-      end
-    end,
-    render = function(self)
-      local flatten
-      flatten = function(line)
-        if type(line) == "string" then
-          return line
+        if #self._lines == 0 and "string" == type(buffer[#buffer]) then
+          buffer[#buffer] = buffer[#buffer] .. (" " .. (unpack(Lines():add(self.footer))))
         else
-          return line:render()
+          buffer:add(self._lines)
+          buffer:add(self.footer)
+          buffer:mark_pos(self.pos)
         end
       end
-      local header = flatten(self.header)
-      if #self._lines == 0 then
-        local footer = flatten(self.footer)
-        return concat({
-          header,
-          footer
-        }, " ")
-      end
-      local indent = indent_char:rep(self.indent)
-      if not self.delim then
-        self:_insert_breaks()
-      end
-      local body = indent .. concat(self._lines, (self.delim or "") .. "\n" .. indent)
-      return concat({
-        header,
-        body,
-        indent_char:rep(self.indent - 1) .. (function()
-          if self.next then
-            return self.next:render()
-          else
-            return flatten(self.footer)
-          end
-        end)()
-      }, "\n")
+      return buffer
     end,
     block = function(self, header, footer)
       return Block(self, header, footer)
@@ -334,19 +429,29 @@ Block = (function()
       return self:value(node)
     end,
     value = function(self, node, ...)
-      node = self.root.transform.value(node)
+      node = self.transform.value(node)
       local action
       if type(node) ~= "table" then
         action = "raw_value"
       else
-        self:mark_pos(node)
         action = node[1]
       end
       local fn = value_compile[action]
       if not fn then
         error("Failed to compile value: " .. dump.value(node))
       end
-      return fn(self, node, ...)
+      local out = fn(self, node, ...)
+      if type(node) == "table" and node[-1] then
+        if type(out) == "string" then
+          do
+            local _with_0 = Line()
+            _with_0:append(out)
+            out = _with_0
+          end
+        end
+        out.pos = node[-1]
+      end
+      return out
     end,
     values = function(self, values, delim)
       delim = delim or ', '
@@ -370,28 +475,33 @@ Block = (function()
       if not node then
         return 
       end
-      node = self.root.transform.statement(node)
-      local fn = line_compile[ntype(node)]
-      if not fn then
-        if has_value(node) then
-          self:stm({
-            "assign",
-            {
-              "_"
-            },
-            {
-              node
-            }
-          })
+      node = self.transform.statement(node)
+      local result
+      do
+        local fn = line_compile[ntype(node)]
+        if fn then
+          result = fn(self, node, ...)
         else
-          self:add(self:value(node))
+          if has_value(node) then
+            result = self:stm({
+              "assign",
+              {
+                "_"
+              },
+              {
+                node
+              }
+            })
+          else
+            result = self:value(node)
+          end
         end
-      else
-        self:mark_pos(node)
-        local out = fn(self, node, ...)
-        if out then
-          self:add(out)
+      end
+      if result then
+        if type(node) == "table" and type(result) == "table" and node[-1] then
+          result.pos = node[-1]
         end
+        self:add(result)
       end
       return nil
     end,
@@ -405,6 +515,14 @@ Block = (function()
         self:stm(stm)
       end
       return nil
+    end,
+    splice = function(self, fn)
+      local lines = {
+        "lines",
+        self._lines
+      }
+      self._lines = Lines()
+      return self:stms(fn(lines))
     end
   }
   _base_0.__index = _base_0
@@ -414,17 +532,26 @@ Block = (function()
   local _class_0 = setmetatable({
     __init = function(self, parent, header, footer)
       self.parent, self.header, self.footer = parent, header, footer
-      self.current_line = 1
-      self._lines = { }
-      self._posmap = { }
+      self._lines = Lines()
       self._names = { }
       self._state = { }
+      self._listeners = { }
+      do
+        local _with_0 = transform
+        self.transform = {
+          value = _with_0.Value:bind(self),
+          statement = _with_0.Statement:bind(self)
+        }
+      end
       if self.parent then
         self.root = self.parent.root
         self.indent = self.parent.indent + 1
-        return setmetatable(self._state, {
+        setmetatable(self._state, {
           __index = self.parent._state
         })
+        return setmetatable(self._listeners, {
+          __index = self.parent._listeners
+        })
       else
         self.indent = 0
       end
@@ -448,18 +575,33 @@ Block = (function()
     end
   })
   _base_0.__class = _class_0
-  return _class_0
-end)()
-local RootBlock
-RootBlock = (function()
+  if _parent_0 and _parent_0.__inherited then
+    _parent_0.__inherited(_parent_0, _class_0)
+  end
+  Block = _class_0
+end
+do
   local _parent_0 = Block
   local _base_0 = {
     __tostring = function(self)
       return "RootBlock<>"
     end,
+    root_stms = function(self, stms)
+      if not (self.options.implicitly_return_root == false) then
+        stms = transform.Statement.transformers.root_stms(self, stms)
+      end
+      local _list_0 = stms
+      for _index_0 = 1, #_list_0 do
+        local s = _list_0[_index_0]
+        self:stm(s)
+      end
+    end,
     render = function(self)
-      self:_insert_breaks()
-      return concat(self._lines, "\n")
+      local buffer = self._lines:flatten()
+      if buffer[#buffer] == "\n" then
+        buffer[#buffer] = nil
+      end
+      return table.concat(buffer)
     end
   }
   _base_0.__index = _base_0
@@ -467,13 +609,10 @@ RootBlock = (function()
     setmetatable(_base_0, _parent_0.__base)
   end
   local _class_0 = setmetatable({
-    __init = function(self, ...)
+    __init = function(self, options)
+      self.options = options
       self.root = self
-      self.transform = {
-        value = transform.Value:instance(self),
-        statement = transform.Statement:instance(self)
-      }
-      return _parent_0.__init(self, ...)
+      return _parent_0.__init(self)
     end,
     __base = _base_0,
     __name = "RootBlock",
@@ -494,8 +633,11 @@ RootBlock = (function()
     end
   })
   _base_0.__class = _class_0
-  return _class_0
-end)()
+  if _parent_0 and _parent_0.__inherited then
+    _parent_0.__inherited(_parent_0, _class_0)
+  end
+  RootBlock = _class_0
+end
 format_error = function(msg, pos, file_str)
   local line = pos_to_line(file_str, pos)
   local line_str
@@ -515,35 +657,35 @@ value = function(value)
   end
   return out
 end
-tree = function(tree)
-  local scope = RootBlock()
+tree = function(tree, options)
+  if options == nil then
+    options = { }
+  end
+  assert(tree, "missing tree")
+  local scope = (options.scope or RootBlock)(options)
   local runner = coroutine.create(function()
-    local _list_0 = tree
-    for _index_0 = 1, #_list_0 do
-      local line = _list_0[_index_0]
-      scope:stm(line)
-    end
-    return scope:render()
+    return scope:root_stms(tree)
   end)
-  local success, result = coroutine.resume(runner)
+  local success, err = coroutine.resume(runner)
   if not success then
     local error_msg
-    if type(result) == "table" then
-      local error_type = result[1]
+    if type(err) == "table" then
+      local error_type = err[1]
       if error_type == "user-error" then
-        error_msg = result[2]
+        error_msg = err[2]
       else
         error_msg = error("Unknown error thrown", util.dump(error_msg))
       end
     else
       error_msg = concat({
-        result,
+        err,
         debug.traceback(runner)
       }, "\n")
     end
     return nil, error_msg, scope.last_pos
   else
-    local tbl = scope:line_table()
-    return result, tbl
+    local lua_code = scope:render()
+    local posmap = scope._lines:flatten_posmap()
+    return lua_code, posmap
   end
 end