rufus-lua-moon 0.2.5.0 → 0.2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7190b583c1d9cf355c5ce5f685513fc19111d18
-  data.tar.gz: 3abbedc70d9db04e7b0b7f5f018d09651d147e48
+  metadata.gz: ec64394e84ba8c8288134cf012d62151406b8a1d
+  data.tar.gz: 1217bea89d96bed46de5accb1d54a2197182ed8a
 SHA512:
-  metadata.gz: e70ba8a5a494e8ee3ff55dc5cf46570b3dd80b91a0261a45525ab9b9dde0730e457454e1381508155ec5a88fffe3acea110051d761b3ff0aef646580b3a6f6a0
-  data.tar.gz: b465395ebe85e03185b25c7d1e50178f8cb2b3d1552c9716f939d30262e7ea16f0c268e1dadcfa03e8906465c4358cb1ec9475c2775eb4c39fc372d5b55c6607
+  metadata.gz: 18b5ef94e1185a6e24e9a01da1d35fc767d83c24e9a2d99e51bf615b3a6ba4b97469404c0c347acb30eb793ee14b67319089efbb8930257761e396a71391f0d8
+  data.tar.gz: ef43c5d6c538fce5f2c61f04dd4aff8b1277c2aae791512656b2eb97242c8ab3961a3e47f9f6d5c1c43871502fc2e863838250b66552bf9cfff1fae0a482ee92

data/vendor/lua/moonscript/base.lua

@@ -33,7 +33,7 @@ to_lua = function(text, options)
   end
   if "string" ~= type(text) then
     local t = type(text)
-    return nil, "expecting string (got " .. t .. ")", 2
+    return nil, "expecting string (got " .. t .. ")"
   end
   local tree, err = parse.string(text)
   if not tree then
@@ -41,7 +41,7 @@ to_lua = function(text, options)
   end
   local code, ltable, pos = compile.tree(tree, options)
   if not code then
-    return nil, compile.format_error(ltable, pos, text), 2
+    return nil, compile.format_error(ltable, pos, text)
   end
   return code, ltable
 end
@@ -60,7 +60,7 @@ moon_loader = function(name)
   if file then
     local text = file:read("*a")
     file:close()
-    local res, err = loadstring(text, file_path)
+    local res, err = loadstring(text, "@" .. tostring(file_path))
     if not res then
       error(file_path .. ": " .. err)
     end
@@ -90,7 +90,7 @@ loadfile = function(fname, ...)
   end
   local text = assert(file:read("*a"))
   file:close()
-  return loadstring(text, fname, ...)
+  return loadstring(text, "@" .. tostring(fname), ...)
 end
 dofile = function(...)
   local f = assert(loadfile(...))
