rufus-lua-moon 0.4.0.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e03b60b3d4e8f15c1430ddc04511a798237122e1
-  data.tar.gz: 91a9e8867e4e0a0192fcd1d7f95280b0eba7a98c
+  metadata.gz: 0ba945cbe870fea8680be30b884f6b9c0db0468e
+  data.tar.gz: 57e18176d0bdfafd8e750cb0cd0ddfd58a41bce2
 SHA512:
-  metadata.gz: 376f3ed3a64793fbbc50e7e2dcb8325d065c689fd77f83458f7e9cc1c5dff9ce235dd5fce59aa30d67c56501217fbdb3ca7674a5585cb00a57ece5b4b047fccc
-  data.tar.gz: d2ec62bd2ecfb00d44cf11daa7cc1a0d3c1cdd621c7950c1abf1c99f7bd3fd313b08ccef4a4cb5db6444c94862fd81536298c69ea92295e2ecd012e120050232
+  metadata.gz: ef694a92dc32e88ec30f5f98974a451db8061e38763cc257d10ca7b3c5e7fc5b6a4046d7b29f88f35af5d93c5e166ddf91c461a5ccae8e96b646445ae090d090
+  data.tar.gz: 648090a519c07b3b559438c748bc7eb0f5dbbfbfe72c00c5da2624d7fd3c93d353a324658004c205f67d6faf1428cbc68b097a59a1c5758031314583c01a9cf8

data/vendor/leafo/moonscript/cmd/args.lua

@@ -0,0 +1,69 @@
+local unpack
+unpack = require("moonscript.util").unpack
+local parse_spec
+parse_spec = function(spec)
+  local flags, words
+  if type(spec) == "table" then
+    flags, words = unpack(spec), spec
+  else
+    flags, words = spec, { }
+  end
+  assert("no flags for arguments")
+  local out = { }
+  for part in flags:gmatch("%w:?") do
+    if part:match(":$") then
+      out[part:sub(1, 1)] = {
+        value = true
+      }
+    else
+      out[part] = { }
+    end
+  end
+  return out
+end
+local parse_arguments
+parse_arguments = function(spec, args)
+  spec = parse_spec(spec)
+  local out = { }
+  local remaining = { }
+  local last_flag = nil
+  for _index_0 = 1, #args do
+    local _continue_0 = false
+    repeat
+      local arg = args[_index_0]
+      local group = { }
+      if last_flag then
+        out[last_flag] = arg
+        _continue_0 = true
+        break
+      end
+      do
+        local flag = arg:match("-(%w+)")
+        if flag then
+          do
+            local short_name = spec[flag]
+            if short_name then
+              out[short_name] = true
+            else
+              for char in flag:gmatch(".") do
+                out[char] = true
+              end
+            end
+          end
+          _continue_0 = true
+          break
+        end
+      end
+      table.insert(remaining, arg)
+      _continue_0 = true
+    until true
+    if not _continue_0 then
+      break
+    end
+  end
+  return out, remaining
+end
+return {
+  parse_arguments = parse_arguments,
+  parse_spec = parse_spec
+}

data/vendor/leafo/moonscript/cmd/coverage.lua

@@ -42,6 +42,7 @@ position_to_lines = function(file_content, positions)
 end
 local format_file
 format_file = function(fname, positions)
+  fname = fname:gsub("^@", "")
   local file = assert(io.open(fname))
   local content = file:read("*a")
   file:close()

data/vendor/leafo/moonscript/cmd/moonc.lua

@@ -102,7 +102,7 @@ compile_file_text = function(text, opts)
       "Compile time\t" .. format_time(compile_time),
       ""
     }, "\n"))
-    return nil
+    return true
   end
   return code
 end

data/vendor/leafo/moonscript/cmd/watchers.lua

