rufus-lua-moon 0.2.2 → 0.2.3

data/vendor/lua/moonscript/types.lua

@@ -1,14 +1,14 @@
-module("moonscript.types", package.seeall)
 local util = require("moonscript.util")
 local data = require("moonscript.data")
 local insert = table.insert
-manual_return = data.Set({
+local unpack = util.unpack
+local manual_return = data.Set({
   "foreach",
   "for",
   "while",
   "return"
 })
-cascading = data.Set({
+local cascading = data.Set({
   "if",
   "unless",
   "with",
@@ -16,13 +16,7 @@ cascading = data.Set({
   "class",
   "do"
 })
-is_value = function(stm)
-  local compile, transform = moonscript.compile, moonscript.transform
-  return compile.Block:is_value(stm) or transform.Value:can_transform(stm)
-end
-comprehension_has_value = function(comp)
-  return is_value(comp[2])
-end
+local ntype
 ntype = function(node)
   local _exp_0 = type(node)
   if "nil" == _exp_0 then
@@ -33,9 +27,41 @@ ntype = function(node)
     return "value"
   end
 end
+local mtype
+do
+  local moon_type = util.moon.type
+  mtype = function(val)
+    local mt = getmetatable(val)
+    if mt and mt.smart_node then
+      return "table"
+    end
+    return moon_type(val)
+  end
+end
+local has_value
+has_value = function(node)
+  if ntype(node) == "chain" then
+    local ctype = ntype(node[#node])
+    return ctype ~= "call" and ctype ~= "colon"
+  else
+    return true
+  end
+end
+local is_value
+is_value = function(stm)
+  local compile = require("moonscript.compile")
+  local transform = require("moonscript.transform")
+  return compile.Block:is_value(stm) or transform.Value:can_transform(stm)
+end
+local comprehension_has_value
+comprehension_has_value = function(comp)
+  return is_value(comp[2])
+end
+local value_is_singular
 value_is_singular = function(node)
   return type(node) ~= "table" or node[1] ~= "exp" or #node == 2
 end
+local is_slice
 is_slice = function(node)
   return ntype(node) == "chain" and ntype(node[#node]) == "slice"
 end
@@ -175,7 +201,7 @@ make_builder = function(name)
     return node
   end
 end
-build = nil
+local build = nil
 build = setmetatable({
   group = function(body)
     if body == nil then
@@ -246,25 +272,43 @@ build = setmetatable({
     return rawget(self, name)
   end
 })
-smart_node = function(node)
-  local index = key_table[ntype(node)]
-  if not index then
-    return node
-  end
-  return setmetatable(node, {
-    __index = function(node, key)
-      if index[key] then
-        return rawget(node, index[key])
-      elseif type(key) == "string" then
-        return error("unknown key: `" .. key .. "` on node type: `" .. ntype(node) .. "`")
+local smart_node_mt = setmetatable({ }, {
+  __index = function(self, node_type)
+    local index = key_table[node_type]
+    local mt = {
+      smart_node = true,
+      __index = function(node, key)
+        if index[key] then
+          return rawget(node, index[key])
+        elseif type(key) == "string" then
+          return error("unknown key: `" .. key .. "` on node type: `" .. ntype(node) .. "`")
+        end
+      end,
+      __newindex = function(node, key, value)
+        if index[key] then
+          key = index[key]
+        end
+        return rawset(node, key, value)
       end
-    end,
-    __newindex = function(node, key, value)
-      if index[key] then
-        key = index[key]
-      end
-      return rawset(node, key, value)
-    end
-  })
+    }
+    self[node_type] = mt
+    return mt
+  end
+})
+local smart_node
+smart_node = function(node)
+  return setmetatable(node, smart_node_mt[ntype(node)])
 end
-return nil
+return {
+  ntype = ntype,
+  smart_node = smart_node,
+  build = build,
+  is_value = is_value,
+  is_slice = is_slice,
+  manual_return = manual_return,
+  cascading = cascading,
+  value_is_singular = value_is_singular,
+  comprehension_has_value = comprehension_has_value,
+  has_value = has_value,
+  mtype = mtype
+}

data/vendor/lua/moonscript/util.lua

@@ -1,9 +1,23 @@
-module("moonscript.util", package.seeall)
 local concat = table.concat
-moon = {
+local unpack = unpack or table.unpack
+local type = type
+local moon = {
   is_object = function(value)
     return type(value) == "table" and value.__class
   end,
+  is_a = function(thing, t)
+    if not (type(thing) == "table") then
+      return false
+    end
+    local cls = thing.__class
+    while cls do
+      if cls == t then
+        return true
+      end
+      cls = cls.__parent
+    end
+    return false
+  end,
   type = function(value)
     local base_type = type(value)
     if base_type == "table" then
@@ -15,6 +29,7 @@ moon = {
     return base_type
   end
 }
+local pos_to_line
 pos_to_line = function(str, pos)
   local line = 1
   for _ in str:sub(1, pos):gmatch("\n") do
@@ -22,14 +37,11 @@ pos_to_line = function(str, pos)
   end
   return line
 end
-get_closest_line = function(str, line_num)
-  local line = get_line(str, line_num)
-  if (not line or trim(line) == "") and line_num > 1 then
-    return get_closest_line(str, line_num - 1)
-  else
-    return line, line_num
-  end
+local trim
+trim = function(str)
+  return str:match("^%s*(.-)%s*$")
 end
+local get_line
 get_line = function(str, line_num)
   for line in str:gmatch("([^\n]*)\n?") do
     if line_num == 1 then
@@ -38,6 +50,16 @@ get_line = function(str, line_num)
     line_num = line_num - 1
   end
 end
+local get_closest_line
+get_closest_line = function(str, line_num)
+  local line = get_line(str, line_num)
+  if (not line or trim(line) == "") and line_num > 1 then
+    return get_closest_line(str, line_num - 1)
+  else
+    return line, line_num
+  end
+end
+local reversed
 reversed = function(seq)
   return coroutine.wrap(function()
     for i = #seq, 1, -1 do
@@ -45,9 +67,7 @@ reversed = function(seq)
     end
   end)
 end
-trim = function(str)
-  return str:match("^%s*(.-)%s*$")
-end
+local split
 split = function(str, delim)
   if str == "" then
     return { }
@@ -55,14 +75,15 @@ split = function(str, delim)
   str = str .. delim
   return (function()
     local _accum_0 = { }
-    local _len_0 = 0
+    local _len_0 = 1
     for m in str:gmatch("(.-)" .. delim) do
-      _len_0 = _len_0 + 1
       _accum_0[_len_0] = m
+      _len_0 = _len_0 + 1
     end
     return _accum_0
   end)()
 end
+local dump
 dump = function(what)
   local seen = { }
   local _dump
@@ -81,13 +102,10 @@ dump = function(what)
       depth = depth + 1
       local lines = (function()
         local _accum_0 = { }
-        local _len_0 = 0
+        local _len_0 = 1
         for k, v in pairs(what) do
-          local _value_0 = (" "):rep(depth * 4) .. "[" .. tostring(k) .. "] = " .. _dump(v, depth)
-          if _value_0 ~= nil then
-            _len_0 = _len_0 + 1
-            _accum_0[_len_0] = _value_0
-          end
+          _accum_0[_len_0] = (" "):rep(depth * 4) .. "[" .. tostring(k) .. "] = " .. _dump(v, depth)
+          _len_0 = _len_0 + 1
         end
         return _accum_0
       end)()
@@ -99,16 +117,17 @@ dump = function(what)
   end
   return _dump(what)
 end
+local debug_posmap
 debug_posmap = function(posmap, moon_code, lua_code)
   local tuples = (function()
     local _accum_0 = { }
-    local _len_0 = 0
+    local _len_0 = 1
     for k, v in pairs(posmap) do
-      _len_0 = _len_0 + 1
       _accum_0[_len_0] = {
         k,
         v
       }
+      _len_0 = _len_0 + 1
     end
     return _accum_0
   end)()
@@ -117,7 +136,7 @@ debug_posmap = function(posmap, moon_code, lua_code)
   end)
   local lines = (function()
     local _accum_0 = { }
-    local _len_0 = 0
+    local _len_0 = 1
     local _list_0 = tuples
     for _index_0 = 1, #_list_0 do
       local pair = _list_0[_index_0]
@@ -126,13 +145,68 @@ debug_posmap = function(posmap, moon_code, lua_code)
       local lua_text = get_line(lua_code, lua_line)
       local moon_text = get_closest_line(moon_code, moon_line)
       local _value_0 = tostring(pos) .. "\t " .. tostring(lua_line) .. ":[ " .. tostring(trim(lua_text)) .. " ] >> " .. tostring(moon_line) .. ":[ " .. tostring(trim(moon_text)) .. " ]"
-      if _value_0 ~= nil then
-        _len_0 = _len_0 + 1
-        _accum_0[_len_0] = _value_0
-      end
+      _accum_0[_len_0] = _value_0
+      _len_0 = _len_0 + 1
     end
     return _accum_0
   end)()
   return concat(lines, "\n")
 end
-return nil
+local setfenv = setfenv or function(fn, env)
+  local name
+  local i = 1
+  while true do
+    name = debug.getupvalue(fn, i)
+    if not name or name == "_ENV" then
+      break
+    end
+    i = i + 1
+  end
+  if name then
+    debug.upvaluejoin(fn, i, (function()
+      return env
+    end), 1)
+  end
+  return fn
+end
+local getfenv = getfenv or function(fn)
+  local i = 1
+  while true do
+    local name, val = debug.getupvalue(fn, i)
+    if not (name) then
+      break
+    end
+    if name == "_ENV" then
+      return val
+    end
+    i = i + 1
+  end
+  return nil
+end
+local get_options
+get_options = function(...)
+  local count = select("#", ...)
+  local opts = select(count, ...)
+  if type(opts) == "table" then
+    return opts, unpack({
+      ...
+    }, nil, count - 1)
+  else
+    return { }, ...
+  end
+end
+return {
+  moon = moon,
+  pos_to_line = pos_to_line,
+  get_closest_line = get_closest_line,
+  get_line = get_line,
+  reversed = reversed,
+  trim = trim,
+  split = split,
+  dump = dump,
+  debug_posmap = debug_posmap,
+  getfenv = getfenv,
+  setfenv = setfenv,
+  get_options = get_options,
+  unpack = unpack
+}

data/vendor/lua/moonscript/version.lua

@@ -1,7 +1,7 @@
 
 module("moonscript.version", package.seeall)
 
-version = "0.2.2"
+version = "0.2.3"
 function print_version()
 	print("MoonScript version "..version)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rufus-lua-moon
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Stas Ukolov
@@ -70,15 +70,17 @@ files:
 - vendor/lua/moon/all.moon
 - vendor/lua/moon/init.moon
 - vendor/lua/moonscript/compile.lua
-- vendor/lua/moonscript/compile/format.lua
 - vendor/lua/moonscript/compile/statement.lua
 - vendor/lua/moonscript/compile/value.lua
 - vendor/lua/moonscript/data.lua
 - vendor/lua/moonscript/dump.lua
 - vendor/lua/moonscript/errors.lua
 - vendor/lua/moonscript/init.lua
+- vendor/lua/moonscript/line_tables.lua
 - vendor/lua/moonscript/parse.lua
 - vendor/lua/moonscript/transform.lua
+- vendor/lua/moonscript/transform/destructure.lua
+- vendor/lua/moonscript/transform/names.lua
 - vendor/lua/moonscript/types.lua
 - vendor/lua/moonscript/util.lua
 - vendor/lua/moonscript/version.lua

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

@@ -1,49 +0,0 @@
-module("moonscript.compile", package.seeall)
-local util = require("moonscript.util")
-local data = require("moonscript.data")
-local Set
-do
-  local _table_0 = require("moonscript.data")
-  Set = _table_0.Set
-end
-local ntype
-do
-  local _table_0 = require("moonscript.types")
-  ntype = _table_0.ntype
-end
-local concat, insert = table.concat, table.insert
-indent_char = "  "
-user_error = function(...)
-  return error({
-    "user-error",
-    ...
-  })
-end
-moonlib = {
-  bind = function(tbl, name)
-    return concat({
-      "moon.bind(",
-      tbl,
-      ".",
-      name,
-      ", ",
-      tbl,
-      ")"
-    })
-  end
-}
-has_value = function(node)
-  if ntype(node) == "chain" then
-    local ctype = ntype(node[#node])
-    return ctype ~= "call" and ctype ~= "colon"
-  else
-    return true
-  end
-end
-count_lines = function(str)
-  local count = 1
-  for _ in str:gmatch("\n") do
-    count = count + 1
-  end
-  return count
-end