4 files changed, 8 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 51b3fc2..42349fb 100644
--- a/Makefile
+++ b/Makefile

@@ -1,5 +1,5 @@
 LUA ?= rlwrap luajit \
-        -e 'pp = require "pp"' \
+        -e 'pp = require("dump").pp' \
        -e 'eval = require "eval"' \
        -e 'read = require "read"' \
        -e 'type = require "type"' \
diff --git a/pp.lua b/dump.lua
index 4d9d9af..dc32096 100644
--- a/pp.lua
+++ b/dump.lua

@@ -1,10 +1,9 @@
 --- lam.pp
-local pp = {}
+local m = {}
 local type = require "type"
-local unpack = table.unpack or unpack
-function pp.dump (x, lvl)
+function m.dump (x, lvl)
        lvl = lvl or 0
        local space = string.rep(" ", lvl)
        local output = ""
@@ -16,7 +15,7 @@ function pp.dump (x, lvl)
                        if v == x then
                                v = "self"
                        else
-                                v = pp.dump(v, lvl+2)
+                                v = m.dump(v, lvl+2)
                        end
                        subo = subo .. string.format("\n%s[%s] = %s,",
                                (space.."  "), k, v)
@@ -29,9 +28,9 @@ function pp.dump (x, lvl)
        return output
 end
-function pp.pp (x)
+function m.pp (x)
-        print(pp.dump(x))
+        print(m.dump(x))
 end
 ---
-return pp
+return m
diff --git a/read.lua b/read.lua
index f8d6b09..8a154a1 100644
--- a/read.lua
+++ b/read.lua

@@ -5,8 +5,6 @@ local t = require "type"
 local utf8 = require "utf8"
 local pop = require("util").pop
-local pp = require("pp").pp
 -- TODO:
 -- - string reading
 -- - # syntax
diff --git a/repl.lua b/repl.lua
index 93e430c..a3fdf95 100644
--- a/repl.lua
+++ b/repl.lua

@@ -3,7 +3,7 @@
 local m = {}
 local read = require("read")
 local eval = require("eval")
-local pp = require("pp").pp
+local pp = require("dump").pp
 local function schemeprint (x)
        -- if x == nil then return end