rufus-lua-moon 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9ac2290802ee13f83bf597434e4c19bd50a4517
-  data.tar.gz: 495d4d7419f763778794c0475f9285e1936c57bc
+  metadata.gz: 59faaa1677c7e57480d6a18470b0dec01f916d9c
+  data.tar.gz: 15ccf6ad23a02d98574f68aa0a2139a912d59669
 SHA512:
-  metadata.gz: b78d65cffbcfe8a00d5a6b3d3b4cbde831f1edd7fffa3e9fc417dfeda319186d2b89032911dec16fc12c51d5b28ce33fb85ee25422a81cce860ad05bda9e8f47
-  data.tar.gz: 4e0b5ce5fd0e1cc5507f1baf9bc2ddde199d0dd60542f750786baa06e4c105c6e19e98980f4fd3482409ac9caecaecf029d0d25fa68c7a12a04b3c38ceb83794
+  metadata.gz: 4d7f498e85e7a08aebf7b14f5c60862e13b2894674219f694ef60a3d8d018ab55603c72624f82e3b01505c7471dfde19859a8049c67794d49752c143bbd9a7bd
+  data.tar.gz: 27128fdaffadc31ba248b4574d1fef272daf25c1019fd66c031f39ba737f55f4cc03928d3b15cc8b1d3b62b654b3bbfc1042ae0f0bbea47f896c57858c32821f

data/vendor/leafo/moon/init.moon

@@ -1,11 +1,9 @@
 
-util = require "moonscript.util"
 lua = { :debug, :type }
+import getfenv, setfenv, dump from require "moonscript.util"
 
 local *
 
-dump = util.dump
-
 p = (...) ->
   print dump ...
 

data/vendor/leafo/moonscript/base.lua

@@ -66,9 +66,7 @@ end
 moon_loader = function(name)
   local name_path = name:gsub("%.", dirsep)
   local file, file_path
-  local _list_0 = split(package.moonpath, ";")
-  for _index_0 = 1, #_list_0 do
-    local path = _list_0[_index_0]
+  for path in package.moonpath:gmatch("[^;]+") do
     file_path = path:gsub("?", name_path)
     file = io.open(file_path)
     if file then

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

@@ -58,6 +58,7 @@ format_file = function(fname, positions)
 end
 local CodeCoverage
 do
+  local _class_0
   local _base_0 = {
     reset = function(self)
       self.line_counts = create_counter()
@@ -120,7 +121,7 @@ do
     end
   }
   _base_0.__index = _base_0
