don't reference global unpack

leafo · leafo · commit 0ba4c773e18a · 2013-01-02T17:55:43.000-08:00
diff --git a/bin/moon b/bin/moon
@@ -6,6 +6,8 @@ local moonscript = require "moonscript"
 local util = require "moonscript.util"
 local errors = require "moonscript.errors"
 
+local unpack = util.unpack
+
 -- moonloader and repl
 local opts, ind = alt_getopt.get_opts(arg, "cvhd", { version = "v", help = "h" })
 
diff --git a/moonscript/compile.lua b/moonscript/compile.lua
@@ -27,7 +27,7 @@ do
   value_compilers = _table_0.value_compilers
 end
 local concat, insert = table.concat, table.insert
-local pos_to_line, get_closest_line, trim = util.pos_to_line, util.get_closest_line, util.trim
+local pos_to_line, get_closest_line, trim, unpack = util.pos_to_line, util.get_closest_line, util.trim, util.unpack
 local mtype = util.moon.type
 local indent_char = "  "
 local Line, Lines, Block, RootBlock
diff --git a/moonscript/compile.moon b/moonscript/compile.moon
@@ -11,7 +11,7 @@ import statement_compilers from require "moonscript.compile.statement"
 import value_compilers from require "moonscript.compile.value"
 
 import concat, insert from table
-import pos_to_line, get_closest_line, trim from util
+import pos_to_line, get_closest_line, trim, unpack from util
 
 mtype = util.moon.type
 
diff --git a/moonscript/compile/statement.lua b/moonscript/compile/statement.lua
@@ -1,7 +1,7 @@
-local reversed
+local reversed, unpack
 do
   local _table_0 = require("moonscript.util")
-  reversed = _table_0.reversed
+  reversed, unpack = _table_0.reversed, _table_0.unpack
 end
 local ntype
 do
diff --git a/moonscript/compile/statement.moon b/moonscript/compile/statement.moon
@@ -1,5 +1,5 @@
 
-import reversed from require "moonscript.util"
+import reversed, unpack from require "moonscript.util"
 import ntype from require "moonscript.types"
 import concat, insert from table
 
diff --git a/moonscript/compile/value.lua b/moonscript/compile/value.lua
@@ -11,6 +11,7 @@ do
   user_error = _table_0.user_error
 end
 local concat, insert = table.concat, table.insert
+local unpack = util.unpack
 local table_delim = ","
 local value_compilers = {
   exp = function(self, node)
diff --git a/moonscript/compile/value.moon b/moonscript/compile/value.moon
@@ -5,6 +5,7 @@ data = require "moonscript.data"
 import ntype from require "moonscript.types"
 import user_error from require "moonscript.errors"
 import concat, insert from table
+import unpack from util
 
 table_delim = ","
 
diff --git a/moonscript/parse.lua b/moonscript/parse.lua
@@ -15,6 +15,7 @@ local trim = util.trim
 
 local getfenv = util.getfenv
 local setfenv = util.setfenv
+local unpack = util.unpack
 
 local Stack = data.Stack
 
diff --git a/moonscript/transform.lua b/moonscript/transform.lua
@@ -1,7 +1,7 @@
 local types = require("moonscript.types")
 local util = require("moonscript.util")
 local data = require("moonscript.data")
-local reversed = util.reversed
+local reversed, unpack = util.reversed, util.unpack
 local 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 = table.insert
 local NameProxy, LocalName
diff --git a/moonscript/transform.moon b/moonscript/transform.moon
@@ -3,7 +3,7 @@ types = require "moonscript.types"
 util = require "moonscript.util"
 data = require "moonscript.data"
 
-import reversed from util
+import reversed, unpack from util
 import ntype, mtype, build, smart_node, is_slice, value_is_singular from types
 import insert from table
 import NameProxy, LocalName from require "moonscript.transform.names"
diff --git a/moonscript/transform/destructure.lua b/moonscript/transform/destructure.lua
@@ -9,6 +9,11 @@ do
   NameProxy = _table_0.NameProxy
 end
 local insert = table.insert
+local unpack
+do
+  local _table_0 = require("moonscript.util")
+  unpack = _table_0.unpack
+end
 local user_error
 do
   local _table_0 = require("moonscript.errors")
diff --git a/moonscript/transform/destructure.moon b/moonscript/transform/destructure.moon
@@ -2,6 +2,7 @@
 import ntype, mtype, build from require "moonscript.types"
 import NameProxy from require "moonscript.transform.names"
 import insert from table
+import unpack from require "moonscript.util"
 
 import user_error from require "moonscript.errors"
 
diff --git a/moonscript/transform/names.lua b/moonscript/transform/names.lua
@@ -3,6 +3,11 @@ do
   local _table_0 = require("moonscript.types")
   build = _table_0.build
 end
+local unpack
+do
+  local _table_0 = require("moonscript.util")
+  unpack = _table_0.unpack
+end
 local LocalName
 do
   local _parent_0 = nil
diff --git a/moonscript/transform/names.moon b/moonscript/transform/names.moon
@@ -1,5 +1,6 @@
 
 import build from require "moonscript.types"
+import unpack from require "moonscript.util"
 
 -- always declares as local
 class LocalName
diff --git a/moonscript/types.lua b/moonscript/types.lua
@@ -1,6 +1,7 @@
 local util = require("moonscript.util")
 local data = require("moonscript.data")
 local insert = table.insert
+local unpack = util.unpack
 local manual_return = data.Set({
   "foreach",
   "for",
diff --git a/moonscript/types.moon b/moonscript/types.moon
@@ -3,6 +3,7 @@ util = require "moonscript.util"
 data = require "moonscript.data"
 
 import insert from table
+import unpack from util
 
 -- implicit return does not work on these statements
 manual_return = data.Set{"foreach", "for", "while", "return"}
diff --git a/test2.moon b/test2.moon
@@ -8,6 +8,8 @@ util    = require "moonscript.util"
 
 pattern = ...
 
+import unpack from util
+
 options = {
   in_dir: "tests/inputs",
   out_dir: "tests/outputs",
