Cleanups and optimizations.

lua_obj.lua

@@ -202,6 +202,7 @@ do
           seen[var] = true
         end
       end
+      self.__str = nil
     end,
     remove_free_vars = function(self, ...)
       local removals = { }
@@ -229,7 +230,8 @@ do
           end
         end
       end
-      return remove_from(self)
+      remove_from(self)
+      self.__str = nil
     end,
     convert_to_statements = function(self, prefix, suffix)
       if prefix == nil then
@@ -281,12 +283,14 @@ do
       end
     end,
     __tostring = function(self)
-      local buff = { }
+      if self.__str == nil then
-      for i, b in ipairs(self.bits) do
+        local buff = { }
-        buff[#buff + 1] = tostring(b)
+        for i, b in ipairs(self.bits) do
+          buff[#buff + 1] = tostring(b)
+        end
+        self.__str = concat(buff, "")
       end
-      local ret = concat(buff, "")
+      return self.__str
-      return ret
     end,
     __len = function(self)
       local len = 0
@@ -307,6 +311,7 @@ do
           bits[#bits + 1] = "\n"
         end
       end
+      self.__str = nil
     end,
     prepend = function(self, ...)
       local n = select("#", ...)
@@ -321,6 +326,7 @@ do
           insert_index = insert_index + 1
         end
       end
+      self.__str = nil
     end,
     make_offset_table = function(self)
       local lua_chunkname = tostring(self.source) .. ".lua"
@@ -333,22 +339,21 @@ do
         nomsu_to_lua = { }
       }
       local walk
-      walk = function(lua, output_range)
+      walk = function(lua, pos)
-        local pos = 1
         local _list_0 = lua.bits
         for _index_0 = 1, #_list_0 do
           local b = _list_0[_index_0]
           if type(b) == 'string' then
-            local output = output_range:sub(pos, pos + #b)
+            local output = Source(lua_chunkname, pos, pos + #b)
             metadata.lua_to_nomsu[output] = lua.source
             metadata.nomsu_to_lua[lua.source] = output
           else
-            walk(b, output_range:sub(pos, pos + #b))
+            walk(b, pos, pos + #b)
           end
           pos = pos + #b
         end
       end
-      walk(self, Source(lua_chunkname, 1, #lua_str))
+      walk(self, 1)
       return lua_str, metadata
     end,
     parenthesize = function(self)
@@ -367,6 +372,7 @@ do
       _class_0.__parent.__init(self, ...)
       self.free_vars = { }
       self.is_value = false
+      self.__str = nil
     end,
     __base = _base_0,
     __name = "Lua",

lua_obj.moon

@@ -115,6 +115,7 @@ class Lua extends Code
         super ...
         @free_vars = {}
         @is_value = false
+        @__str = nil
     
     @Value = (...)->
         lua = Lua(...)
@@ -132,6 +133,7 @@ class Lua extends Code
             unless seen[var]
                 @free_vars[#@free_vars+1] = var
                 seen[var] = true
+        @__str = nil
     
     remove_free_vars: (...)=>
         removals = {}
@@ -150,6 +152,7 @@ class Lua extends Code
                 if type(b) != 'string'
                     remove_from b
         remove_from self
+        @__str = nil
 
     convert_to_statements: (prefix="", suffix=";")=>
         unless @is_value
@@ -176,11 +179,12 @@ class Lua extends Code
             @prepend "local #{concat to_declare, ", "};\n"
 
     __tostring: =>
-        buff = {}
+        if @__str == nil
-        for i,b in ipairs @bits
+            buff = {}
-            buff[#buff+1] = tostring(b)
+            for i,b in ipairs @bits
-        ret = concat(buff, "")
+                buff[#buff+1] = tostring(b)
-        return ret
+            @__str = concat(buff, "")
+        return @__str
 
     __len: =>
         len = 0
@@ -196,6 +200,7 @@ class Lua extends Code
             bits[#bits+1] = bit
             if type(bit) != 'string' and not bit.is_value and #@bits > 0
                 bits[#bits+1] = "\n"
+        @__str = nil
     
     prepend: (...)=>
         n = select("#",...)
@@ -209,6 +214,7 @@ class Lua extends Code
             if type(bit) != 'string' and not bit.is_value and insert_index < #@bits + 1
                 insert bits, insert_index, "\n"
                 insert_index += 1
+        @__str = nil
 
     make_offset_table: =>
         -- Return a mapping from output (lua) character number to input (nomsu) character number
@@ -219,18 +225,16 @@ class Lua extends Code
             lua_filename:lua_chunkname, lua_file:lua_str
             lua_to_nomsu: {}, nomsu_to_lua: {}
         }
-        walk = (lua, output_range)->
+        walk = (lua, pos)->
-            pos = 1
             for b in *lua.bits
                 if type(b) == 'string'
-                    output = output_range\sub(pos, pos+#b)
+                    output = Source(lua_chunkname, pos, pos+#b)
                     metadata.lua_to_nomsu[output] = lua.source
                     metadata.nomsu_to_lua[lua.source] = output
                 else
-                    walk b, output_range\sub(pos, pos+#b)
+                    walk b, pos, pos+#b
                 pos += #b
-        
+        walk self, 1
-        walk self, Source(lua_chunkname, 1, #lua_str)
         return lua_str, metadata
 
     parenthesize: =>

nomsu.lua

@@ -1492,6 +1492,6 @@ if arg and debug_getinfo(2).func ~= require then
     end
     return os.exit(false, true)
   end
-  require('ldt').guard(run)
+  xpcall(run, err_hand)
 end
 return NomsuCompiler

nomsu.moon

@@ -1045,7 +1045,8 @@ if arg and debug_getinfo(2).func != require
     -- Note: xpcall has a slightly different API in Lua <=5.1 vs. >=5.2, but this works
     -- for both APIs
     -- TODO: revert back to old error handler
-    require('ldt').guard run
+
-    --xpcall(run, err_hand)
+    --require('ldt').guard run
+    xpcall(run, err_hand)
 
 return NomsuCompiler

nomsu_tree.lua

@@ -13,18 +13,6 @@ do
   local _obj_0 = require("lua_obj")
   Lua, Location = _obj_0.Lua, _obj_0.Location
 end
-local common_methods = {
-  __tostring = function(self)
-    return tostring(self.name) .. "(" .. tostring(repr(self.value)) .. ")"
-  end,
-  with_value = function(self, value)
-    return getmetatable(self)(value, self.source)
-  end
-}
-local fields = {
-  "value",
-  "source"
-}
 local Types = { }
 Types.DictEntry = immutable({
   "key",
@@ -39,7 +27,7 @@ local Tree
 Tree = function(name, methods)
   do
     methods.__tostring = function(self)
-      return tostring(self.name) .. "(" .. tostring(repr(self.value)) .. ")"
+      return tostring(self.name) .. "(" .. tostring(repr(self.value)) .. ", " .. tostring(repr(self.source)) .. ")"
     end
     methods.with_value = function(self, value)
       return getmetatable(self)(value, self.source)

nomsu_tree.moon

@@ -8,13 +8,6 @@ immutable = require 'immutable'
 {:Lua, :Location} = require "lua_obj"
 
 
-common_methods = {
-    __tostring: =>
-        "#{@name}(#{repr(@value)})"
-    with_value: (value)=> getmetatable(self)(value, @source)
-}
-fields = {"value","source"}
-
 Types = {}
 Types.DictEntry = immutable({"key","value"}, {name:"DictEntry"})
 Types.is_node = (n)->
@@ -23,7 +16,7 @@ Types.is_node = (n)->
 -- Helper method:
 Tree = (name, methods)->
     with methods
-        .__tostring = => "#{@name}(#{repr(@value)})"
+        .__tostring = => "#{@name}(#{repr(@value)}, #{repr @source})"
         .with_value = (value)=> getmetatable(self)(value, @source)
         .type = name
         .name = name