rufus-lua-moon 0.2.3.2 → 0.2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc204ab42004ec98bd7db42ccbb3d577d7e35355
-  data.tar.gz: a365e10939e178caa3918cdaba2f385f2753350f
+  metadata.gz: c432105ec4dd74d5e144bda27c32f6ef821b6182
+  data.tar.gz: f31a4a954e0f48ab813568b16063d26e2cc27258
 SHA512:
-  metadata.gz: b6ab5c2b6b3f0fc72cfe5cf91e16f3f25e10d739dafbe9f00d26c62178b6df06ed437171d19e94abb6844e5d9870569ef67b674efd31ab1b8152039bf09f176d
-  data.tar.gz: 8af330b1958ea7e90d59e09240653674b82b8d930d6384a500c8d0b03bc31146d34187eb08024d7d43eed15e380704d2e0508cd7614fe388ac16d1d5f82c80cd
+  metadata.gz: 2969e129ef6740d431a6b971a371c5502e8920f20fd37e2278def0ca087c25bb03ecee884a990a21d9b52ffac5d07320537261e79a404fd1da7e1e9b3dd8db35
+  data.tar.gz: 3a9333b3cbacb4ee8f95d10abf195ed80775f6bd8fe45b6304e0a39367a088344b419656ba1f553cd42ad3883602bf75bdb36a565b1dfcb44f88df5531c3a5a4

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

@@ -5,7 +5,7 @@ module Rufus
       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
