rufus-lua-moon 0.2.3.2 → 0.2.4.0

data/vendor/lua/moonscript/compile.lua

@@ -3,36 +3,40 @@ local dump = require("moonscript.dump")
 local transform = require("moonscript.transform")
 local NameProxy, LocalName
 do
-  local _table_0 = require("moonscript.transform.names")
-  NameProxy, LocalName = _table_0.NameProxy, _table_0.LocalName
+  local _obj_0 = require("moonscript.transform.names")
+  NameProxy, LocalName = _obj_0.NameProxy, _obj_0.LocalName
 end
 local Set
 do
-  local _table_0 = require("moonscript.data")
-  Set = _table_0.Set
+  local _obj_0 = require("moonscript.data")
+  Set = _obj_0.Set
 end
 local ntype, has_value
 do
-  local _table_0 = require("moonscript.types")
-  ntype, has_value = _table_0.ntype, _table_0.has_value
+  local _obj_0 = require("moonscript.types")
+  ntype, has_value = _obj_0.ntype, _obj_0.has_value
 end
 local statement_compilers
 do
-  local _table_0 = require("moonscript.compile.statement")
-  statement_compilers = _table_0.statement_compilers
+  local _obj_0 = require("moonscript.compile.statement")
+  statement_compilers = _obj_0.statement_compilers
 end
 local value_compilers
 do
-  local _table_0 = require("moonscript.compile.value")
-  value_compilers = _table_0.value_compilers
+  local _obj_0 = require("moonscript.compile.value")
+  value_compilers = _obj_0.value_compilers
 end
-local concat, insert = table.concat, table.insert
-local pos_to_line, get_closest_line, trim, unpack = util.pos_to_line, util.get_closest_line, util.trim, util.unpack
+local concat, insert
+do
+  local _obj_0 = table
+  concat, insert = _obj_0.concat, _obj_0.insert
+end
+local pos_to_line, get_closest_line, trim, unpack
+pos_to_line, get_closest_line, trim, unpack = util.pos_to_line, util.get_closest_line, util.trim, util.unpack
 local mtype = util.moon.type
 local indent_char = "  "
 local Line, DelayedLine, Lines, Block, RootBlock
 do
-  local _parent_0 = nil
   local _base_0 = {
     mark_pos = function(self, pos, line)
       if line == nil then
@@ -115,17 +119,14 @@ do
       local strip
       strip = function(t)
         if "table" == type(t) then
-          return (function()
-            local _accum_0 = { }
-            local _len_0 = 1
-            local _list_0 = t
-            for _index_0 = 1, #_list_0 do
-              local v = _list_0[_index_0]
-              _accum_0[_len_0] = strip(v)
-              _len_0 = _len_0 + 1
-            end
-            return _accum_0
-          end)()
+          local _accum_0 = { }
+          local _len_0 = 1
+          for _index_0 = 1, #t do
+            local v = t[_index_0]
+            _accum_0[_len_0] = strip(v)
+            _len_0 = _len_0 + 1
+          end
+          return _accum_0
         else
           return t
         end
@@ -134,25 +135,14 @@ do
     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
+    __name = "Lines"
   }, {
-    __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,
+    __index = _base_0,
     __call = function(cls, ...)
       local _self_0 = setmetatable({}, _base_0)
       cls.__init(_self_0, ...)
@@ -160,13 +150,9 @@ do
     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)
@@ -174,9 +160,8 @@ do
         if not (self.pos) then
           self.pos = item.pos
         end
-        local _list_0 = item
-        for _index_0 = 1, #_list_0 do
-          local value = _list_0[_index_0]
+        for _index_0 = 1, #item do
+          local value = item[_index_0]
           self:_append_single(value)
         end
       else
@@ -210,14 +195,13 @@ do
         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]
+      for _index_0 = 1, #self do
+        local chunk = self[_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]
+          local _list_0 = chunk:render(Lines())
+          for _index_1 = 1, #_list_0 do
+            local block_chunk = _list_0[_index_1]
             if "string" == type(block_chunk) then
               insert(current, block_chunk)
             else
@@ -240,27 +224,12 @@ do
     end
   }
   _base_0.__index = _base_0
