rufus-lua-moon 0.2.0 → 0.2.2

data/vendor/lua/moonscript/compile/format.lua

@@ -32,9 +32,6 @@ moonlib = {
     })
   end
 }
-non_atomic = Set({
-  "update"
-})
 has_value = function(node)
   if ntype(node) == "chain" then
     local ctype = ntype(node[#node])
@@ -43,9 +40,6 @@ has_value = function(node)
     return true
   end
 end
-is_non_atomic = function(node)
-  return non_atomic[ntype(node)]
-end
 count_lines = function(str)
   local count = 1
   for _ in str:gmatch("\n") do

data/vendor/lua/moonscript/compile/statement.lua

@@ -2,6 +2,7 @@ module("moonscript.compile", package.seeall)
 local util = require("moonscript.util")
 require("moonscript.compile.format")
 local dump = require("moonscript.dump")
+local transform = require("moonscript.transform")
 local reversed = util.reversed
 local ntype
 do
@@ -11,11 +12,17 @@ end
 local concat, insert = table.concat, table.insert
 line_compile = {
   raw = function(self, node)
-    local _, text = unpack(node)
-    return self:add(text)
+    return self:add(node[2])
+  end,
+  lines = function(self, node)
+    local _list_0 = node[2]
+    for _index_0 = 1, #_list_0 do
+      local line = _list_0[_index_0]
+      self:add(line)
+    end
   end,
   declare = function(self, node)
-    local _, names = unpack(node)
+    local names = node[2]
     local undeclared = self:declare(names)
     if #undeclared > 0 then
       do
@@ -23,7 +30,7 @@ line_compile = {
         _with_0:append_list((function()
           local _accum_0 = { }
           local _len_0 = 0
-          local _list_0 = names
+          local _list_0 = undeclared
           for _index_0 = 1, #_list_0 do
             local name = _list_0[_index_0]
             _len_0 = _len_0 + 1
@@ -35,6 +42,25 @@ line_compile = {
       end
     end
   end,
+  declare_with_shadows = function(self, node)
+    local names = node[2]
+    self:declare(names)
+    do
+      local _with_0 = self:line("local ")
+      _with_0:append_list((function()
+        local _accum_0 = { }
+        local _len_0 = 0
+        local _list_0 = names
+        for _index_0 = 1, #_list_0 do
+          local name = _list_0[_index_0]
+          _len_0 = _len_0 + 1
+          _accum_0[_len_0] = self:name(name)
+        end
+        return _accum_0
+      end)(), ", ")
+      return _with_0
+    end
+  end,
   assign = function(self, node)
     local _, names, values = unpack(node)
     local undeclared = self:declare(names)
@@ -123,31 +149,21 @@ line_compile = {
     end
     return root
   end,
+  ["repeat"] = function(self, node)
+    local cond, block = unpack(node, 2)
+    do
+      local _with_0 = self:block("repeat", self:line("until ", self:value(cond)))
+      _with_0:stms(block)
+      return _with_0
+    end
+  end,
   ["while"] = function(self, node)
     local _, cond, block = unpack(node)
-    local out
-    if is_non_atomic(cond) then
-      do
-        local _with_0 = self:block("while true do")
-        _with_0:stm({
-          "if",
-          {
-            "not",
-            cond
-          },
-          {
-            {
-              "break"
-            }
-          }
-        })
-        out = _with_0
-      end
-    else
-      out = self:block(self:line("while ", self:value(cond), " do"))
+    do
+      local _with_0 = self:block(self:line("while ", self:value(cond), " do"))
+      _with_0:stms(block)
+      return _with_0
     end
-    out:stms(block)
-    return out
   end,
   ["for"] = function(self, node)
     local _, name, bounds, block = unpack(node)
@@ -157,12 +173,15 @@ line_compile = {
     }), " do")
     do
       local _with_0 = self:block(loop)
+      _with_0:declare({
+        name
+      })
       _with_0:stms(block)
       return _with_0
     end
   end,
   foreach = function(self, node)
-    local _, names, exp, block = unpack(node)
+    local _, names, exps, block = unpack(node)
     local loop
     do
       local _with_0 = self:line()
@@ -178,11 +197,24 @@ line_compile = {
         end
         return _accum_0
       end)(), ", ")
-      _with_0:append(" in ", self:value(exp), " do")
+      _with_0:append(" in ")
+      _with_0:append_list((function()
+        local _accum_0 = { }
+        local _len_0 = 0
+        local _list_0 = exps
+        for _index_0 = 1, #_list_0 do
+          local exp = _list_0[_index_0]
+          _len_0 = _len_0 + 1
+          _accum_0[_len_0] = self:value(exp)
+        end
+        return _accum_0
+      end)(), ",")
+      _with_0:append(" do")
       loop = _with_0
     end
     do
       local _with_0 = self:block(loop)
+      _with_0:declare(names)
       _with_0:stms(block)
       return _with_0
     end

data/vendor/lua/moonscript/compile/value.lua

@@ -8,33 +8,7 @@ do
   ntype = _table_0.ntype
 end
 local concat, insert = table.concat, table.insert
-local table_append
-table_append = function(name, len, value)
-  return {
-    {
-      "update",
-      len,
-      "+=",
-      1
-    },
-    {
-      "assign",
-      {
-        {
-          "chain",
-          name,
-          {
-            "index",
-            len
-          }
-        }
-      },
-      {
-        value
-      }
-    }
-  }
-end
+local table_delim = ","
 value_compile = {
   exp = function(self, node)
     local _comp
@@ -60,11 +34,6 @@ value_compile = {
       return _with_0
     end
   end,
-  update = function(self, node)
-    local _, name = unpack(node)
-    self:stm(node)
-    return self:name(name)
-  end,
   explist = function(self, node)
     do
       local _with_0 = self:line()
@@ -86,8 +55,9 @@ value_compile = {
     return self:line("(", self:value(node[2]), ")")
   end,
   string = function(self, node)
-    local _, delim, inner, delim_end = unpack(node)
-    return delim .. inner .. (delim_end or delim)
+    local _, delim, inner = unpack(node)
+    local end_delim = delim:gsub("%[", "]")
+    return delim .. inner .. end_delim
   end,
   chain = function(self, node)
     local callee = node[2]
@@ -118,8 +88,9 @@ value_compile = {
         return error("Unknown chain action: " .. t)
       end
     end
-    if ntype(callee) == "self" and node[3] and ntype(node[3]) == "call" then
-      callee[1] = "self_colon"
+    local t = ntype(callee)
+    if (t == "self" or t == "self_class") and node[3] and ntype(node[3]) == "call" then
+      callee[1] = t .. "_colon"
     end
     local callee_value = self:value(callee)
     if ntype(callee) == "exp" then
@@ -151,7 +122,7 @@ value_compile = {
         if type(name) == "string" then
           name = name
         else
-          if name[1] == "self" then
+          if name[1] == "self" or name[1] == "self_class" then
             insert(self_args, name)
           end
           name = name[2]
@@ -251,23 +222,22 @@ value_compile = {
     local _, items = unpack(node)
     do
       local _with_0 = self:block("{", "}")
-      _with_0.delim = ","
       local format_line
       format_line = function(tuple)
         if #tuple == 2 then
           local key, value = unpack(tuple)
-          if type(key) == "string" and data.lua_keywords[key] then
+          if ntype(key) == "key_literal" and data.lua_keywords[key[2]] then
             key = {
               "string",
               '"',
-              key
+              key[2]
             }
           end
           local assign
-          if type(key) ~= "string" then
-            assign = self:line("[", _with_0:value(key), "]")
+          if ntype(key) == "key_literal" then
+            assign = key[2]
           else
-            assign = key
+            assign = self:line("[", _with_0:value(key), "]")
           end
           _with_0:set("current_block", key)
           local out = self:line(assign, " = ", _with_0:value(value))
@@ -278,10 +248,13 @@ value_compile = {
         end
       end
       if items then
-        local _list_0 = items
-        for _index_0 = 1, #_list_0 do
-          local line = _list_0[_index_0]
-          _with_0:add(format_line(line))
+        local count = #items
+        for i, tuple in ipairs(items) do
+          local line = format_line(tuple)
+          if not (count == i) then
+            line:append(table_delim)
+          end
+          _with_0:add(line)
         end
       end
       return _with_0
@@ -305,16 +278,22 @@ value_compile = {
   self = function(self, node)
     return "self." .. self:value(node[2])
   end,
+  self_class = function(self, node)
+    return "self.__class." .. self:value(node[2])
+  end,
   self_colon = function(self, node)
     return "self:" .. self:value(node[2])
   end,
+  self_class_colon = function(self, node)
+    return "self.__class:" .. self:value(node[2])
+  end,
   raw_value = function(self, value)
     local sup = self:get("super")
     if value == "super" and sup then
       return self:value(sup(self))
     end
     if value == "..." then
-      self.has_varargs = true
+      self:send("varargs")
     end
     return tostring(value)
   end

data/vendor/lua/moonscript/data.lua

@@ -9,7 +9,7 @@ Set = function(items)
   end
   return self
 end
-Stack = (function()
+do
   local _parent_0 = nil
   local _base_0 = {
     __tostring = function(self)
@@ -60,8 +60,11 @@ Stack = (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
+  Stack = _class_0
+end
 lua_keywords = Set({
   'and',
   'break',
@@ -85,3 +88,4 @@ lua_keywords = Set({
   'until',
   'while'
 })
+return nil

data/vendor/lua/moonscript/dump.lua

@@ -28,15 +28,9 @@ value = function(op)
   return flat_value(op)
 end
 tree = function(block)
-  return (function()
-    local _accum_0 = { }
-    local _len_0 = 0
-    local _list_0 = block
-    for _index_0 = 1, #_list_0 do
-      value = _list_0[_index_0]
-      _len_0 = _len_0 + 1
-      _accum_0[_len_0] = print(flat_value(value))
-    end
-    return _accum_0
-  end)()
+  local _list_0 = block
+  for _index_0 = 1, #_list_0 do
+    value = _list_0[_index_0]
+    print(flat_value(value))
+  end
 end

data/vendor/lua/moonscript/errors.lua

@@ -24,6 +24,34 @@ reverse_line_number = function(fname, line_table, line_num, cache)
   end
   return "unknown"
 end
+truncate_traceback = function(traceback, chunk_func)
+  if chunk_func == nil then
+    chunk_func = "moonscript_chunk"
+  end
+  traceback = split(traceback, "\n")
+  local stop = #traceback
+  while stop > 1 do
+    if traceback[stop]:match(chunk_func) then
+      break
+    end
+    stop = stop - 1
+  end
+  traceback = (function()
+    local _accum_0 = { }
+    local _len_0 = 0
+    local _list_0 = traceback
+    local _max_0 = stop
+    for _index_0 = 1, _max_0 < 0 and #_list_0 + _max_0 or _max_0 do
+      local t = _list_0[_index_0]
+      _len_0 = _len_0 + 1
+      _accum_0[_len_0] = t
+    end
+    return _accum_0
+  end)()
+  local rep = "function '" .. chunk_func .. "'"
+  traceback[#traceback] = traceback[#traceback]:gsub(rep, "main chunk")
+  return concat(traceback, "\n")
+end
 rewrite_traceback = function(text, err)
   local line_tables = moon.line_tables
   local V, S, Ct, C = lpeg.V, lpeg.S, lpeg.Ct, lpeg.C
@@ -45,6 +73,9 @@ rewrite_traceback = function(text, err)
         fname,
         ":",
         reverse_line_number(fname, tbl, line, cache),
+        "(",
+        line,
+        ")",
         ": ",
         msg
       })
@@ -54,11 +85,14 @@ rewrite_traceback = function(text, err)
   end
   err = rewrite_single(err)
   local match = g:match(text)
+  if not (match) then
+    return nil
+  end
   for i, trace in ipairs(match) do
     match[i] = rewrite_single(trace)
   end
   return concat({
-    "moon:" .. err,
+    "moon: " .. err,
     header_text,
     "\t" .. concat(match, "\n\t")
   }, "\n")

data/vendor/lua/moonscript/init.lua

@@ -20,7 +20,10 @@ create_moonpath = function(package_path)
   end
   return concat(paths, ";")
 end
-to_lua = function(text)
+to_lua = function(text, options)
+  if options == nil then
+    options = { }
+  end
   if "string" ~= type(text) then
     local t = type(text)
     error("expecting string (got " .. t .. ")", 2)
@@ -29,7 +32,7 @@ to_lua = function(text)
   if not tree then
     error(err, 2)
   end
-  local code, ltable, pos = compile.tree(tree)
+  local code, ltable, pos = compile.tree(tree, options)
   if not code then
     error(compile.format_error(ltable, pos, text), 2)
   end
@@ -49,6 +52,7 @@ moon_loader = function(name)
   end
   if file then
     local text = file:read("*a")
+    file:close()
     return loadstring(text, file_path)
   else
     return nil, "Could not find moon file"
@@ -64,9 +68,12 @@ end
 if not _G.moon_no_loader then
   init_loader()
 end
-loadstring = function(str, chunk_name)
+loadstring = function(str, chunk_name, options)
+  if options == nil then
+    options = nil
+  end
   local passed, code, ltable = pcall(function()
-    return to_lua(str)
+    return to_lua(str, options)
   end)
   if not passed then
     error(chunk_name .. ": " .. code, 2)
@@ -76,15 +83,19 @@ loadstring = function(str, chunk_name)
   end
   return lua.loadstring(code, chunk_name or "=(moonscript.loadstring)")
 end
-loadfile = function(fname)
+loadfile = function(fname, options)
+  if options == nil then
+    options = nil
+  end
   local file, err = io.open(fname)
   if not file then
     return nil, err
   end
   local text = assert(file:read("*a"))
-  return loadstring(text, fname)
+  file:close()
+  return loadstring(text, fname, options)
 end
-dofile = function(fname)
+dofile = function(fname, options)
   local f = assert(loadfile(fname))
   return f()
 end