rufus-lua-moon 0.2.6.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec64394e84ba8c8288134cf012d62151406b8a1d
-  data.tar.gz: 1217bea89d96bed46de5accb1d54a2197182ed8a
+  metadata.gz: c10815a43366dd3f11d5f5f3c008ae1e795f8f27
+  data.tar.gz: 07f58017264a9722f153d68b050c6a29a5cebba3
 SHA512:
-  metadata.gz: 18b5ef94e1185a6e24e9a01da1d35fc767d83c24e9a2d99e51bf615b3a6ba4b97469404c0c347acb30eb793ee14b67319089efbb8930257761e396a71391f0d8
-  data.tar.gz: ef43c5d6c538fce5f2c61f04dd4aff8b1277c2aae791512656b2eb97242c8ab3961a3e47f9f6d5c1c43871502fc2e863838250b66552bf9cfff1fae0a482ee92
+  metadata.gz: b52737e4a0908426294696826e1fe411c1e2685d0ec6369f0d00bc6328a305c0ac754394a4bf31e7b5e8921e908d8893bee91428b7e6afef25de734d05c65e64
+  data.tar.gz: 86a05962373f5d4fc9111a144cc20ba5e660ce84e091cb915d4b42ec477d7d64ca11062cd79b681fd8085738dbce1ee61a7430fe254cfa8a91558a981084ce72

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vendor/leafo"]
+	path = vendor/leafo
+	url = https://github.com/leafo/moonscript.git

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.1.1
+  - 2.0.0
+  - 1.9.3
+  - 1.9.2
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y liblua5.1-0-dev liblua5.1-lpeg2

data/FarMenu.ini

@@ -0,0 +1,16 @@
+I:  Install dependencies
+    bundle install
+--:
+B:  Build gem
+    bundle exec rake build
+L:  Install gem locally
+    bundle exec rake install
+U:  Uninstall gem
+    gem uninstall -a rufus-lua-moon
+P:  Publish gem
+    bundle exec rake release
+--:
+T:  Run tests
+    bundle exec rake
+C:  Open console
+    bundle console -new_console:c

data/README.md

@@ -1,5 +1,6 @@
 # Rufus::Lua::Moon
 