-  if _parent_0 then
-    setmetatable(_base_0, _parent_0.__base)
-  end
   local _class_0 = setmetatable({
-    __init = function(self, ...)
-      if _parent_0 then
-        return _parent_0.__init(self, ...)
-      end
-    end,
+    __init = function() end,
     __base = _base_0,
-    __name = "Line",
-    __parent = _parent_0
+    __name = "Line"
   }, {
-    __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,
+    __index = _base_0,
     __call = function(cls, ...)
       local _self_0 = setmetatable({}, _base_0)
       cls.__init(_self_0, ...)
@@ -268,13 +237,9 @@ do
     end
   })
   _base_0.__class = _class_0
-  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 = {
     prepare = function() end,
     render = function(self)
@@ -283,25 +248,14 @@ do
     end
   }
   _base_0.__index = _base_0
-  if _parent_0 then
-    setmetatable(_base_0, _parent_0.__base)
-  end
   local _class_0 = setmetatable({
     __init = function(self, fn)
       self.prepare = fn
     end,
     __base = _base_0,
-    __name = "DelayedLine",
-    __parent = _parent_0
+    __name = "DelayedLine"
   }, {
-    __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,
+    __index = _base_0,
     __call = function(cls, ...)
       local _self_0 = setmetatable({}, _base_0)
       cls.__init(_self_0, ...)
@@ -309,13 +263,9 @@ do
     end
   })
   _base_0.__class = _class_0
-  if _parent_0 and _parent_0.__inherited then
-    _parent_0.__inherited(_parent_0, _class_0)
-  end
   DelayedLine = _class_0
 end
 do