-  local _class_0 = setmetatable({
+  _class_0 = setmetatable({
     __init = function(self)
       return self:reset()
     end,

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

@@ -52,6 +52,7 @@ local default_whitelist = Set({
 })
 local LinterBlock
 do
+  local _class_0
   local _parent_0 = Block
   local _base_0 = {
     lint_mark_used = function(self, name)
@@ -120,11 +121,11 @@ do
     end,
     render = function(self, ...)
       self:lint_check_unused()
-      return _parent_0.render(self, ...)
+      return _class_0.__parent.__base.render(self, ...)
     end,
     block = function(self, ...)
       do
-        local _with_0 = _parent_0.block(self, ...)
+        local _with_0 = _class_0.__parent.__base.block(self, ...)
         _with_0.block = self.block
         _with_0.render = self.render
         _with_0.get_root_block = self.get_root_block
@@ -138,12 +139,12 @@ do
   }
   _base_0.__index = _base_0
   setmetatable(_base_0, _parent_0.__base)
-  local _class_0 = setmetatable({
+  _class_0 = setmetatable({
     __init = function(self, whitelist_globals, ...)
       if whitelist_globals == nil then
         whitelist_globals = default_whitelist
       end
-      _parent_0.__init(self, ...)
+      _class_0.__parent.__init(self, ...)
       self.get_root_block = function()
         return self
       end
@@ -206,7 +207,10 @@ do
     __index = function(cls, name)
       local val = rawget(_base_0, name)
       if val == nil then
-        return _parent_0[name]
+        local parent = rawget(cls, "__parent")
+        if parent then
+          return parent[name]
+        end
       else
         return val
       end

data/vendor/leafo/moonscript/compile.lua

@@ -8,10 +8,10 @@ do
 end
 local Set
 Set = require("moonscript.data").Set
-local ntype, has_value
+local ntype, value_can_be_statement
 do
   local _obj_0 = require("moonscript.types")
-  ntype, has_value = _obj_0.ntype, _obj_0.has_value
+  ntype, value_can_be_statement = _obj_0.ntype, _obj_0.value_can_be_statement
 end
 local statement_compilers = require("moonscript.compile.statement")
 local value_compilers = require("moonscript.compile.value")
@@ -26,6 +26,7 @@ local mtype = util.moon.type
 local indent_char = "  "
 local Line, DelayedLine, Lines, Block, RootBlock
 do
+  local _class_0
   local _base_0 = {
     mark_pos = function(self, pos, line)
       if line == nil then
@@ -127,7 +128,7 @@ do
     end
   }
   _base_0.__index = _base_0
-  local _class_0 = setmetatable({
+  _class_0 = setmetatable({
     __init = function(self)
       self.posmap = { }
     end,
@@ -145,6 +146,7 @@ do
   Lines = _class_0
 end
 do
+  local _class_0
   local _base_0 = {
     pos = nil,
     append_list = function(self, items, delim)
@@ -208,7 +210,7 @@ do
     end
   }
   _base_0.__index = _base_0
-  local _class_0 = setmetatable({
+  _class_0 = setmetatable({
     __init = function() end,
     __base = _base_0,
     __name = "Line"
@@ -224,6 +226,7 @@ do
   Line = _class_0
 end
 do
+  local _class_0
   local _base_0 = {
     prepare = function() end,
     render = function(self)
@@ -232,7 +235,7 @@ do
     end
   }
   _base_0.__index = _base_0
-  local _class_0 = setmetatable({
+  _class_0 = setmetatable({
     __init = function(self, fn)
       self.prepare = fn
     end,
@@ -250,6 +253,7 @@ do
   DelayedLine = _class_0
 end
 do
+  local _class_0
   local _base_0 = {
     header = "do",
     footer = "end",
@@ -525,7 +529,9 @@ do
         if fn then
           result = fn(self, node, ...)
         else
-          if has_value(node) then
+          if value_can_be_statement(node) then
+            result = self:value(node)
+          else
             result = self:stm({
               "assign",
               {
@@ -535,8 +541,6 @@ do
                 node
               }
             })
-          else
-            result = self:value(node)
           end
         end
       end
@@ -573,7 +577,7 @@ do
     end
   }
   _base_0.__index = _base_0
-  local _class_0 = setmetatable({
+  _class_0 = setmetatable({
     __init = function(self, parent, header, footer)
       self.parent, self.header, self.footer = parent, header, footer
       self._lines = Lines()
@@ -613,6 +617,7 @@ do
   Block = _class_0
 end
 do
+  local _class_0
   local _parent_0 = Block
   local _base_0 = {
     __tostring = function(self)
@@ -634,11 +639,11 @@ do
   }
   _base_0.__index = _base_0
   setmetatable(_base_0, _parent_0.__base)
-  local _class_0 = setmetatable({
+  _class_0 = setmetatable({
     __init = function(self, options)
       self.options = options
       self.root = self
-      return _parent_0.__init(self)
+      return _class_0.__parent.__init(self)
     end,
     __base = _base_0,
     __name = "RootBlock",
@@ -647,7 +652,10 @@ do
     __index = function(cls, name)
       local val = rawget(_base_0, name)
       if val == nil then
-        return _parent_0[name]
+        local parent = rawget(cls, "__parent")
+        if parent then
+          return parent[name]
+        end
       else
         return val
       end

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

@@ -1,6 +1,3 @@
-local util = require("moonscript.util")
-local reversed, unpack
-reversed, unpack = util.reversed, util.unpack
 local ntype
 ntype = require("moonscript.types").ntype
 local concat, insert
@@ -8,6 +5,8 @@ do
   local _obj_0 = table
   concat, insert = _obj_0.concat, _obj_0.insert
 end
+local unpack
+unpack = require("moonscript.util").unpack
 return {
   raw = function(self, node)
     return self:add(node[2])

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

@@ -17,6 +17,16 @@ local string_chars = {
   ["\n"] = "\\n"
 }
 return {
+  scoped = function(self, node)
+    local _, before, value, after
+    _, before, value, after = node[1], node[2], node[3], node[4]
+    _ = before and before:call(self)
+    do
+      local _with_0 = self:value(value)
+      _ = after and after:call(self)
+      return _with_0
+    end
+  end,
   exp = function(self, node)
     local _comp
     _comp = function(i, value)
@@ -71,11 +81,13 @@ return {
   chain = function(self, node)
     local callee = node[2]
     local callee_type = ntype(callee)
-    if callee == -1 then
+    local item_offset = 3
+    if callee_type == "dot" or callee_type == "colon" or callee_type == "index" then
       callee = self:get("scope_var")
-      if not callee then
+      if not (callee) then
         user_error("Short-dot syntax must be called within a with block")
       end
+      item_offset = 2
     end
     if callee_type == "ref" and callee[2] == "super" or callee == "super" then
       do
@@ -95,7 +107,7 @@ return {
       elseif t == "dot" then
         return ".", tostring(arg)
       elseif t == "colon" then
-        return ":", arg, chain_item(node[3])
+        return ":", tostring(arg)
       elseif t == "colon_stub" then
         return user_error("Uncalled colon stub")
       else
@@ -112,7 +124,7 @@ return {
     local actions
     do
       local _with_0 = self:line()
-      for _index_0 = 3, #node do
+      for _index_0 = item_offset, #node do
         local action = node[_index_0]
         _with_0:append(chain_item(action))
       end
@@ -246,9 +258,7 @@ return {
           else
             assign = self:line("[", _with_0:value(key), "]")
           end
-          _with_0:set("current_block", key)
           local out = self:line(assign, " = ", _with_0:value(value))
-          _with_0:set("current_block", nil)
           return out
         else
           return self:line(_with_0:value(tuple[1]))

data/vendor/leafo/moonscript/data.lua

@@ -14,6 +14,7 @@ Set = function(items)
 end
 local Stack
 do
+  local _class_0
   local _base_0 = {
     __tostring = function(self)
       return "<Stack {" .. concat(self, ", ") .. "}>"
@@ -34,7 +35,7 @@ do
     end
   }
   _base_0.__index = _base_0
-  local _class_0 = setmetatable({
+  _class_0 = setmetatable({
     __init = function(self, ...)
       self:push(...)
       return nil

data/vendor/leafo/moonscript/parse.lua

@@ -27,18 +27,20 @@ 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, flatten_func, flatten_string_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
 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, flatten_func, flatten_string_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.flatten_func, _obj_0.flatten_string_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 = _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
 end
-local build_grammar = wrap_env(debug_grammar, function()
+local build_grammar = wrap_env(debug_grammar, function(root)
   local _indent = Stack(0)
   local _do_stack = Stack(0)
-  local last_pos = 0
+  local state = {
+    last_pos = 0
+  }
   local check_indent
   check_indent = function(str, pos, indent)
-    last_pos = pos
+    state.last_pos = pos
     return _indent:top() == indent
   end
   local advance_indent
@@ -104,7 +106,7 @@ local build_grammar = wrap_env(debug_grammar, function()
   local KeyName = SelfName + Space * _Name / mark("key_literal")
   local VarArg = Space * P("...") / trim
   local g = P({
-    File,
+    root or File,
     File = Shebang ^ -1 * (Block + Ct("")),
     Block = Ct(Line * (Break ^ 1 * Line) ^ 0),
     CheckIndent = Cmt(Indent, check_indent),
@@ -118,7 +120,7 @@ local build_grammar = wrap_env(debug_grammar, function()
     InBlock = Advance * Block * PopIndent,
     Local = key("local") * ((op("*") + op("^")) / mark("declare_glob") + Ct(NameList) / mark("declare_with_shadows")),
     Import = key("import") * Ct(ImportNameList) * SpaceBreak ^ 0 * key("from") * Exp / mark("import"),
-    ImportName = (sym("\\") * Ct(Cc("colon_stub") * Name) + Name),
+    ImportName = (sym("\\") * Ct(Cc("colon") * Name) + Name),
     ImportNameList = SpaceBreak ^ 0 * ImportName * ((SpaceBreak ^ 1 + sym(",") * SpaceBreak ^ 0) * ImportName) ^ 0,
     BreakLoop = Ct(key("break") / trim) + Ct(key("continue") / trim),
     Return = key("return") * (ExpListLow / mark("explist") + C("")) / mark("return"),
@@ -146,13 +148,12 @@ local build_grammar = wrap_env(debug_grammar, function()
     CharOperators = Space * C(S("+-*/%^><")),
     WordOperators = op("or") + op("and") + op("<=") + op(">=") + op("~=") + op("!=") + op("==") + op(".."),
     BinaryOperator = (WordOperators + CharOperators) * SpaceBreak ^ 0,
-    Assignable = Cmt(DotChain + Chain, check_assignable) + Name + SelfName,
+    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,
-    ChainValue = StringChain + ((Chain + DotChain + Callable) * Ct(InvokeArgs ^ -1)) / flatten_func,
-    Value = pos(SimpleValue + Ct(KeyValueList) / mark("table") + ChainValue),
+    ChainValue = (Chain + Callable) * Ct(InvokeArgs ^ -1) / join_chain,
+    Value = pos(SimpleValue + Ct(KeyValueList) / mark("table") + ChainValue + String),
     SliceValue = SimpleValue + ChainValue,
-    StringChain = String * (Ct((ColonCall + ColonSuffix) * ChainTail ^ -1) * Ct(InvokeArgs ^ -1)) ^ -1 / flatten_string_chain,
     String = Space * DoubleString + Space * SingleString + LuaString,
     SingleString = simple_string("'"),
     DoubleString = simple_string('"', true),
@@ -162,14 +163,14 @@ local build_grammar = wrap_env(debug_grammar, function()
     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(""),
-    ChainTail = ChainItem ^ 1 * ColonSuffix ^ -1 + ColonSuffix,
-    Chain = Callable * ChainTail / mark("chain"),
-    DotChain = (sym(".") * Cc(-1) * (_Name / mark("dot")) * ChainTail ^ -1) / mark("chain") + (sym("\\") * Cc(-1) * ((_Name * Invoke / mark("colon")) * ChainTail ^ -1 + (_Name / mark("colon_stub")))) / mark("chain"),
-    ChainItem = Invoke + Slice + symx("[") * Exp / mark("index") * sym("]") + symx(".") * _Name / mark("dot") + ColonCall,
+    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("]"),
+    DotChainItem = symx(".") * _Name / mark("dot"),
+    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"),
-    ColonCall = symx("\\") * (_Name * Invoke) / mark("colon"),
-    ColonSuffix = symx("\\") * _Name / mark("colon_stub"),
-    Invoke = FnArgs / mark("call") + SingleString / wrap_func_arg + DoubleString / wrap_func_arg,
+    Invoke = FnArgs / mark("call") + SingleString / wrap_func_arg + DoubleString / wrap_func_arg + #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,
@@ -196,6 +197,11 @@ local build_grammar = wrap_env(debug_grammar, function()
     ArgBlock = ArgLine * (sym(",") * SpaceBreak * ArgLine) ^ 0 * PopIndent,
     ArgLine = CheckIndent * ExpList
   })
+  return g, state
+end)
+local file_parser
+file_parser = function()
+  local g, state = build_grammar()
   local file_grammar = White * g * White * -1
   return {
     match = function(self, str)
@@ -210,7 +216,7 @@ local build_grammar = wrap_env(debug_grammar, function()
       end
       if not (tree) then
         local msg
-        local err_pos = last_pos
+        local err_pos = state.last_pos
         if err then
           local node
           node, msg = unpack(err)
@@ -226,10 +232,11 @@ local build_grammar = wrap_env(debug_grammar, function()
       return tree
     end
   }
-end)
+end
 return {
   extract_line = extract_line,
+  build_grammar = build_grammar,
   string = function(str)
-    return build_grammar():match(str)
+    return file_parser():match(str)
   end
 }

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

@@ -34,8 +34,9 @@ wrap_env = function(debug, fn)
     end
     wrap_name = function(name)
       local v = V(name)
-      v = Cmt("", function()
-        iprint("* " .. name)
+      v = Cmt("", function(str, pos)
+        local rest = str:sub(pos, -1):match("^([^\n]*)")
+        iprint("* " .. tostring(name) .. " (" .. tostring(rest) .. ")")
         indent = indent + 1
         return true
       end) * Cmt(v, function(str, pos, ...)