Almost ready for beta3

1 files changed, 19 insertions, 10 deletions

diff --git a/src/tp.lua b/src/tp.lua
index ada00d2..0a671fb 100644
--- a/src/tp.lua
+++ b/src/tp.lua
@@ -8,10 +8,12 @@
 -----------------------------------------------------------------------------
 -- Declare module and import dependencies
 -----------------------------------------------------------------------------
+local base = require("base")
+local string = require("string")
 local socket = require("socket")
 local ltn12 = require("ltn12")
 
-module("socket.tp")
+local tp = module("socket.tp")
 
 -----------------------------------------------------------------------------
 -- Program constants
@@ -47,22 +49,27 @@ local metat = { __index = {} }
 function metat.__index:check(ok)
     local code, reply = get_reply(self.c)
     if not code then return nil, reply end
-    if type(ok) ~= "function" then
-        if type(ok) == "table" then 
-            for i, v in ipairs(ok) do
-                if string.find(code, v) then return tonumber(code), reply end
+    if base.type(ok) ~= "function" then
+        if base.type(ok) == "table" then 
+            for i, v in base.ipairs(ok) do
+                if string.find(code, v) then 
+                    return base.tonumber(code), reply 
+                end
             end
             return nil, reply
         else
-            if string.find(code, ok) then return tonumber(code), reply 
+            if string.find(code, ok) then return base.tonumber(code), reply 
             else return nil, reply end
         end
-    else return ok(tonumber(code), reply) end
+    else return ok(base.tonumber(code), reply) end
 end
 
 function metat.__index:command(cmd, arg)
-    if arg then return self.c:send(cmd .. " " .. arg.. "\r\n")
-    else return self.c:send(cmd .. "\r\n") end
+    if arg then 
+        return self.c:send(cmd .. " " .. arg.. "\r\n")
+    else 
+        return self.c:send(cmd .. "\r\n") 
+    end
 end
 
 function metat.__index:sink(snk, pat)
@@ -111,5 +118,7 @@ function connect(host, port, timeout)
         c:close() 
         return nil, e
     end
-    return setmetatable({c = c}, metat)
+    return base.setmetatable({c = c}, metat)
 end
+
+base.setmetatable(tp, nil)