-  local _parent_0 = nil
   local _base_0 = {
     header = "do",
     footer = "end",
@@ -354,14 +304,14 @@ do
       end
     end,
     declare = function(self, names)
-      local undeclared = (function()
+      local undeclared
+      do
         local _accum_0 = { }
         local _len_0 = 1
-        local _list_0 = names
-        for _index_0 = 1, #_list_0 do
+        for _index_0 = 1, #names do
           local _continue_0 = false
           repeat
-            local name = _list_0[_index_0]
+            local name = names[_index_0]
             local is_local = false
             local real_name
             local _exp_0 = mtype(name)
@@ -391,8 +341,8 @@ do
             break
           end
         end
-        return _accum_0
-      end)()
+        undeclared = _accum_0
+      end
       return undeclared
     end,
     whitelist_names = function(self, names)
@@ -429,6 +379,19 @@ do
         return yes
       end
     end,
+    is_local = function(self, node)
+      local t = mtype(node)
+      if t == "string" then
+        return self:has_name(node, false)
+      end
+      if t == NameProxy or t == LocalName then
+        return true
+      end
+      if t == "table" and node[1] == "chain" and #node == 2 then
+        return self:is_local(node[2])
+      end
+      return false
+    end,
     free_name = function(self, prefix, dont_put)
       prefix = prefix or "moon"
       local searching = true
@@ -533,9 +496,8 @@ do
         _with_0:append_list((function()
           local _accum_0 = { }
           local _len_0 = 1
-          local _list_0 = values
-          for _index_0 = 1, #_list_0 do
-            local v = _list_0[_index_0]
+          for _index_0 = 1, #values do
+            local v = values[_index_0]
             _accum_0[_len_0] = self:value(v)
             _len_0 = _len_0 + 1
           end
@@ -583,10 +545,7 @@ do
         error("deprecated stms call, use transformer")
       end
       local current_stms, current_stm_i
-      do
-        local _obj_0 = self
-        current_stms, current_stm_i = _obj_0.current_stms, _obj_0.current_stm_i
-      end
+      current_stms, current_stm_i = self.current_stms, self.current_stm_i
       self.current_stms = stms
       for i = 1, #stms do
         self.current_stm_i = i
@@ -606,9 +565,6 @@ do
     end
   }
   _base_0.__index = _base_0
-  if _parent_0 then
-    setmetatable(_base_0, _parent_0.__base)
-  end
   local _class_0 = setmetatable({
     __init = function(self, parent, header, footer)
       self.parent, self.header, self.footer = parent, header, footer
@@ -617,10 +573,9 @@ do
       self._state = { }
       self._listeners = { }
       do
-        local _with_0 = transform
         self.transform = {
-          value = _with_0.Value:bind(self),
-          statement = _with_0.Statement:bind(self)
+          value = transform.Value:bind(self),
+          statement = transform.Statement:bind(self)
         }
       end
       if self.parent then
@@ -637,17 +592,9 @@ do
       end
     end,
     __base = _base_0,
-    __name = "Block",
-    __parent = _parent_0
+    __name = "Block"
   }, {
-    __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,
+    __index = _base_0,
     __call = function(cls, ...)
       local _self_0 = setmetatable({}, _base_0)
       cls.__init(_self_0, ...)
@@ -655,9 +602,6 @@ do
     end
   })
   _base_0.__class = _class_0
-  if _parent_0 and _parent_0.__inherited then
-    _parent_0.__inherited(_parent_0, _class_0)
-  end
   Block = _class_0
 end
 do
@@ -681,9 +625,7 @@ do
     end
   }
   _base_0.__index = _base_0
-  if _parent_0 then
-    setmetatable(_base_0, _parent_0.__base)
-  end
+  setmetatable(_base_0, _parent_0.__base)
   local _class_0 = setmetatable({
     __init = function(self, options)
       self.options = options
@@ -696,7 +638,7 @@ do
   }, {
     __index = function(cls, name)
       local val = rawget(_base_0, name)
-      if val == nil and _parent_0 then
+      if val == nil then
         return _parent_0[name]
       else
         return val
@@ -709,7 +651,7 @@ do
     end
   })
   _base_0.__class = _class_0
-  if _parent_0 and _parent_0.__inherited then
+  if _parent_0.__inherited then
     _parent_0.__inherited(_parent_0, _class_0)
   end
   RootBlock = _class_0
@@ -769,8 +711,7 @@ tree = function(tree, options)
   end
 end
 do
-  local _with_0 = require("moonscript.data")
-  local data = _with_0
+  local data = require("moonscript.data")
   for name, cls in pairs({
     Line = Line,
     Lines = Lines,

data/vendor/lua/moonscript/data.lua

@@ -1,17 +1,19 @@
-local concat, remove, insert = table.concat, table.remove, table.insert
+local concat, remove, insert
+do
+  local _obj_0 = table
+  concat, remove, insert = _obj_0.concat, _obj_0.remove, _obj_0.insert
+end
 local Set
 Set = function(items)
   local self = { }
-  local _list_0 = items
-  for _index_0 = 1, #_list_0 do
-    local key = _list_0[_index_0]
+  for _index_0 = 1, #items do
+    local key = items[_index_0]
     self[key] = true
   end
   return self
 end
 local Stack
 do
-  local _parent_0 = nil
   local _base_0 = {
     __tostring = function(self)
       return "<Stack {" .. concat(self, ", ") .. "}>"
@@ -28,9 +30,6 @@ do
     end
   }
   _base_0.__index = _base_0
-  if _parent_0 then
-    setmetatable(_base_0, _parent_0.__base)
-  end
   local _class_0 = setmetatable({
     __init = function(self, ...)
       local _list_0 = {
@@ -43,17 +42,9 @@ do
       return nil
     end,
     __base = _base_0,
-    __name = "Stack",
-    __parent = _parent_0
+    __name = "Stack"
   }, {
-    __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,
+    __index = _base_0,
     __call = function(cls, ...)
       local _self_0 = setmetatable({}, _base_0)
       cls.__init(_self_0, ...)
@@ -61,9 +52,6 @@ do
     end
   })
   _base_0.__class = _class_0
-  if _parent_0 and _parent_0.__inherited then
-    _parent_0.__inherited(_parent_0, _class_0)
-  end
   Stack = _class_0
 end
 local lua_keywords = Set({

data/vendor/lua/moonscript/dump.lua

@@ -9,17 +9,17 @@ flat_value = function(op, depth)
   if type(op) ~= "table" then
     return tostring(op)
   end
-  local items = (function()
+  local items
+  do
     local _accum_0 = { }
     local _len_0 = 1
-    local _list_0 = op
-    for _index_0 = 1, #_list_0 do
-      local item = _list_0[_index_0]
+    for _index_0 = 1, #op do
+      local item = op[_index_0]
       _accum_0[_len_0] = flat_value(item, depth + 1)
       _len_0 = _len_0 + 1
     end
-    return _accum_0
-  end)()
+    items = _accum_0
+  end
   local pos = op[-1]
   return "{" .. (pos and "[" .. pos .. "] " or "") .. table.concat(items, ", ") .. "}"
 end

data/vendor/lua/moonscript/errors.lua

@@ -1,7 +1,12 @@
 local util = require("moonscript.util")
 local lpeg = require("lpeg")
-local concat, insert = table.concat, table.insert
-local split, pos_to_line = util.split, util.pos_to_line
+local concat, insert
+do
+  local _obj_0 = table
+  concat, insert = _obj_0.concat, _obj_0.insert
+end
+local split, pos_to_line
+split, pos_to_line = util.split, util.pos_to_line
 local user_error
 user_error = function(...)
   return error({
@@ -42,18 +47,17 @@ truncate_traceback = function(traceback, chunk_func)
     end
     stop = stop - 1
   end
-  traceback = (function()
+  do
     local _accum_0 = { }
     local _len_0 = 1
-    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]
+    for _index_0 = 1, _max_0 < 0 and #traceback + _max_0 or _max_0 do
+      local t = traceback[_index_0]
       _accum_0[_len_0] = t
       _len_0 = _len_0 + 1
     end
-    return _accum_0
-  end)()
+    traceback = _accum_0
+  end
   local rep = "function '" .. chunk_func .. "'"
   traceback[#traceback] = traceback[#traceback]:gsub(rep, "main chunk")
   return concat(traceback, "\n")
@@ -61,7 +65,8 @@ end
 local rewrite_traceback
 rewrite_traceback = function(text, err)
   local line_tables = require("moonscript.line_tables")
-  local V, S, Ct, C = lpeg.V, lpeg.S, lpeg.Ct, lpeg.C
+  local V, S, Ct, C
+  V, S, Ct, C = lpeg.V, lpeg.S, lpeg.Ct, lpeg.C
   local header_text = "stack traceback:"
   local Header, Line = V("Header"), V("Line")
   local Break = lpeg.S("\n")
@@ -80,10 +85,10 @@ rewrite_traceback = function(text, err)
         fname,
         ":",
         reverse_line_number(fname, tbl, line, cache),
+        ": ",
         "(",
         line,
-        ")",
-        ": ",
+        ") ",
         msg
       })
     else
@@ -107,5 +112,6 @@ end
 return {
   rewrite_traceback = rewrite_traceback,
   truncate_traceback = truncate_traceback,
-  user_error = user_error
+  user_error = user_error,
+  reverse_line_number = reverse_line_number
 }

data/vendor/lua/moonscript/init.lua

@@ -1,10 +1,14 @@
 local compile = require("moonscript.compile")
 local parse = require("moonscript.parse")
-local concat, insert = table.concat, table.insert
+local concat, insert
+do
+  local _obj_0 = table
+  concat, insert = _obj_0.concat, _obj_0.insert
+end
 local split, dump, get_options, unpack
 do
-  local _table_0 = require("moonscript.util")
-  split, dump, get_options, unpack = _table_0.split, _table_0.dump, _table_0.get_options, _table_0.unpack
+  local _obj_0 = require("moonscript.util")
+  split, dump, get_options, unpack = _obj_0.split, _obj_0.dump, _obj_0.get_options, _obj_0.unpack
 end
 local lua = {
   loadstring = loadstring,
@@ -29,15 +33,15 @@ to_lua = function(text, options)
   end
   if "string" ~= type(text) then
     local t = type(text)
-    error("expecting string (got " .. t .. ")", 2)
+    return nil, "expecting string (got " .. t .. ")", 2
   end
   local tree, err = parse.string(text)
   if not tree then
-    error(err, 2)
+    return nil, err
   end
   local code, ltable, pos = compile.tree(tree, options)
   if not code then
-    error(compile.format_error(ltable, pos, text), 2)
+    return nil, compile.format_error(ltable, pos, text), 2
   end
   return code, ltable
 end
@@ -73,14 +77,12 @@ end
 loadstring = function(...)
   local options, str, chunk_name, mode, env = get_options(...)
   chunk_name = chunk_name or "=(moonscript.loadstring)"
-  local passed, code, ltable = pcall(function()
-    return to_lua(str, options)
-  end)
-  if not passed then
-    error(chunk_name .. ": " .. code, 2)
+  local code, ltable_or_err = to_lua(str, options)
+  if not (code) then
+    return nil, ltable_or_err
   end
   if chunk_name then
-    line_tables[chunk_name] = ltable
+    line_tables[chunk_name] = ltable_or_err
   end
   return (lua.loadstring or lua.load)(code, chunk_name, unpack({
     mode,
@@ -89,7 +91,7 @@ loadstring = function(...)
 end
 loadfile = function(fname, ...)
   local file, err = io.open(fname)
-  if not file then
+  if not (file) then
     return nil, err
   end
   local text = assert(file:read("*a"))

data/vendor/lua/moonscript/parse.lua

@@ -227,7 +227,7 @@ local function symx(chars)
 end
 
 local function simple_string(delim, allow_interpolation)
-	local inner = P('\\'..delim) + "\\\\" + (1 - S('\r\n'..delim))
+	local inner = P('\\'..delim) + "\\\\" + (1 - P(delim))
 	if allow_interpolation then
 		inter = symx"#{" * V"Exp" * sym"}"
 		inner = (C((inner - inter)^1) + inter / mark"interpolate")^0
@@ -409,9 +409,9 @@ local build_grammar = wrap_env(function()
 
 		Local = key"local" * ((op"*" + op"^") / mark"declare_glob" + Ct(NameList) / mark"declare_with_shadows"),
 
-		Import = key"import" *  Ct(ImportNameList) * key"from" * Exp / mark"import",
+		Import = key"import" * Ct(ImportNameList) * SpaceBreak^0 * key"from" * Exp / mark"import",
 		ImportName = (sym"\\" * Ct(Cc"colon_stub" * Name) + Name),
-		ImportNameList = ImportName * (sym"," * ImportName)^0,
+		ImportNameList = SpaceBreak^0 * ImportName * ((SpaceBreak^1 + sym"," * SpaceBreak^0) * ImportName)^0,
 
 		NameList = Name * (sym"," * Name)^0,
 
@@ -575,7 +575,7 @@ local build_grammar = wrap_env(function()
 			op"*" + op"^" +
 			Ct(NameList) * (sym"=" * Ct(ExpListLow))^-1) / mark"export",
 
-		KeyValue = (sym":" * Name) / self_assign + Ct((KeyName + sym"[" * Exp * sym"]" + DoubleString + SingleString) * symx":" * (Exp + TableBlock)),
+		KeyValue = (sym":" * -SomeSpace *  Name) / self_assign + Ct((KeyName + sym"[" * Exp * sym"]" + DoubleString + SingleString) * symx":" * (Exp + TableBlock)),
 		KeyValueList = KeyValue * (sym"," * KeyValue)^0,
 		KeyValueLine = CheckIndent * KeyValueList * sym","^-1,
 
@@ -597,7 +597,7 @@ local build_grammar = wrap_env(function()
 		ExpList = Exp * (sym"," * Exp)^0,
 		ExpListLow = Exp * ((sym"," + sym";") * Exp)^0,
 
-		InvokeArgs = ExpList * (sym"," * (TableBlock + SpaceBreak * Advance * ArgBlock * TableBlock^-1) + TableBlock)^-1 + TableBlock,
+		InvokeArgs = -P"-" * (ExpList * (sym"," * (TableBlock + SpaceBreak * Advance * ArgBlock * TableBlock^-1) + TableBlock)^-1 + TableBlock),
 		ArgBlock = ArgLine * (sym"," * SpaceBreak * ArgLine)^0 * PopIndent,
 		ArgLine = CheckIndent * ExpList
 	}