Reorganization

1 files changed, 18 insertions, 21 deletions

@@ -1,36 +1,33 @@
---- lam.pp
+--- lam.dump --- dump raw lua values
 
 local m = {}
-local type = require "type"
+local type = require("type")
 
 function m.dump (x, lvl)
         lvl = lvl or 0
-        local space = string.rep(" ", lvl)
-        local output = ""
-        --[[if getmetatable(x) and getmetatable(x).__tostring then
-                output = output .. tostring(x)
-                else]]if type.luatype(x) == "table" then
-                local subo = ""
-                for k,v in pairs(x) do
+        local space = string.rep(" ", lvl*4)
+        local out = {}
+        if type.luatype(x) == "table" then
+                local sub = {}
+                for k, v in pairs(x) do
                         if v == x then
                                 v = "self"
+                        elseif type.lamtype(v) == "environment" then
+                                v = tostring(v)
                         else
-                                v = m.dump(v, lvl+2)
+                                v = m.dump(v, lvl+1)
                         end
-                        subo = subo .. string.format("\n%s[%s] = %s,",
-                                (space.."  "), k, v)
+                        table.insert(sub,
+                                string.format("\n%s[%s] = %s,", space, k, v))
                 end
-                output = output .. string.format("\n%s{%s\n%s}",
-                        space, subo, space)
+                table.insert(out,
+                        string.format("\n%s{%s\n%s}",
+                                space, table.concat(sub), space))
         else
-                output = output .. tostring(x)
+                table.insert(out, tostring(x))
         end
-        return output
+        return table.concat(out)
 end
 
-function m.pp (x)
-        print(m.dump(x))
-end
-
----
+--------
 return m