rebuild

Makefile

@@ -9,7 +9,7 @@ global:
 	sudo luarocks make moonscript-dev-1.rockspec
 
 compile::
-	bin/moonc moon/ moonscript/
+	lua5.1 bin/moonc moon/ moonscript/
 
 
 compile_global:

moonscript/cmd/lint.lua

@@ -1,18 +1,9 @@
 local insert
-do
+insert = table.insert
-  local _obj_0 = table
-  insert = _obj_0.insert
-end
 local Set
-do
+Set = require("moonscript.data").Set
-  local _obj_0 = require("moonscript.data")
-  Set = _obj_0.Set
-end
 local Block
-do
+Block = require("moonscript.compile").Block
-  local _obj_0 = require("moonscript.compile")
-  Block = _obj_0.Block
-end
 local default_whitelist = Set({
   '_G',
   '_VERSION',

moonscript/cmd/moonc.lua

@@ -1,9 +1,6 @@
 local lfs = require("lfs")
 local split
-do
+split = require("moonscript.util").split
-  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
@@ -93,10 +90,7 @@ compile_file_text = function(text, fname, opts)
   end
   if opts.show_posmap then
     local debug_posmap
-    do
+    debug_posmap = require("moonscript.util").debug_posmap
-      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

moonscript/compile.lua

@@ -7,10 +7,7 @@ do
   NameProxy, LocalName = _obj_0.NameProxy, _obj_0.LocalName
 end
 local Set
-do
+Set = require("moonscript.data").Set
-  local _obj_0 = require("moonscript.data")
-  Set = _obj_0.Set
-end
 local ntype, has_value
 do
   local _obj_0 = require("moonscript.types")

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
+ntype = require("moonscript.types").ntype
-  local _obj_0 = require("moonscript.types")
-  ntype = _obj_0.ntype
-end
 local concat, insert
 do
   local _obj_0 = table

moonscript/compile/value.lua

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

moonscript/transform.lua

@@ -6,10 +6,7 @@ reversed, unpack = util.reversed, util.unpack
 local ntype, mtype, build, smart_node, is_slice, value_is_singular
 ntype, mtype, build, smart_node, is_slice, value_is_singular = types.ntype, types.mtype, types.build, types.smart_node, types.is_slice, types.value_is_singular
 local insert
-do
+insert = table.insert
-  local _obj_0 = table
-  insert = _obj_0.insert
-end
 local NameProxy, LocalName
 do
   local _obj_0 = require("moonscript.transform.names")

moonscript/transform/destructure.lua

@@ -4,25 +4,13 @@ do
   ntype, mtype, build = _obj_0.ntype, _obj_0.mtype, _obj_0.build
 end
 local NameProxy
-do
+NameProxy = require("moonscript.transform.names").NameProxy
-  local _obj_0 = require("moonscript.transform.names")
-  NameProxy = _obj_0.NameProxy
-end
 local insert
-do
+insert = table.insert
-  local _obj_0 = table
-  insert = _obj_0.insert
-end
 local unpack
-do
+unpack = require("moonscript.util").unpack
-  local _obj_0 = require("moonscript.util")
-  unpack = _obj_0.unpack
-end
 local user_error
-do
+user_error = require("moonscript.errors").user_error
-  local _obj_0 = require("moonscript.errors")
-  user_error = _obj_0.user_error
-end
 local join
 join = function(...)
   do

moonscript/transform/names.lua

@@ -1,13 +1,7 @@
 local build
-do
+build = require("moonscript.types").build
-  local _obj_0 = require("moonscript.types")
-  build = _obj_0.build
-end
 local unpack
-do
+unpack = require("moonscript.util").unpack
-  local _obj_0 = require("moonscript.util")
-  unpack = _obj_0.unpack
-end
 local LocalName
 do
   local _base_0 = {

moonscript/types.lua

@@ -1,14 +1,8 @@
 local util = require("moonscript.util")
 local Set
-do
+Set = require("moonscript.data").Set
-  local _obj_0 = require("moonscript.data")
-  Set = _obj_0.Set
-end
 local insert
-do
+insert = table.insert
-  local _obj_0 = table
-  insert = _obj_0.insert
-end
 local unpack
 unpack = util.unpack
 local manual_return = Set({

moonscript/util.lua

@@ -1,8 +1,5 @@
 local concat
-do
+concat = table.concat
-  local _obj_0 = table
-  concat = _obj_0.concat
-end
 local unpack = unpack or table.unpack
 local type = type
 local moon = {