@@ -0,0 +1,269 @@
+local remove_dupes
+remove_dupes = function(list, key_fn)
+  local seen = { }
+  return (function()
+    local _accum_0 = { }
+    local _len_0 = 1
+    for _index_0 = 1, #list do
+      local _continue_0 = false
+      repeat
+        local item = list[_index_0]
+        local key
+        if key_fn then
+          key = key_fn(item)
+        else
+          key = item
+        end
+        if seen[key] then
+          _continue_0 = true
+          break
+        end
+        seen[key] = true
+        local _value_0 = item
+        _accum_0[_len_0] = _value_0
+        _len_0 = _len_0 + 1
+        _continue_0 = true
+      until true
+      if not _continue_0 then
+        break
+      end
+    end
+    return _accum_0
+  end)()
+end
+local plural
+plural = function(count, word)
+  return tostring(count) .. " " .. tostring(word) .. tostring(count == 1 and "" or "s")
+end
+local Watcher
+do
+  local _class_0
+  local _base_0 = {
+    start_msg = "Starting watch loop (Ctrl-C to exit)",
+    print_start = function(self, mode, misc)
+      return io.stderr:write(tostring(self.start_msg) .. " with " .. tostring(mode) .. " [" .. tostring(misc) .. "]\n")
+    end
+  }
+  _base_0.__index = _base_0
+  _class_0 = setmetatable({
+    __init = function(self, file_list)
+      self.file_list = file_list
+    end,
+    __base = _base_0,
+    __name = "Watcher"
+  }, {
+    __index = _base_0,
+    __call = function(cls, ...)
+      local _self_0 = setmetatable({}, _base_0)
+      cls.__init(_self_0, ...)
+      return _self_0
+    end
+  })
+  _base_0.__class = _class_0
+  Watcher = _class_0
+end
+local InotifyWacher
+do
+  local _class_0
+  local _parent_0 = Watcher
+  local _base_0 = {
+    get_dirs = function(self)
+      local parse_dir
+      parse_dir = require("moonscript.cmd.moonc").parse_dir
+      local dirs
+      do
+        local _accum_0 = { }
+        local _len_0 = 1
+        local _list_0 = self.file_list
+        for _index_0 = 1, #_list_0 do
+          local _des_0 = _list_0[_index_0]
+          local file_path
+          file_path = _des_0[1]
+          local dir = parse_dir(file_path)
+          if dir == "" then
+            dir = "./"
+          end
+          local _value_0 = dir
+          _accum_0[_len_0] = _value_0
+          _len_0 = _len_0 + 1
+        end
+        dirs = _accum_0
+      end
+      return remove_dupes(dirs)
+    end,
+    each_update = function(self)
+      return coroutine.wrap(function()
+        local dirs = self:get_dirs()
+        self:print_start("inotify", plural(#dirs, "dir"))
+        local wd_table = { }
+        local inotify = require("inotify")
+        local handle = inotify.init()
+        for _index_0 = 1, #dirs do
+          local dir = dirs[_index_0]
+          local wd = handle:addwatch(dir, inotify.IN_CLOSE_WRITE, inotify.IN_MOVED_TO)
+          wd_table[wd] = dir
+        end
+        while true do
+          local events = handle:read()
+          if not (events) then
+            break
+          end
+          for _index_0 = 1, #events do
+            local _continue_0 = false
+            repeat
+              local ev = events[_index_0]
+              local fname = ev.name
+              if not (fname:match("%.moon$")) then
+                _continue_0 = true
+                break
+              end
+              local dir = wd_table[ev.wd]
+              if dir ~= "./" then
+                fname = dir .. fname
+              end
+              coroutine.yield(fname)
+              _continue_0 = true
+            until true
+            if not _continue_0 then
+              break
+            end
+          end
+        end
+      end)
+    end
+  }
+  _base_0.__index = _base_0
+  setmetatable(_base_0, _parent_0.__base)
+  _class_0 = setmetatable({
+    __init = function(self, ...)
+      return _class_0.__parent.__init(self, ...)
+    end,
+    __base = _base_0,
+    __name = "InotifyWacher",
+    __parent = _parent_0
+  }, {
+    __index = function(cls, name)
+      local val = rawget(_base_0, name)
+      if val == nil then
+        local parent = rawget(cls, "__parent")
+        if parent then
+          return parent[name]
+        end
+      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
+  local self = _class_0
+  self.available = function(self)
+    return pcall(function()
+      return require("inotify")
+    end)
+  end
+  if _parent_0.__inherited then
+    _parent_0.__inherited(_parent_0, _class_0)
+  end
+  InotifyWacher = _class_0
+end
+local SleepWatcher
+do
+  local _class_0
+  local _parent_0 = Watcher
+  local _base_0 = {
+    polling_rate = 1.0,
+    get_sleep_func = function(self)
+      local sleep
+      pcall(function()
+        sleep = require("socket").sleep
+      end)
+      sleep = sleep or require("moonscript")._sleep
+      if not (sleep) then
+        error("Missing sleep function; install LuaSocket")
+      end
+      return sleep
+    end,
+    each_update = function(self)
+      return coroutine.wrap(function()
+        local lfs = require("lfs")
+        local sleep = self:get_sleep_func()
+        self:print_start("polling", plural(#self.file_list, "files"))
+        local mod_time = { }
+        while true do
+          local _list_0 = self.file_list
+          for _index_0 = 1, #_list_0 do
+            local _continue_0 = false
+            repeat
+              local _des_0 = _list_0[_index_0]
+              local file
+              file = _des_0[1]
+              local time = lfs.attributes(file, "modification")
+              print(file, time)
+              if not (time) then
+                mod_time[file] = nil
+                _continue_0 = true
+                break
+              end
+              if not (mod_time[file]) then
+                mod_time[file] = time
+                _continue_0 = true
+                break
+              end
+              if time > mod_time[file] then
+                mod_time[file] = time
+                coroutine.yield(file)
+              end
+              _continue_0 = true
+            until true
+            if not _continue_0 then
+              break
+            end
+          end
+          sleep(self.polling_rate)
+        end
+      end)
+    end
+  }
+  _base_0.__index = _base_0
+  setmetatable(_base_0, _parent_0.__base)
+  _class_0 = setmetatable({
+    __init = function(self, ...)
+      return _class_0.__parent.__init(self, ...)
+    end,
+    __base = _base_0,
+    __name = "SleepWatcher",
+    __parent = _parent_0
+  }, {
+    __index = function(cls, name)
+      local val = rawget(_base_0, name)
+      if val == nil then
+        local parent = rawget(cls, "__parent")
+        if parent then
+          return parent[name]
+        end
+      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.__inherited then
+    _parent_0.__inherited(_parent_0, _class_0)
+  end
+  SleepWatcher = _class_0
+end
+return {
+  Watcher = Watcher,
+  SleepWatcher = SleepWatcher,
+  InotifyWacher = InotifyWacher
+}

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

@@ -57,7 +57,7 @@ return {
     end
   end,
   assign = function(self, node)
-    local _, names, values = unpack(node)
+    local names, values = unpack(node, 2)
     local undeclared = self:declare(names)
     local declare = "local " .. concat(undeclared, ", ")
     local has_fndef = false
@@ -136,7 +136,7 @@ return {
       current = next
     end
     for _index_0 = 4, #node do
-      cond = node[_index_0]
+      local cond = node[_index_0]
       add_clause(cond)
     end
     return root
@@ -150,7 +150,7 @@ return {
     end
   end,
   ["while"] = function(self, node)
-    local _, cond, block = unpack(node)
+    local cond, block = unpack(node, 2)
     do
       local _with_0 = self:block(self:line("while ", self:value(cond), " do"))
       _with_0:stms(block)
@@ -158,7 +158,7 @@ return {
     end
   end,
   ["for"] = function(self, node)
-    local _, name, bounds, block = unpack(node)
+    local name, bounds, block = unpack(node, 2)
     local loop = self:line("for ", self:name(name), " = ", self:value({
       "explist",
       unpack(bounds)
@@ -173,7 +173,7 @@ return {
     end
   end,
   foreach = function(self, node)
-    local _, names, exps, block = unpack(node)
+    local names, exps, block = unpack(node, 2)
     local loop
     do
       local _with_0 = self:line()
@@ -210,7 +210,7 @@ return {
     end
   end,
   export = function(self, node)
-    local _, names = unpack(node)
+    local names = unpack(node, 2)
     if type(names) == "string" then
       if names == "*" then
         self.export_all = true

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

@@ -71,7 +71,7 @@ return {
     return self:line("(", self:value(node[2]), ")")
   end,
   string = function(self, node)
-    local _, delim, inner = unpack(node)
+    local delim, inner = unpack(node, 2)
     local end_delim = delim:gsub("%[", "]")
     if delim == "'" or delim == '"' then
       inner = inner:gsub("[\r\n]", string_chars)
@@ -133,7 +133,7 @@ return {
     return self:line(callee_value, actions)
   end,
   fndef = function(self, node)
-    local _, args, whitelist, arrow, block = unpack(node)
+    local args, whitelist, arrow, block = unpack(node, 2)
     local default_args = { }
     local self_args = { }
     local arg_names
@@ -238,7 +238,7 @@ return {
     end
   end,
   table = function(self, node)
-    local _, items = unpack(node)
+    local items = unpack(node, 2)
     do
       local _with_0 = self:block("{", "}")
       local format_line
@@ -286,6 +286,9 @@ return {
   number = function(self, node)
     return node[2]
   end,
+  bitnot = function(self, node)
+    return self:line("~", self:value(node[2]))
+  end,
   length = function(self, node)
     return self:line("#", self:value(node[2]))
   end,

data/vendor/leafo/moonscript/dump.lua

@@ -31,7 +31,7 @@ local tree
 tree = function(block)
   local _list_0 = block
   for _index_0 = 1, #_list_0 do
-    value = _list_0[_index_0]
+    local value = _list_0[_index_0]
     print(flat_value(value))
   end
 end

data/vendor/leafo/moonscript/parse.lua

@@ -15,10 +15,10 @@ local wrap_env
 wrap_env = require("moonscript.parse.env").wrap_env
 local R, S, V, P, C, Ct, Cmt, Cg, Cb, Cc
 R, S, V, P, C, Ct, Cmt, Cg, Cb, Cc = lpeg.R, lpeg.S, lpeg.V, lpeg.P, lpeg.C, lpeg.Ct, lpeg.Cmt, lpeg.Cg, lpeg.Cb, lpeg.Cc
-local White, Break, Stop, Comment, Space, SomeSpace, SpaceBreak, EmptyLine, AlphaNum, Num, Shebang, _Name
+local White, Break, Stop, Comment, Space, SomeSpace, SpaceBreak, EmptyLine, AlphaNum, Num, Shebang, L, _Name
 do
   local _obj_0 = require("moonscript.parse.literals")
-  White, Break, Stop, Comment, Space, SomeSpace, SpaceBreak, EmptyLine, AlphaNum, Num, Shebang, _Name = _obj_0.White, _obj_0.Break, _obj_0.Stop, _obj_0.Comment, _obj_0.Space, _obj_0.SomeSpace, _obj_0.SpaceBreak, _obj_0.EmptyLine, _obj_0.AlphaNum, _obj_0.Num, _obj_0.Shebang, _obj_0.Name
+  White, Break, Stop, Comment, Space, SomeSpace, SpaceBreak, EmptyLine, AlphaNum, Num, Shebang, L, _Name = _obj_0.White, _obj_0.Break, _obj_0.Stop, _obj_0.Comment, _obj_0.Space, _obj_0.SomeSpace, _obj_0.SpaceBreak, _obj_0.EmptyLine, _obj_0.AlphaNum, _obj_0.Num, _obj_0.Shebang, _obj_0.L, _obj_0.Name
 end
 local SpaceName = Space * _Name
 Num = Space * (Num / function(v)
@@ -27,10 +27,10 @@ Num = Space * (Num / function(v)
     v
   }
 end)
-local Indent, Cut, ensure, extract_line, mark, pos, flatten_or_mark, is_assignable, check_assignable, format_assign, format_single_assign, sym, symx, simple_string, wrap_func_arg, join_chain, wrap_decorator, check_lua_string, self_assign
+local Indent, Cut, ensure, extract_line, mark, pos, flatten_or_mark, is_assignable, check_assignable, format_assign, format_single_assign, sym, symx, simple_string, wrap_func_arg, join_chain, wrap_decorator, check_lua_string, self_assign, got
 do
   local _obj_0 = require("moonscript.parse.util")
-  Indent, Cut, ensure, extract_line, mark, pos, flatten_or_mark, is_assignable, check_assignable, format_assign, format_single_assign, sym, symx, simple_string, wrap_func_arg, join_chain, wrap_decorator, check_lua_string, self_assign = _obj_0.Indent, _obj_0.Cut, _obj_0.ensure, _obj_0.extract_line, _obj_0.mark, _obj_0.pos, _obj_0.flatten_or_mark, _obj_0.is_assignable, _obj_0.check_assignable, _obj_0.format_assign, _obj_0.format_single_assign, _obj_0.sym, _obj_0.symx, _obj_0.simple_string, _obj_0.wrap_func_arg, _obj_0.join_chain, _obj_0.wrap_decorator, _obj_0.check_lua_string, _obj_0.self_assign
+  Indent, Cut, ensure, extract_line, mark, pos, flatten_or_mark, is_assignable, check_assignable, format_assign, format_single_assign, sym, symx, simple_string, wrap_func_arg, join_chain, wrap_decorator, check_lua_string, self_assign, got = _obj_0.Indent, _obj_0.Cut, _obj_0.ensure, _obj_0.extract_line, _obj_0.mark, _obj_0.pos, _obj_0.flatten_or_mark, _obj_0.is_assignable, _obj_0.check_assignable, _obj_0.format_assign, _obj_0.format_single_assign, _obj_0.sym, _obj_0.symx, _obj_0.simple_string, _obj_0.wrap_func_arg, _obj_0.join_chain, _obj_0.wrap_decorator, _obj_0.check_lua_string, _obj_0.self_assign, _obj_0.got
 end
 local build_grammar = wrap_env(debug_grammar, function(root)
   local _indent = Stack(0)
@@ -110,10 +110,10 @@ local build_grammar = wrap_env(debug_grammar, function(root)
     File = Shebang ^ -1 * (Block + Ct("")),
     Block = Ct(Line * (Break ^ 1 * Line) ^ 0),
     CheckIndent = Cmt(Indent, check_indent),
-    Line = (CheckIndent * Statement + Space * #Stop),
+    Line = (CheckIndent * Statement + Space * L(Stop)),
     Statement = pos(Import + While + With + For + ForEach + Switch + Return + Local + Export + BreakLoop + Ct(ExpList) * (Update + Assign) ^ -1 / format_assign) * Space * ((key("if") * Exp * (key("else") * Exp) ^ -1 * Space / mark("if") + key("unless") * Exp / mark("unless") + CompInner / mark("comprehension")) * Space) ^ -1 / wrap_decorator,
     Body = Space ^ -1 * Break * EmptyLine ^ 0 * InBlock + Ct(Statement),
-    Advance = #Cmt(Indent, advance_indent),
+    Advance = L(Cmt(Indent, advance_indent)),
     PushIndent = Cmt(Indent, push_indent),
     PreventIndent = Cmt(Cc(-1), push_indent),
     PopIndent = Cmt("", pop_indent),
@@ -131,8 +131,10 @@ local build_grammar = wrap_env(debug_grammar, function(root)
     SwitchCase = key("when") * Ct(ExpList) * key("then") ^ -1 * Body / mark("case"),
     SwitchElse = key("else") * Body / mark("else"),
     IfCond = Exp * Assign ^ -1 / format_single_assign,
-    If = key("if") * IfCond * key("then") ^ -1 * Body * ((Break * CheckIndent) ^ -1 * EmptyLine ^ 0 * key("elseif") * pos(IfCond) * key("then") ^ -1 * Body / mark("elseif")) ^ 0 * ((Break * CheckIndent) ^ -1 * EmptyLine ^ 0 * key("else") * Body / mark("else")) ^ -1 / mark("if"),
-    Unless = key("unless") * IfCond * key("then") ^ -1 * Body * ((Break * CheckIndent) ^ -1 * EmptyLine ^ 0 * key("else") * Body / mark("else")) ^ -1 / mark("unless"),
+    IfElse = (Break * EmptyLine ^ 0 * CheckIndent) ^ -1 * key("else") * Body / mark("else"),
+    IfElseIf = (Break * EmptyLine ^ 0 * CheckIndent) ^ -1 * key("elseif") * pos(IfCond) * key("then") ^ -1 * Body / mark("elseif"),
+    If = key("if") * IfCond * key("then") ^ -1 * Body * IfElseIf ^ 0 * IfElse ^ -1 / mark("if"),
+    Unless = key("unless") * IfCond * key("then") ^ -1 * Body * IfElseIf ^ 0 * IfElse ^ -1 / mark("unless"),
     While = key("while") * DisableDo * ensure(Exp, PopDo) * key("do") ^ -1 * Body / mark("while"),
     For = key("for") * DisableDo * ensure(Name * sym("=") * Ct(Exp * sym(",") * Exp * (sym(",") * Exp) ^ -1), PopDo) * key("do") ^ -1 * Body / mark("for"),
     ForEach = key("for") * Ct(AssignableNameList) * key("in") * DisableDo * ensure(Ct(sym("*") * Exp / mark("unpack") + ExpList), PopDo) * key("do") ^ -1 * Body / mark("foreach"),
@@ -140,20 +142,20 @@ local build_grammar = wrap_env(debug_grammar, function(root)
     Comprehension = sym("[") * Exp * CompInner * sym("]") / mark("comprehension"),
     TblComprehension = sym("{") * Ct(Exp * (sym(",") * Exp) ^ -1) * CompInner * sym("}") / mark("tblcomprehension"),
     CompInner = Ct((CompForEach + CompFor) * CompClause ^ 0),
-    CompForEach = key("for") * Ct(NameList) * key("in") * (sym("*") * Exp / mark("unpack") + Exp) / mark("foreach"),
+    CompForEach = key("for") * Ct(AssignableNameList) * key("in") * (sym("*") * Exp / mark("unpack") + Exp) / mark("foreach"),
     CompFor = key("for" * Name * sym("=") * Ct(Exp * sym(",") * Exp * (sym(",") * Exp) ^ -1) / mark("for")),
     CompClause = CompFor + CompForEach + key("when") * Exp / mark("when"),
     Assign = sym("=") * (Ct(With + If + Switch) + Ct(TableBlock + ExpListLow)) / mark("assign"),
-    Update = ((sym("..=") + sym("+=") + sym("-=") + sym("*=") + sym("/=") + sym("%=") + sym("or=") + sym("and=")) / trim) * Exp / mark("update"),
-    CharOperators = Space * C(S("+-*/%^><")),
-    WordOperators = op("or") + op("and") + op("<=") + op(">=") + op("~=") + op("!=") + op("==") + op(".."),
+    Update = ((sym("..=") + sym("+=") + sym("-=") + sym("*=") + sym("/=") + sym("%=") + sym("or=") + sym("and=") + sym("&=") + sym("|=") + sym(">>=") + sym("<<=")) / trim) * Exp / mark("update"),
+    CharOperators = Space * C(S("+-*/%^><|&")),
+    WordOperators = op("or") + op("and") + op("<=") + op(">=") + op("~=") + op("!=") + op("==") + op("..") + op("<<") + op(">>") + op("//"),
     BinaryOperator = (WordOperators + CharOperators) * SpaceBreak ^ 0,
     Assignable = Cmt(Chain, check_assignable) + Name + SelfName,
     Exp = Ct(Value * (BinaryOperator * Value) ^ 0) / flatten_or_mark("exp"),
-    SimpleValue = If + Unless + Switch + With + ClassDecl + ForEach + For + While + Cmt(Do, check_do) + sym("-") * -SomeSpace * Exp / mark("minus") + sym("#") * Exp / mark("length") + key("not") * Exp / mark("not") + TblComprehension + TableLit + Comprehension + FunLit + Num,
+    SimpleValue = If + Unless + Switch + With + ClassDecl + ForEach + For + While + Cmt(Do, check_do) + sym("-") * -SomeSpace * Exp / mark("minus") + sym("#") * Exp / mark("length") + sym("~") * Exp / mark("bitnot") + key("not") * Exp / mark("not") + TblComprehension + TableLit + Comprehension + FunLit + Num,
     ChainValue = (Chain + Callable) * Ct(InvokeArgs ^ -1) / join_chain,
     Value = pos(SimpleValue + Ct(KeyValueList) / mark("table") + ChainValue + String),
-    SliceValue = SimpleValue + ChainValue,
+    SliceValue = Exp,
     String = Space * DoubleString + Space * SingleString + LuaString,
     SingleString = simple_string("'"),
     DoubleString = simple_string('"', true),
@@ -162,7 +164,8 @@ local build_grammar = wrap_env(debug_grammar, function(root)
     LuaStringClose = "]" * P("=") ^ 0 * "]",
     Callable = pos(Name / mark("ref")) + SelfName + VarArg + Parens / mark("parens"),
     Parens = sym("(") * SpaceBreak ^ 0 * Exp * SpaceBreak ^ 0 * sym(")"),
-    FnArgs = symx("(") * SpaceBreak ^ 0 * Ct(ExpList ^ -1) * SpaceBreak ^ 0 * sym(")") + sym("!") * -P("=") * Ct(""),
+    FnArgs = symx("(") * SpaceBreak ^ 0 * Ct(FnArgsExpList ^ -1) * SpaceBreak ^ 0 * sym(")") + sym("!") * -P("=") * Ct(""),
+    FnArgsExpList = Exp * ((Break + sym(",")) * White * Exp) ^ 0,
     Chain = (Callable + String + -S(".\\")) * ChainItems / mark("chain") + Space * (DotChainItem * ChainItems ^ -1 + ColonChain) / mark("chain"),
     ChainItems = ChainItem ^ 1 * ColonChain ^ -1 + ColonChain,
     ChainItem = Invoke + DotChainItem + Slice + symx("[") * Exp / mark("index") * sym("]"),
@@ -170,7 +173,7 @@ local build_grammar = wrap_env(debug_grammar, function(root)
     ColonChainItem = symx("\\") * _Name / mark("colon"),
     ColonChain = ColonChainItem * (Invoke * ChainItems ^ -1) ^ -1,
     Slice = symx("[") * (SliceValue + Cc(1)) * sym(",") * (SliceValue + Cc("")) * (sym(",") * SliceValue) ^ -1 * sym("]") / mark("slice"),
-    Invoke = FnArgs / mark("call") + SingleString / wrap_func_arg + DoubleString / wrap_func_arg + #P("[") * LuaString / wrap_func_arg,
+    Invoke = FnArgs / mark("call") + SingleString / wrap_func_arg + DoubleString / wrap_func_arg + L(P("[")) * LuaString / wrap_func_arg,
     TableValue = KeyValue + Ct(Exp),
     TableLit = sym("{") * Ct(TableValueList ^ -1 * sym(",") ^ -1 * (SpaceBreak * TableLitLine * (sym(",") ^ -1 * SpaceBreak * TableLitLine) ^ 0 * sym(",") ^ -1) ^ -1) * White * sym("}") / mark("table"),
     TableValueList = TableValue * (sym(",") * TableValue) ^ 0,
@@ -181,11 +184,11 @@ local build_grammar = wrap_env(debug_grammar, function(root)
     ClassBlock = SpaceBreak ^ 1 * Advance * Ct(ClassLine * (SpaceBreak ^ 1 * ClassLine) ^ 0) * PopIndent,
     ClassLine = CheckIndent * ((KeyValueList / mark("props") + Statement / mark("stm") + Exp / mark("stm")) * sym(",") ^ -1),
     Export = key("export") * (Cc("class") * ClassDecl + op("*") + op("^") + Ct(NameList) * (sym("=") * Ct(ExpListLow)) ^ -1) / mark("export"),
-    KeyValue = (sym(":") * -SomeSpace * Name * lpeg.Cp()) / self_assign + Ct((KeyName + sym("[") * Exp * sym("]") + DoubleString + SingleString) * symx(":") * (Exp + TableBlock + SpaceBreak ^ 1 * Exp)),
+    KeyValue = (sym(":") * -SomeSpace * Name * lpeg.Cp()) / self_assign + Ct((KeyName + sym("[") * Exp * sym("]") + Space * DoubleString + Space * SingleString) * symx(":") * (Exp + TableBlock + SpaceBreak ^ 1 * Exp)),
     KeyValueList = KeyValue * (sym(",") * KeyValue) ^ 0,
     KeyValueLine = CheckIndent * KeyValueList * sym(",") ^ -1,
-    FnArgsDef = sym("(") * Ct(FnArgDefList ^ -1) * (key("using") * Ct(NameList + Space * "nil") + Ct("")) * sym(")") + Ct("") * Ct(""),
-    FnArgDefList = FnArgDef * (sym(",") * FnArgDef) ^ 0 * (sym(",") * Ct(VarArg)) ^ 0 + Ct(VarArg),
+    FnArgsDef = sym("(") * White * Ct(FnArgDefList ^ -1) * (key("using") * Ct(NameList + Space * "nil") + Ct("")) * White * sym(")") + Ct("") * Ct(""),
+    FnArgDefList = FnArgDef * ((sym(",") + Break) * White * FnArgDef) ^ 0 * ((sym(",") + Break) * White * Ct(VarArg)) ^ 0 + Ct(VarArg),
     FnArgDef = Ct((Name + SelfName) * (sym("=") * Exp) ^ -1),
     FunLit = FnArgsDef * (sym("->") * Cc("slim") + sym("=>") * Cc("fat")) * (Body + Ct("")) / mark("fndef"),
     NameList = Name * (sym(",") * Name) ^ 0,

data/vendor/leafo/moonscript/parse/literals.lua

@@ -5,11 +5,15 @@ do
   local _obj_0 = require("lpeg")
   S, P, R, C = _obj_0.S, _obj_0.P, _obj_0.R, _obj_0.C
 end
+local lpeg = require("lpeg")
+local L = lpeg.luversion and lpeg.L or function(v)
+  return #v
+end
 local White = S(" \t\r\n") ^ 0
 local plain_space = S(" \t") ^ 0
 local Break = P("\r") ^ -1 * P("\n")
 local Stop = Break + -1
-local Comment = P("--") * (1 - S("\r\n")) ^ 0 * #Stop
+local Comment = P("--") * (1 - S("\r\n")) ^ 0 * L(Stop)
 local Space = plain_space * Comment ^ -1
 local SomeSpace = S(" \t") ^ 1 * Comment ^ -1
 local SpaceBreak = Space * Break
@@ -19,6 +23,7 @@ local Name = C(R("az", "AZ", "__") * AlphaNum ^ 0)
 local Num = P("0x") * R("09", "af", "AF") ^ 1 * (S("uU") ^ -1 * S("lL") ^ 2) ^ -1 + R("09") ^ 1 * (S("uU") ^ -1 * S("lL") ^ 2) + (R("09") ^ 1 * (P(".") * R("09") ^ 1) ^ -1 + P(".") * R("09") ^ 1) * (S("eE") * P("-") ^ -1 * R("09") ^ 1) ^ -1
 local Shebang = P("#!") * P(1 - Stop) ^ 0
 return safe_module("moonscript.parse.literals", {
+  L = L,
   White = White,
   Break = Break,
   Stop = Stop,

data/vendor/leafo/moonscript/parse/util.lua

@@ -41,6 +41,58 @@ extract_line = function(str, start_pos)
   end
   return str:match("^.-$")
 end
+local show_line_position
+show_line_position = function(str, pos, context)
+  if context == nil then
+    context = true
+  end
+  local lines = {
+    { }
+  }
+  for c in str:gmatch(".") do
+    lines[#lines] = lines[#lines] or { }
+    table.insert(lines[#lines], c)
+    if c == "\n" then
+      lines[#lines + 1] = { }
+    end
+  end
+  for i, line in ipairs(lines) do
+    lines[i] = table.concat(line)
+  end
+  local out
+  local remaining = pos - 1
+  for k, line in ipairs(lines) do
+    if remaining < #line then
+      local left = line:sub(1, remaining)
+      local right = line:sub(remaining + 1)
+      out = {
+        tostring(left) .. "◉" .. tostring(right)
+      }
+      if context then
+        do
+          local before = lines[k - 1]
+          if before then
+            table.insert(out, 1, before)
+          end
+        end
+        do
+          local after = lines[k + 1]
+          if after then
+            table.insert(out, after)
+          end
+        end
+      end
+      break
+    else
+      remaining = remaining - #line
+    end
+  end
+  if not (out) then
+    return "-"
+  end
+  out = table.concat(out)
+  return (out:gsub("\n*$", ""))
+end
 local mark
 mark = function(name)
   return function(...)
@@ -60,9 +112,12 @@ pos = function(patt)
   end
 end
 local got
-got = function(what)
+got = function(what, context)
+  if context == nil then
+    context = true
+  end
   return Cmt("", function(str, pos)
-    print("++ got " .. tostring(what), "[" .. tostring(extract_line(str, pos)) .. "]")
+    print("++ got " .. tostring(what), "[" .. tostring(show_line_position(str, pos, context)) .. "]")
     return true
   end)
 end
@@ -245,5 +300,7 @@ return {
   join_chain = join_chain,
   wrap_decorator = wrap_decorator,
   check_lua_string = check_lua_string,
-  self_assign = self_assign
+  self_assign = self_assign,
+  got = got,
+  show_line_position = show_line_position
 }

data/vendor/leafo/moonscript/transform/class.lua

@@ -106,7 +106,7 @@ super_scope = function(value, t, key)
   }
 end
 return function(self, node, ret, parent_assign)
-  local _, name, parent_val, body = unpack(node)
+  local name, parent_val, body = unpack(node, 2)
   if parent_val == "" then
     parent_val = nil
   end

data/vendor/leafo/moonscript/transform/names.lua

@@ -101,7 +101,18 @@ do
   _base_0.__class = _class_0
   NameProxy = _class_0
 end
+local is_name_proxy
+is_name_proxy = function(v)
+  if not (type(v) == "table") then
+    return false
+  end
+  local _exp_0 = v.__class
+  if LocalName == _exp_0 or NameProxy == _exp_0 then
+    return true
+  end
+end
 return {
   NameProxy = NameProxy,
-  LocalName = LocalName
+  LocalName = LocalName,
+  is_name_proxy = is_name_proxy
 }

data/vendor/leafo/moonscript/transform/statement.lua

@@ -1,7 +1,10 @@
 local Transformer
 Transformer = require("moonscript.transform.transformer").Transformer
-local NameProxy
-NameProxy = require("moonscript.transform.names").NameProxy
+local NameProxy, LocalName, is_name_proxy
+do
+  local _obj_0 = require("moonscript.transform.names")
+  NameProxy, LocalName, is_name_proxy = _obj_0.NameProxy, _obj_0.LocalName, _obj_0.is_name_proxy
+end
 local Run, transform_last_stm, implicitly_return, last_stm
 do
   local _obj_0 = require("moonscript.transform.statements")
@@ -201,7 +204,13 @@ return Transformer({
           local _continue_0 = false
           repeat
             local name = names[_index_0]
-            if not (name[2]:match("^%u")) then
+            local str_name
+            if ntype(name) == "ref" then
+              str_name = name[2]
+            else
+              str_name = name
+            end
+            if not (str_name:match("^%u")) then
               _continue_0 = true
               break
             end
@@ -339,7 +348,7 @@ return Transformer({
     end
   end,
   update = function(self, node)
-    local _, name, op, exp = unpack(node)
+    local name, op, exp = unpack(node, 2)
     local op_final = op:match("^(.+)=$")
     if not op_final then
       error("Unknown op: " .. op)
@@ -358,7 +367,7 @@ return Transformer({
     })
   end,
   import = function(self, node)
-    local _, names, source = unpack(node)
+    local names, source = unpack(node, 2)
     local table_values
     do
       local _accum_0 = { }
@@ -399,7 +408,7 @@ return Transformer({
     }
   end,
   comprehension = function(self, node, action)
-    local _, exp, clauses = unpack(node)
+    local exp, clauses = unpack(node, 2)
     action = action or function(exp)
       return {
         exp
@@ -475,21 +484,39 @@ return Transformer({
     return wrapped
   end,
   unless = function(self, node)
-    return {
-      "if",
-      {
-        "not",
+    local clause = node[2]
+    if ntype(clause) == "assign" then
+      if destructure.has_destructure(clause[2]) then
+        error("destructure not allowed in unless assignment")
+      end
+      return build["do"]({
+        clause,
         {
-          "parens",
-          node[2]
+          "if",
+          {
+            "not",
+            clause[2][1]
+          },
+          unpack(node, 3)
         }
-      },
-      unpack(node, 3)
-    }
+      })
+    else
+      return {
+        "if",
+        {
+          "not",
+          {
+            "parens",
+            clause
+          }
+        },
+        unpack(node, 3)
+      }
+    end
   end,
   ["if"] = function(self, node, ret)
     if ntype(node[2]) == "assign" then
-      local _, assign, body = unpack(node)
+      local assign, body = unpack(node, 2)
       if destructure.has_destructure(assign[2]) then
         local name = NameProxy("des")
         body = {
@@ -649,6 +676,18 @@ return Transformer({
           }
         }
       end
+      local names
+      do
+        local _accum_0 = { }
+        local _len_0 = 1
+        local _list_0 = node.names
+        for _index_0 = 1, #_list_0 do
+          local n = _list_0[_index_0]
+          _accum_0[_len_0] = is_name_proxy(n) and n or LocalName(n) or n
+          _len_0 = _len_0 + 1
+        end
+        names = _accum_0
+      end
       return build.group({
         list_name ~= list and build.assign_one(list_name, list) or NOOP,
         slice_var or NOOP,
@@ -658,7 +697,7 @@ return Transformer({
           body = {
             {
               "assign",
-              node.names,
+              names,
               {
                 NameProxy.index(list_name, index_name)
               }
@@ -679,7 +718,7 @@ return Transformer({
     node.body = with_continue_listener(node.body)
   end,
   switch = function(self, node, ret)
-    local _, exp, conds = unpack(node)
+    local exp, conds = unpack(node, 2)
     local exp_name = NameProxy("exp")
     local convert_cond
     convert_cond = function(cond)

data/vendor/leafo/moonscript/transform/value.lua

@@ -89,7 +89,7 @@ return Transformer({
     return a:wrap(node)
   end,
   tblcomprehension = function(self, node)
-    local _, explist, clauses = unpack(node)
+    local explist, clauses = unpack(node, 2)
     local key_exp, value_exp = unpack(explist)
     local accum = NameProxy("tbl")
     local inner
@@ -234,7 +234,7 @@ return Transformer({
     end
   end,
   block_exp = function(self, node)
-    local _, body = unpack(node)
+    local body = unpack(node, 2)
     local fn = nil
     local arg_list = { }
     fn = smart_node(build.fndef({

data/vendor/leafo/moonscript/version.lua

@@ -1,4 +1,4 @@
-local version = "0.4.0"
+local version = "0.5.0"
 return {
   version = version,
   print_version = function()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufus-lua-moon
 version: !ruby/object:Gem::Version
-  version: 0.4.0.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Stas Ukolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: appveyor-worker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rufus-lua
   requirement: !ruby/object:Gem::Requirement
@@ -106,9 +92,11 @@ files:
 - vendor/leafo/moon/all.moon
 - vendor/leafo/moon/init.moon
 - vendor/leafo/moonscript/base.lua
+- vendor/leafo/moonscript/cmd/args.lua
 - vendor/leafo/moonscript/cmd/coverage.lua
 - vendor/leafo/moonscript/cmd/lint.lua
 - vendor/leafo/moonscript/cmd/moonc.lua
+- vendor/leafo/moonscript/cmd/watchers.lua
 - vendor/leafo/moonscript/compile.lua
 - vendor/leafo/moonscript/compile/statement.lua
 - vendor/leafo/moonscript/compile/value.lua
@@ -154,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: ''