-      m=/(["'])(\d+(\.\d+){1,3}(-(?!0)[\da-z]))\1/i.match File.read File.expand_path 'moonscript/version.lua', Path
+      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.?'
     end
   end

data/vendor/lua/moon/all.moon

@@ -1,8 +1,6 @@
-
--- insert all moon library functions into requiring scope
-
-export moon
-moon = moon or {}
-moon.inject = true
-require "moon.init"
+-- install moon into global scope
+moon = require "moon"
+for k,v in pairs moon
+  _G[k] = v
+moon
 

data/vendor/lua/moon/init.moon

@@ -1,12 +1,8 @@
 
-if not moon or not moon.inject
-  module "moon", package.seeall
-
 util = require "moonscript.util"
-
 lua = { :debug, :type }
 
-export *
+local *
 
 dump = util.dump
 
@@ -104,8 +100,7 @@ copy = =>
 
 -- mixin class properties into self, call new
 mixin = (cls, ...) =>
-  meta = getmetatable cls
-  for key, val in pairs meta.__index
+  for key, val in pairs cls.__base
     self[key] = val if not key\match"^__"
   cls.__init self, ...
 
@@ -134,4 +129,7 @@ fold = (items, fn)->
   else
     items[1]
 
-nil
+{
+  :dump, :p, :is_object, :type, :debug, :run_with_scope, :bind_methods,
+  :defaultbl, :extend, :copy, :mixin, :mixin_object, :mixin_table, :fold
+}

data/vendor/lua/moonscript/base.lua

@@ -0,0 +1,2 @@
+_G.moon_no_loader = true
+return require("moonscript")

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

@@ -1,12 +1,17 @@
 local util = require("moonscript.util")
 local data = require("moonscript.data")
-local reversed, unpack = util.reversed, util.unpack
+local reversed, unpack
+reversed, unpack = util.reversed, util.unpack
 local ntype
 do
-  local _table_0 = require("moonscript.types")
-  ntype = _table_0.ntype
+  local _obj_0 = require("moonscript.types")
+  ntype = _obj_0.ntype
+end
+local concat, insert
+do
+  local _obj_0 = table
+  concat, insert = _obj_0.concat, _obj_0.insert
 end
-local concat, insert = table.concat, table.insert
 local statement_compilers = {
   raw = function(self, node)
     return self:add(node[2])
@@ -27,9 +32,8 @@ local statement_compilers = {
         _with_0:append_list((function()
           local _accum_0 = { }
           local _len_0 = 1
-          local _list_0 = undeclared
-          for _index_0 = 1, #_list_0 do
-            local name = _list_0[_index_0]
+          for _index_0 = 1, #undeclared do
+            local name = undeclared[_index_0]
             _accum_0[_len_0] = self:name(name)
             _len_0 = _len_0 + 1
           end
@@ -47,9 +51,8 @@ local statement_compilers = {
       _with_0:append_list((function()
         local _accum_0 = { }
         local _len_0 = 1
-        local _list_0 = names
-        for _index_0 = 1, #_list_0 do
-          local name = _list_0[_index_0]
+        for _index_0 = 1, #names do
+          local name = names[_index_0]
           _accum_0[_len_0] = self:name(name)
           _len_0 = _len_0 + 1
         end
@@ -81,9 +84,8 @@ local statement_compilers = {
         _with_0:append_list((function()
           local _accum_0 = { }
           local _len_0 = 1
-          local _list_0 = names
-          for _index_0 = 1, #_list_0 do
-            local name = _list_0[_index_0]
+          for _index_0 = 1, #names do
+            local name = names[_index_0]
             _accum_0[_len_0] = self:value(name)
             _len_0 = _len_0 + 1
           end
@@ -94,9 +96,8 @@ local statement_compilers = {
       _with_0:append_list((function()
         local _accum_0 = { }
         local _len_0 = 1
-        local _list_0 = values
-        for _index_0 = 1, #_list_0 do
-          local v = _list_0[_index_0]
+        for _index_0 = 1, #values do
+          local v = values[_index_0]
           _accum_0[_len_0] = self:value(v)
           _len_0 = _len_0 + 1
         end
@@ -139,9 +140,8 @@ local statement_compilers = {
       current.next = next
       current = next
     end
-    local _list_0 = node
-    for _index_0 = 4, #_list_0 do
-      cond = _list_0[_index_0]
+    for _index_0 = 4, #node do
+      cond = node[_index_0]
       add_clause(cond)
     end
     return root
@@ -190,9 +190,8 @@ local statement_compilers = {
       loop:append_list((function()
         local _accum_0 = { }
         local _len_0 = 1
-        local _list_0 = names
-        for _index_0 = 1, #_list_0 do
-          local name = _list_0[_index_0]
+        for _index_0 = 1, #names do
+          local name = names[_index_0]
           _accum_0[_len_0] = _with_0:name(name, false)
           _len_0 = _len_0 + 1
         end
@@ -202,9 +201,8 @@ local statement_compilers = {
       loop:append_list((function()
         local _accum_0 = { }
         local _len_0 = 1
-        local _list_0 = exps
-        for _index_0 = 1, #_list_0 do
-          local exp = _list_0[_index_0]
+        for _index_0 = 1, #exps do
+          local exp = exps[_index_0]
           _accum_0[_len_0] = self:value(exp)
           _len_0 = _len_0 + 1
         end
@@ -242,7 +240,8 @@ local statement_compilers = {
       _with_0:stms(node[2])
       return _with_0
     end
-  end
+  end,
+  noop = function(self) end
 }
 return {
   statement_compilers = statement_compilers

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

@@ -2,17 +2,26 @@ local util = require("moonscript.util")
 local data = require("moonscript.data")
 local ntype
 do
-  local _table_0 = require("moonscript.types")
-  ntype = _table_0.ntype
+  local _obj_0 = require("moonscript.types")
+  ntype = _obj_0.ntype
 end
 local user_error
 do
-  local _table_0 = require("moonscript.errors")
-  user_error = _table_0.user_error
+  local _obj_0 = require("moonscript.errors")
+  user_error = _obj_0.user_error
 end
-local concat, insert = table.concat, table.insert
-local unpack = util.unpack
+local concat, insert
+do
+  local _obj_0 = table
+  concat, insert = _obj_0.concat, _obj_0.insert
+end
+local unpack
+unpack = util.unpack
 local table_delim = ","
+local string_chars = {
+  ["\r"] = "\\r",
+  ["\n"] = "\\n"
+}
 local value_compilers = {
   exp = function(self, node)
     local _comp
@@ -44,9 +53,8 @@ local value_compilers = {
       _with_0:append_list((function()
         local _accum_0 = { }
         local _len_0 = 1
-        local _list_0 = node
-        for _index_0 = 2, #_list_0 do
-          local v = _list_0[_index_0]
+        for _index_0 = 2, #node do
+          local v = node[_index_0]
           _accum_0[_len_0] = self:value(v)
           _len_0 = _len_0 + 1
         end
@@ -61,6 +69,9 @@ local value_compilers = {
   string = function(self, node)
     local _, delim, inner = unpack(node)
     local end_delim = delim:gsub("%[", "]")
+    if delim == "'" or delim == '"' then
+      inner = inner:gsub("[\r\n]", string_chars)
+    end
     return delim .. inner .. end_delim
   end,
   chain = function(self, node)
@@ -103,9 +114,8 @@ local value_compilers = {
     local actions
     do
       local _with_0 = self:line()
-      local _list_0 = node
-      for _index_0 = 3, #_list_0 do
-        local action = _list_0[_index_0]
+      for _index_0 = 3, #node do
+        local action = node[_index_0]
         _with_0:append(chain_item(action))
       end
       actions = _with_0
@@ -116,12 +126,12 @@ local value_compilers = {
     local _, args, whitelist, arrow, block = unpack(node)
     local default_args = { }
     local self_args = { }
-    local arg_names = (function()
+    local arg_names
+    do
       local _accum_0 = { }
       local _len_0 = 1
-      local _list_0 = args
-      for _index_0 = 1, #_list_0 do
-        local arg = _list_0[_index_0]
+      for _index_0 = 1, #args do
+        local arg = args[_index_0]
         local name, default_value = unpack(arg)
         if type(name) == "string" then
           name = name
@@ -138,8 +148,8 @@ local value_compilers = {
         _accum_0[_len_0] = _value_0
         _len_0 = _len_0 + 1
       end
-      return _accum_0
-    end)()
+      arg_names = _accum_0
+    end
     if arrow == "fat" then
       insert(arg_names, 1, "self")
     end
@@ -148,14 +158,12 @@ local value_compilers = {
       if #whitelist > 0 then
         _with_0:whitelist_names(whitelist)
       end
-      local _list_0 = arg_names
-      for _index_0 = 1, #_list_0 do
-        local name = _list_0[_index_0]
+      for _index_0 = 1, #arg_names do
+        local name = arg_names[_index_0]
         _with_0:put_name(name)
       end
-      local _list_1 = default_args
-      for _index_0 = 1, #_list_1 do
-        local default = _list_1[_index_0]
+      for _index_0 = 1, #default_args do
+        local default = default_args[_index_0]
         local name, value = unpack(default)
         if type(name) == "table" then
           name = name[2]
@@ -181,17 +189,17 @@ local value_compilers = {
           }
         })
       end
-      local self_arg_values = (function()
+      local self_arg_values
+      do
         local _accum_0 = { }
         local _len_0 = 1
-        local _list_2 = self_args
-        for _index_0 = 1, #_list_2 do
-          local arg = _list_2[_index_0]
+        for _index_0 = 1, #self_args do
+          local arg = self_args[_index_0]
           _accum_0[_len_0] = arg[2]
           _len_0 = _len_0 + 1
         end
-        return _accum_0
-      end)()
+        self_arg_values = _accum_0
+      end
       if #self_args > 0 then
         _with_0:stm({
           "assign",
@@ -201,17 +209,16 @@ local value_compilers = {
       end
       _with_0:stms(block)
       if #args > #arg_names then
-        arg_names = (function()
+        do
           local _accum_0 = { }
           local _len_0 = 1
-          local _list_2 = args
-          for _index_0 = 1, #_list_2 do
-            local arg = _list_2[_index_0]
+          for _index_0 = 1, #args do
+            local arg = args[_index_0]
             _accum_0[_len_0] = arg[1]
             _len_0 = _len_0 + 1
           end
-          return _accum_0
-        end)()
+          arg_names = _accum_0
+        end
       end
       _with_0.header = "function(" .. concat(arg_names, ", ") .. ")"
       return _with_0