From 972de38421d14882de192ddbd51afd89c4ffb06c Mon Sep 17 00:00:00 2001
From: Bruce Hill <bitbucket@bruce-hill.com>
Date: Tue, 6 Mar 2018 16:50:20 -0800
Subject: [PATCH] Minor cleanup.

---
 nomsu.lua  | 18 +++---------------
 nomsu.moon |  3 +--
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/nomsu.lua b/nomsu.lua
index 17b40fe..62ff7db 100644
--- a/nomsu.lua
+++ b/nomsu.lua
@@ -23,21 +23,6 @@ do
   local _obj_0 = table
   insert, remove, concat = _obj_0.insert, _obj_0.remove, _obj_0.concat
 end
-local Tuple = immutable(nil, {
-  name = "Tuple",
-  __tostring = function(self)
-    return "Tuple(" .. tostring(concat((function()
-      local _accum_0 = { }
-      local _len_0 = 1
-      for _index_0 = 1, #self do
-        local x = self[_index_0]
-        _accum_0[_len_0] = repr(x)
-        _len_0 = _len_0 + 1
-      end
-      return _accum_0
-    end)(), ", ")) .. ")"
-  end
-})
 do
   local STRING_METATABLE = getmetatable("")
   STRING_METATABLE.__add = function(self, other)
@@ -70,6 +55,9 @@ type_tostring = function(self)
     return _accum_0
   end)(), ", ")) .. ")"
 end
+local Tuple = immutable(nil, {
+  name = "Tuple"
+})
 local _list_0 = {
   "File",
   "Nomsu",
diff --git a/nomsu.moon b/nomsu.moon
index ecd4cef..51e22c0 100755
--- a/nomsu.moon
+++ b/nomsu.moon
@@ -21,8 +21,6 @@ colors = setmetatable({}, {__index:->""})
 colored = setmetatable({}, {__index:(_,color)-> ((msg)-> colors[color]..(msg or '')..colors.reset)})
 {:insert, :remove, :concat} = table
 
-Tuple = immutable(nil, {name:"Tuple", __tostring:=> "Tuple(#{concat [repr(x) for x in *@], ", "})"})
-
 -- Use + operator for string coercive concatenation (note: "asdf" + 3 == "asdf3")
 -- Use [] for accessing string characters, or s[{3,4}] for s:sub(3,4)
 -- Note: This globally affects all strings in this instance of Lua!
@@ -52,6 +50,7 @@ lpeg.setmaxstack 10000 -- whoa
 Types = {}
 type_tostring = =>
     "#{@name}(#{concat [repr(x) for x in *@], ", "})"
+Tuple = immutable(nil, {name:"Tuple"})
 for t in *{"File", "Nomsu", "Block", "List", "FunctionCall", "Text", "Dict", "Number", "Word", "Var", "Comment"}
     Types[t] = immutable({"id","value"}, {type:t, name:t, __tostring:type_tostring})
 Types.DictEntry = immutable({"key","value"}, {name:"DictEntry"})