Fixed id for nil/NaN and cleaned up collection metatable stuff.

1 files changed, 7 insertions, 0 deletions

diff --git a/nomsu.lua b/nomsu.lua
index ba6a834..88ad87f 100644
--- a/nomsu.lua
+++ b/nomsu.lua
@@ -1430,9 +1430,16 @@ do
       self.write_err = function(self, ...)
         return io.stderr:write(...)
       end
+      local NaN_surrogate = { }
+      local nil_surrogate = { }
       self.ids = setmetatable({ }, {
         __mode = "k",
         __index = function(self, key)
+          if key == nil then
+            return self[nil_surrogate]
+          elseif key ~= key then
+            return self[NaN_surrogate]
+          end
           local id = new_uuid()
           self[key] = id
           return id