@@ -128,7 +128,6 @@ return {
   insert_loader = insert_loader,
   remove_loader = remove_loader,
   to_lua = to_lua,
-  moon_chunk = moon_chunk,
   moon_loader = moon_loader,
   dirsep = dirsep,
   dofile = dofile,

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

@@ -0,0 +1,198 @@
+local lfs = require("lfs")
+local split
+do
+  local _obj_0 = require("moonscript.util")
+  split = _obj_0.split
+end
+local dirsep, dirsep_chars, mkdir, normalize_dir, parse_dir, parse_file, convert_path, format_time, gettime, compile_file_text, write_file, compile_and_write, is_abs_path, path_to_target
+dirsep = package.config:sub(1, 1)
+if dirsep == "\\" then
+  dirsep_chars = "\\/"
+else
+  dirsep_chars = dirsep
+end
+mkdir = function(path)
+  local chunks = split(path, dirsep)
+  local accum
+  for _index_0 = 1, #chunks do
+    local dir = chunks[_index_0]
+    accum = accum and tostring(accum) .. tostring(dirsep) .. tostring(dir) or dir
+    lfs.mkdir(accum)
+  end
+  return lfs.attributes(path, "mode")
+end
+normalize_dir = function(path)
+  return path:match("^(.-)[" .. tostring(dirsep_chars) .. "]*$") .. dirsep
+end
+parse_dir = function(path)
+  return (path:match("^(.-)[^" .. tostring(dirsep_chars) .. "]*$"))
+end
+parse_file = function(path)
+  return (path:match("^.-([^" .. tostring(dirsep_chars) .. "]*)$"))
+end
+convert_path = function(path)
+  local new_path = path:gsub("%.moon$", ".lua")
+  if new_path == path then
+    new_path = path .. ".lua"
+  end
+  return new_path
+end
+format_time = function(time)
+  return ("%.3fms"):format(time * 1000)
+end
+do
+  local socket
+  gettime = function()
+    if socket == nil then
+      pcall(function()
+        socket = require("socket")
+      end)
+      if not (socket) then
+        socket = false
+      end
+    end
+    if socket then
+      return socket.gettime()
+    else
+      return nil, "LuaSocket needed for benchmark"
+    end
+  end
+end
+compile_file_text = function(text, fname, opts)
+  if opts == nil then
+    opts = { }
+  end
+  local parse = require("moonscript.parse")
+  local compile = require("moonscript.compile")
+  local parse_time
+  if opts.benchmark then
+    parse_time = assert(gettime())
+  end
+  local tree, err = parse.string(text)
+  if not (tree) then
+    return nil, err
+  end
+  if parse_time then
+    parse_time = gettime() - parse_time
+  end
+  if opts.show_parse_tree then
+    local dump = require("moonscript.dump")
+    dump.tree(tree)
+    return true
+  end
+  local compile_time
+  if opts.benchmark then
+    compile_time = gettime()
+  end
+  local code, posmap_or_err, err_pos = compile.tree(tree)
+  if not (code) then
+    return nil, compile.format_error(posmap_or_err, err_pos, text)
+  end
+  if compile_time then
+    compile_time = gettime() - compile_time
+  end
+  if opts.show_posmap then
+    local debug_posmap
+    do
+      local _obj_0 = require("moonscript.util")
+      debug_posmap = _obj_0.debug_posmap
+    end
+    print("Pos", "Lua", ">>", "Moon")
+    print(debug_posmap(posmap_or_err, text, code))
+    return true
+  end
+  if opts.benchmark then
+    print(table.concat({
+      fname,
+      "Parse time  \t" .. format_time(parse_time),
+      "Compile time\t" .. format_time(compile_time),
+      ""
+    }, "\n"))
+    return nil
+  end
+  return code
+end
+write_file = function(fname, code)
+  mkdir(parse_dir(fname))
+  local f, err = io.open(fname, "w")
+  if not (f) then
+    return nil, err
+  end
+  assert(f:write(code))
+  assert(f:write("\n"))
+  f:close()
+  return "build"
+end
+compile_and_write = function(src, dest, opts)
+  if opts == nil then
+    opts = { }
+  end
+  local f = io.open(src)
+  if not (f) then
+    return nil, "Can't find file"
+  end
+  local text = assert(f:read("*a"))
+  f:close()
+  local code, err = compile_file_text(text, opts)
+  if not code then
+    return nil, err
+  end
+  if code == true then
+    return true
+  end
+  if opts.print then
+    print(text)
+    return true
+  end
+  return write_file(dest, code)
+end
+is_abs_path = function(path)
+  local first = path:sub(1, 1)
+  if dirsep == "\\" then
+    return first == "/" or first == "\\" or path:sub(2, 1) == ":"
+  else
+    return first == dirsep
+  end
+end
+path_to_target = function(path, target_dir, base_dir)
+  if target_dir == nil then
+    target_dir = nil
+  end
+  if base_dir == nil then
+    base_dir = nil
+  end
+  local target = convert_path(path)
+  if target_dir then
+    target_dir = normalize_dir(target_dir)
+  end
+  if base_dir and target_dir then
+    local head = base_dir:match("^(.-)[^" .. tostring(dirsep_chars) .. "]*[" .. tostring(dirsep_chars) .. "]?$")
+    if head then
+      local start, stop = target:find(head, 1, true)
+      if start == 1 then
+        target = target:sub(stop + 1)
+      end
+    end
+  end
+  if target_dir then
+    if is_abs_path(target) then
+      target = parse_file(target)
+    end
+    target = target_dir .. target
+  end
+  return target
+end
+return {
+  dirsep = dirsep,
+  mkdir = mkdir,
+  normalize_dir = normalize_dir,
+  parse_dir = parse_dir,
+  parse_file = parse_file,
+  new_path = new_path,
+  convert_path = convert_path,
+  gettime = gettime,
+  format_time = format_time,
+  path_to_target = path_to_target,
+  compile_file_text = compile_file_text,
+  compile_and_write = compile_and_write
+}

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

@@ -1,5 +1,4 @@
 local util = require("moonscript.util")
-local data = require("moonscript.data")
 local reversed, unpack
 reversed, unpack = util.reversed, util.unpack
 local ntype
@@ -79,7 +78,7 @@ return {
         _with_0:append(declare)
       else
         if #undeclared > 0 then
-          self:add(declare)
+          self:add(declare, node[-1])
         end
         _with_0:append_list((function()
           local _accum_0 = { }

data/vendor/lua/moonscript/compile.lua

@@ -61,6 +61,7 @@ do
         local _exp_0 = mtype(l)
         if "string" == _exp_0 or DelayedLine == _exp_0 then
           line_no = line_no + 1
+          out[line_no] = posmap[i]
           for _ in l:gmatch("\n") do
             line_no = line_no + 1
           end
@@ -101,7 +102,6 @@ do
             end
           end
           insert(buffer, "\n")
-          local last = l
         elseif Lines == _exp_0 then
           l:flatten(indent and indent .. indent_char or indent_char, buffer)
         else
@@ -150,38 +150,30 @@ end
 do
   local _base_0 = {
     pos = nil,
-    _append_single = function(self, item)
-      if Line == mtype(item) then
-        if not (self.pos) then
-          self.pos = item.pos
-        end
-        for _index_0 = 1, #item do
-          local value = item[_index_0]
-          self:_append_single(value)
-        end
-      else
-        insert(self, item)
-      end
-      return nil
-    end,
     append_list = function(self, items, delim)
       for i = 1, #items do
-        self:_append_single(items[i])
+        self:append(items[i])
         if i < #items then
           insert(self, delim)
         end
       end
       return nil
     end,
-    append = function(self, ...)
-      local _list_0 = {
-        ...
-      }
-      for _index_0 = 1, #_list_0 do
-        local item = _list_0[_index_0]
-        self:_append_single(item)
+    append = function(self, first, ...)
+      if Line == mtype(first) then
+        if not (self.pos) then
+          self.pos = first.pos
+        end
+        for _index_0 = 1, #first do
+          local value = first[_index_0]
+          self:append(value)
+        end
+      else
+        insert(self, first)
+      end
+      if ... then
+        return self:append(...)
       end
-      return nil
     end,
     render = function(self, buffer)
       local current = { }
@@ -209,7 +201,7 @@ do
           insert(current, chunk)
         end
       end
-      if #current > 0 then
+      if current[1] then
         add_current()
       end
       return buffer
@@ -423,8 +415,14 @@ do
       })
       return name
     end,
-    add = function(self, item)
-      self._lines:add(item)
+    add = function(self, item, pos)
+      do
+        local _with_0 = self._lines
+        _with_0:add(item)
+        if pos then
+          _with_0:mark_pos(pos)
+        end
+      end
       return item
     end,
     render = function(self, buffer)
@@ -703,7 +701,6 @@ tree = function(tree, options)
   if not (success) then
     local error_msg, error_pos
     if type(err) == "table" then
-      local error_type = err[1]
       local _exp_0 = err[1]
       if "user-error" == _exp_0 or "compile-error" == _exp_0 then
         error_msg, error_pos = unpack(err, 2)

data/vendor/lua/moonscript/errors.lua

@@ -78,8 +78,8 @@ rewrite_traceback = function(text, err)
   local cache = { }
   local rewrite_single
   rewrite_single = function(trace)
-    local fname, line, msg = trace:match('^%[string "(.-)"]:(%d+): (.*)$')
-    local tbl = line_tables[fname]
+    local fname, line, msg = trace:match('^(.-):(%d+): (.*)$')
+    local tbl = line_tables["@" .. tostring(fname)]
     if fname and tbl then
       return concat({
         fname,

data/vendor/lua/moonscript/parse.lua

@@ -10,7 +10,6 @@ local types = require"moonscript.types"
 
 local ntype = types.ntype
 
-local dump = util.dump
 local trim = util.trim
 
 local getfenv = util.getfenv
@@ -126,7 +125,7 @@ end
 
 local function extract_line(str, start_pos)
 	str = str:sub(start_pos)
-	m = str:match"^(.-)\n"
+	local m = str:match"^(.-)\n"
 	if m then return m end
 	return str:match"^.-$"
 end
@@ -156,13 +155,6 @@ local function got(what)
 	end)
 end
 
-local function flatten(tbl)
-	if #tbl == 1 then
-		return tbl[1]
-	end
-	return tbl
-end
-
 local function flatten_or_mark(name)
 	return function(tbl)
 		if #tbl == 1 then return tbl[1] end
@@ -234,7 +226,7 @@ end
 local function simple_string(delim, allow_interpolation)
 	local inner = P('\\'..delim) + "\\\\" + (1 - P(delim))
 	if allow_interpolation then
-		inter = symx"#{" * V"Exp" * sym"}"
+		local inter = symx"#{" * V"Exp" * sym"}"
 		inner = (C((inner - inter)^1) + inter / mark"interpolate")^0
 	else
 		inner = C(inner^0)
@@ -280,16 +272,6 @@ local function wrap_decorator(stm, dec)
 	return { "decorated", stm, dec }
 end
 
--- wrap if statement if there is a conditional decorator
-local function wrap_if(stm, cond)
-	if cond then
-		local pass, fail = unpack(cond)
-		if fail then fail = {"else", {fail}} end
-		return {"if", cond[2], {stm}, fail}
-	end
-	return stm
-end
-
 local function check_lua_string(str, pos, right, left)
 	return #left == #right
 end
@@ -343,18 +325,12 @@ local build_grammar = wrap_env(function()
 		return true
 	end
 
-	local function enable_do(str_pos)
-		_do_stack:push(true)
-		return true
-	end
-
 	local function pop_do(str, pos)
 		if nil == _do_stack:pop() then error("unexpected do pop") end
 		return true
 	end
 
 	local DisableDo = Cmt("", disable_do)
-	local EnableDo = Cmt("", enable_do)
 	local PopDo = Cmt("", pop_do)
 
 	local keywords = {}

data/vendor/lua/moonscript/transform/destructure.lua

@@ -23,7 +23,6 @@ do
   local _obj_0 = require("moonscript.errors")
   user_error = _obj_0.user_error
 end
-local util = require("moonscript.util")
 local join
 join = function(...)
   do

data/vendor/lua/moonscript/version.lua

@@ -1,7 +1,7 @@
-
-module("moonscript.version", package.seeall)
-
-version = "0.2.5"
-function print_version()
-	print("MoonScript version "..version)
-end
+local version = "0.2.6"
+return {
+  version = version,
+  print_version = function()
+    return print("MoonScript version " .. tostring(version))
+  end
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rufus-lua-moon
 version: !ruby/object:Gem::Version
-  version: 0.2.5.0
+  version: 0.2.6.0
 platform: ruby
 authors:
 - Stas Ukolov
@@ -72,6 +72,7 @@ files:
 - vendor/lua/moonscript/base.lua
 - vendor/lua/moonscript/cmd/coverage.lua
 - vendor/lua/moonscript/cmd/lint.lua
+- vendor/lua/moonscript/cmd/moonc.lua
 - vendor/lua/moonscript/compile.lua
 - vendor/lua/moonscript/compile/statement.lua
 - vendor/lua/moonscript/compile/value.lua