+[![Build Status](https://travis-ci.org/ukoloff/rufus-lua-moon.svg?branch=master)](https://travis-ci.org/ukoloff/rufus-lua-moon)
 [![Gem Version](https://badge.fury.io/rb/rufus-lua-moon.svg)](http://badge.fury.io/rb/rufus-lua-moon)
 
 Provides MoonScript for Rufus::Lua interpreter
@@ -40,12 +41,17 @@ s.eval <<EOL
 EOL
 ```
 
+## Dependencies
+
+On Linux you should have Lua and Lpeg installed
+(eg. for [Ubuntu](.travis.yml)). 
+
+On Windows simply use
+[Rufus::Lua::Win](https://github.com/ukoloff/rufus-lua-win).
+
 ## Credits
 
   * [Lua](http://www.lua.org/)
   * [MoonScript](http://moonscript.org/)
   * [Rufus::Lua](https://github.com/jmettraux/rufus-lua)
-
-## See also
-
-  * [Rufus::Lua::Win](https://github.com/ukoloff/rufus-lua-win) if you run Rufus::Lua on Windows
+  * [Travis CI](https://travis-ci.org/)

data/Rakefile

@@ -1 +1,14 @@
 require "bundler/gem_tasks"
+
+desc 'Run tests'
+task :test do         
+  require "minitest/autorun"
+
+  require 'rufus/lua/win'    if Gem.win_platform?
+  require 'rufus/lua'
+  require 'rufus/lua/moon'
+
+  Dir.glob('./test/*.rb'){|f| require f}
+end
+
+task default: :test

data/lib/rufus/lua/moon/version.rb

@@ -4,9 +4,9 @@ module Rufus
       root=File.expand_path '../../../../..', __FILE__
       subV=File.read(File.expand_path '.subversion', root).strip rescue ''
       subV="."+subV.gsub(/\W+/, '.') if subV.length>0
-      Path=File.expand_path 'vendor/lua', root
+      Path=File.expand_path 'vendor/leafo', root
       m=/(["'])(\d+(\.\d+){1,3}(-(?!0)[\da-z])*)\1/i.match File.read File.expand_path 'moonscript/version.lua', Path
-      VERSION = m ? m[2].gsub('-', '.')+subV : '0.0.?'
+      VERSION = m ? (Version=m[2]).gsub('-', '.')+subV : '0.0.?'
     end
   end
 end

data/rufus-lua-moon.gemspec

@@ -13,13 +13,17 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/ukoloff/rufus-lua-moon"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($/) +
+			Dir.glob('vendor/leafo/moon/*.moon')+
+			Dir.glob('vendor/leafo/moonscript/**/*.lua')
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "rufus-lua-win"	if Gem.win_platform?
 
   spec.add_dependency "rufus-lua"
 end

data/test/chain.rb

@@ -0,0 +1,6 @@
+class TestC < Minitest::Test
+  def test_chain
+    s=Rufus::Lua::State.new
+    assert_equal s, s.moon!
+  end
+end

data/test/compile.rb

@@ -0,0 +1,12 @@
+class TestC < Minitest::Test
+  def test_compile
+    s=Rufus::Lua::State.new.moon!
+    assert s.eval("return require('moonscript').to_lua('x = a b c')")[0] 
+      .gsub(/\s+/, '')['=a(b(c))']
+  end
+
+  def test_fail
+    s=Rufus::Lua::State.new.moon!
+    refute s.eval("return require('moonscript').to_lua 'a=b:'")[0] rescue nil
+  end
+end

data/test/path.rb

@@ -0,0 +1,15 @@
+class TestC < Minitest::Test
+  def test_path
+    skip if '0.2.3'==Rufus::Lua::Moon::Version
+    s=Rufus::Lua::State.new.moon!
+    s['package']['moonpath']=File.expand_path '../?.moon', __FILE__
+    assert_equal 3.0, s.eval("return require 'path27'")
+  end
+
+  def test_fail
+    s=Rufus::Lua::State.new.moon!
+    assert_raises(Rufus::Lua::LuaError) do
+      s.eval "require 'path27'"
+    end
+  end
+end

data/test/path27.moon

@@ -0,0 +1,3 @@
+a=x: 1+2
+
+return a.x

data/test/req.rb

@@ -0,0 +1,17 @@
+class TestV < Minitest::Test
+  def test_require
+    s=Rufus::Lua::State.new.moon!
+    {
+      moonscript: %w(util version),
+      moon: %w(all),
+    }.map{|k, v|([nil]+v).map{|i| [k, i].compact*'.'}}
+    .flatten.each {|f| s.eval "require '#{f}'"}
+  end
+
+  def test_missing
+    assert_raises(Rufus::Lua::LuaError) do
+      s=Rufus::Lua::State.new.moon!
+      s.eval "require 'moonscript.oops'"
+    end
+  end
+end

data/test/ver.rb

@@ -0,0 +1,23 @@
+class TestV < Minitest::Test
+  def test_ver
+    s=Rufus::Lua::State.new.moon!
+    luav=s.eval 'return _VERSION'
+    rufv=Rufus::Lua::VERSION
+    moonv=s.eval 'return require("moonscript.version").version'
+    gemv=Rufus::Lua::Moon::VERSION
+
+    len=moonv.length
+
+    assert_equal gemv[0...len], moonv.gsub('-', '.')
+    c=gemv[len]
+    assert(c.nil? || '.'==c)
+
+    at_exit do
+      puts
+      puts "Lua version #{luav}"
+      puts "Rufus::Lua version #{rufv}"
+      puts "MoonScript version #{moonv}"
+      puts "Rufus::Lua::Moon version #{gemv}"
+    end
+  end
+end

data/vendor/{lua → leafo}/moonscript/cmd/lint.lua

@@ -1,18 +1,11 @@
 local insert
-do
-  local _obj_0 = table
-  insert = _obj_0.insert
-end
+insert = table.insert
 local Set
-do
-  local _obj_0 = require("moonscript.data")
-  Set = _obj_0.Set
-end
+Set = require("moonscript.data").Set
 local Block
-do
-  local _obj_0 = require("moonscript.compile")
-  Block = _obj_0.Block
-end
+Block = require("moonscript.compile").Block
+local mtype
+mtype = require("moonscript.util").moon.type
 local default_whitelist = Set({
   '_G',
   '_VERSION',
@@ -61,11 +54,84 @@ local LinterBlock
 do
   local _parent_0 = Block
   local _base_0 = {
+    lint_mark_used = function(self, name)
+      if self.lint_unused_names and self.lint_unused_names[name] then
+        self.lint_unused_names[name] = false
+        return 
+      end
+      if self.parent then
+        return self.parent:lint_mark_used(name)
+      end
+    end,
+    lint_check_unused = function(self)
+      if not (self.lint_unused_names and next(self.lint_unused_names)) then
+        return 
+      end
+      local names_by_position = { }
+      for name, pos in pairs(self.lint_unused_names) do
+        local _continue_0 = false
+        repeat
+          if not (pos) then
+            _continue_0 = true
+            break
+          end
+          names_by_position[pos] = names_by_position[pos] or { }
+          insert(names_by_position[pos], name)
+          _continue_0 = true
+        until true
+        if not _continue_0 then
+          break
+        end
+      end
+      local tuples
+      do
+        local _accum_0 = { }
+        local _len_0 = 1
+        for pos, names in pairs(names_by_position) do
+          _accum_0[_len_0] = {
+            pos,
+            names
+          }
+          _len_0 = _len_0 + 1
+        end
+        tuples = _accum_0
+      end
+      table.sort(tuples, function(a, b)
+        return a[1] < b[1]
+      end)
+      for _index_0 = 1, #tuples do
+        local _des_0 = tuples[_index_0]
+        local pos, names
+        pos, names = _des_0[1], _des_0[2]
+        insert(self:get_root_block().lint_errors, {
+          "assigned but unused " .. tostring(table.concat((function()
+            local _accum_0 = { }
+            local _len_0 = 1
+            for _index_1 = 1, #names do
+              local n = names[_index_1]
+              _accum_0[_len_0] = "`" .. tostring(n) .. "`"
+              _len_0 = _len_0 + 1
+            end
+            return _accum_0
+          end)(), ", ")),
+          pos
+        })
+      end
+    end,
+    render = function(self, ...)
+      self:lint_check_unused()
+      return _parent_0.render(self, ...)
+    end,
     block = function(self, ...)
       do
         local _with_0 = _parent_0.block(self, ...)
         _with_0.block = self.block
+        _with_0.render = self.render
+        _with_0.get_root_block = self.get_root_block
+        _with_0.lint_check_unused = self.lint_check_unused
+        _with_0.lint_mark_used = self.lint_mark_used
         _with_0.value_compilers = self.value_compilers
+        _with_0.statement_compilers = self.statement_compilers
         return _with_0
       end
     end
@@ -78,6 +144,9 @@ do
         whitelist_globals = default_whitelist
       end
       _parent_0.__init(self, ...)
+      self.get_root_block = function()
+        return self
+      end
       self.lint_errors = { }
       local vc = self.value_compilers
       self.value_compilers = setmetatable({
@@ -85,15 +154,50 @@ do
           local name = val[2]
           if not (block:has_name(name) or whitelist_globals[name] or name:match("%.")) then
             insert(self.lint_errors, {
-              "accessing global " .. tostring(name),
+              "accessing global `" .. tostring(name) .. "`",
               val[-1]
             })
           end
+          block:lint_mark_used(name)
           return vc.ref(block, val)
         end
       }, {
         __index = vc
       })
+      local sc = self.statement_compilers
+      self.statement_compilers = setmetatable({
+        assign = function(block, node)
+          local names = node[2]
+          for _index_0 = 1, #names do
+            local _continue_0 = false
+            repeat
+              local name = names[_index_0]
+              if type(name) == "table" and name[1] == "temp_name" then
+                _continue_0 = true
+                break
+              end
+              local real_name, is_local = block:extract_assign_name(name)
+              if not (is_local or real_name and not block:has_name(real_name, true)) then
+                _continue_0 = true
+                break
+              end
+              if real_name == "_" then
+                _continue_0 = true
+                break
+              end
+              block.lint_unused_names = block.lint_unused_names or { }
+              block.lint_unused_names[real_name] = node[-1] or 0
+              _continue_0 = true
+            until true
+            if not _continue_0 then
+              break
+            end
+          end
+          return sc.assign(block, node)
+        end
+      }, {
+        __index = sc
+      })
     end,
     __base = _base_0,
     __name = "LinterBlock",
@@ -198,6 +302,7 @@ lint_code = function(code, name, whitelist_globals)
   end
   local scope = LinterBlock(whitelist_globals)
   scope:stms(tree)
+  scope:lint_check_unused()
   return format_lint(scope.lint_errors, code, name)
 end
 local lint_file

data/vendor/{lua → leafo}/moonscript/cmd/moonc.lua

@@ -1,9 +1,6 @@
 local lfs = require("lfs")
 local split
-do
-  local _obj_0 = require("moonscript.util")
-  split = _obj_0.split
-end
+split = require("moonscript.util").split
 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
@@ -58,7 +55,7 @@ do
     end
   end
 end
-compile_file_text = function(text, fname, opts)
+compile_file_text = function(text, opts)
   if opts == nil then
     opts = { }
   end
@@ -93,17 +90,14 @@ compile_file_text = function(text, fname, opts)
   end
   if opts.show_posmap then
     local debug_posmap
-    do
-      local _obj_0 = require("moonscript.util")
-      debug_posmap = _obj_0.debug_posmap
-    end
+    debug_posmap = require("moonscript.util").debug_posmap
     print("Pos", "Lua", ">>", "Moon")
     print(debug_posmap(posmap_or_err, text, code))
     return true
   end
   if opts.benchmark then
     print(table.concat({
-      fname,
+      opts.fname or "stdin",
       "Parse time  \t" .. format_time(parse_time),
       "Compile time\t" .. format_time(compile_time),
       ""
@@ -141,7 +135,7 @@ compile_and_write = function(src, dest, opts)
     return true
   end
   if opts.print then
-    print(text)
+    print(code)
     return true
   end
   return write_file(dest, code)
@@ -188,7 +182,6 @@ return {
   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,

data/vendor/{lua → leafo}/moonscript/compile/statement.lua

@@ -2,10 +2,7 @@ local util = require("moonscript.util")
 local reversed, unpack
 reversed, unpack = util.reversed, util.unpack
 local ntype
-do
-  local _obj_0 = require("moonscript.types")
-  ntype = _obj_0.ntype
-end
+ntype = require("moonscript.types").ntype
 local concat, insert
 do
   local _obj_0 = table

data/vendor/{lua → leafo}/moonscript/compile/value.lua

@@ -1,15 +1,9 @@
 local util = require("moonscript.util")
 local data = require("moonscript.data")
 local ntype
-do
-  local _obj_0 = require("moonscript.types")
-  ntype = _obj_0.ntype
-end
+ntype = require("moonscript.types").ntype
 local user_error
-do
-  local _obj_0 = require("moonscript.errors")
-  user_error = _obj_0.user_error
-end
+user_error = require("moonscript.errors").user_error
 local concat, insert
 do
   local _obj_0 = table

data/vendor/{lua → leafo}/moonscript/compile.lua

@@ -7,10 +7,7 @@ do
   NameProxy, LocalName = _obj_0.NameProxy, _obj_0.LocalName
 end
 local Set
-do
-  local _obj_0 = require("moonscript.data")
-  Set = _obj_0.Set
-end
+Set = require("moonscript.data").Set
 local ntype, has_value
 do
   local _obj_0 = require("moonscript.types")
@@ -259,6 +256,7 @@ do
     export_all = false,
     export_proper = false,
     value_compilers = value_compilers,
+    statement_compilers = statement_compilers,
     __tostring = function(self)
       local h
       if "string" == type(self.header) then
@@ -291,6 +289,22 @@ do
         end
       end
     end,
+    extract_assign_name = function(self, node)
+      local is_local = false
+      local real_name
+      local _exp_0 = mtype(node)
+      if LocalName == _exp_0 then
+        is_local = true
+        real_name = node:get_name(self)
+      elseif NameProxy == _exp_0 then
+        real_name = node:get_name(self)
+      elseif "table" == _exp_0 then
+        real_name = node[1] == "ref" and node[2]
+      elseif "string" == _exp_0 then
+        real_name = node
+      end
+      return real_name, is_local
+    end,
     declare = function(self, names)
       local undeclared
       do
@@ -300,19 +314,7 @@ do
           local _continue_0 = false
           repeat
             local name = names[_index_0]
-            local is_local = false
-            local real_name
-            local _exp_0 = mtype(name)
-            if LocalName == _exp_0 then
-              is_local = true
-              real_name = name:get_name(self)
-            elseif NameProxy == _exp_0 then
-              real_name = name:get_name(self)
-            elseif "table" == _exp_0 then
-              real_name = name[1] == "ref" and name[2]
-            elseif "string" == _exp_0 then
-              real_name = name
-            end
+            local real_name, is_local = self:extract_assign_name(name)
             if not (is_local or real_name and not self:has_name(real_name, true)) then
               _continue_0 = true
               break
@@ -453,7 +455,7 @@ do
       end
     end,
     is_stm = function(self, node)
-      return statement_compilers[ntype(node)] ~= nil
+      return self.statement_compilers[ntype(node)] ~= nil
     end,
     is_value = function(self, node)
       local t = ntype(node)
@@ -519,7 +521,7 @@ do
       node = self.transform.statement(node)
       local result
       do
-        local fn = statement_compilers[ntype(node)]
+        local fn = self.statement_compilers[ntype(node)]
         if fn then
           result = fn(self, node, ...)
         else

data/vendor/{lua → leafo}/moonscript/errors.lua

@@ -18,7 +18,7 @@ local lookup_line
 lookup_line = function(fname, pos, cache)
   if not cache[fname] then
     do
-      local _with_0 = io.open(fname)
+      local _with_0 = assert(io.open(fname))
       cache[fname] = _with_0:read("*a")
       _with_0:close()
     end

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

@@ -0,0 +1,69 @@
+local getfenv, setfenv
+do
+  local _obj_0 = require("moonscript.util")
+  getfenv, setfenv = _obj_0.getfenv, _obj_0.setfenv
+end
+local wrap_env
+wrap_env = function(debug, fn)
+  local V, Cmt
+  do
+    local _obj_0 = require("lpeg")
+    V, Cmt = _obj_0.V, _obj_0.Cmt
+  end
+  local env = getfenv(fn)
+  local wrap_name = V
+  if debug then
+    local indent = 0
+    local indent_char = "  "
+    local iprint
+    iprint = function(...)
+      local args = table.concat((function(...)
+        local _accum_0 = { }
+        local _len_0 = 1
+        local _list_0 = {
+          ...
+        }
+        for _index_0 = 1, #_list_0 do
+          local a = _list_0[_index_0]
+          _accum_0[_len_0] = tostring(a)
+          _len_0 = _len_0 + 1
+        end
+        return _accum_0
+      end)(...), ", ")
+      return io.stderr:write(tostring(indent_char:rep(indent)) .. tostring(args) .. "\n")
+    end
+    wrap_name = function(name)
+      local v = V(name)
+      v = Cmt("", function()
+        iprint("* " .. name)
+        indent = indent + 1
+        return true
+      end) * Cmt(v, function(str, pos, ...)
+        iprint(name, true)
+        indent = indent - 1
+        return true, ...
+      end) + Cmt("", function()
+        iprint(name, false)
+        indent = indent - 1
+        return false
+      end)
+      return v
+    end
+  end
+  return setfenv(fn, setmetatable({ }, {
+    __index = function(self, name)
+      local value = env[name]
+      if value ~= nil then
+        return value
+      end
+      if name:match("^[A-Z][A-Za-z0-9]*$") then
+        local v = wrap_name(name)
+        return v
+      end
+      return error("unknown variable referenced: " .. tostring(name))
+    end
+  }))
+end
+return {
+  wrap_env = wrap_env
+}