eliminate deprecated module style

1 files changed, 11 insertions, 9 deletions

diff --git a/acf/util.lua b/acf/util.lua
index 63276ec..e66b711 100644
--- a/acf/util.lua
+++ b/acf/util.lua
@@ -3,39 +3,41 @@ Copyright (c) 2012-2013 Kaarle Ritvanen
 See LICENSE file for license details
 --]]
 
-module(..., package.seeall)
+local M = {}
 
-function setdefault(t, k, v)
+function M.setdefault(t, k, v)
    if t[k] == nil then t[k] = v end
    return t[k]
 end
 
-function update(dst, src, preserve)
+function M.update(dst, src, preserve)
    for k, v in pairs(src) do
       if not preserve or dst[k] == nil then dst[k] = v end
    end
    return dst
 end
 
-function setdefaults(dst, src) return update(dst, src, true) end
+function M.setdefaults(dst, src) return M.update(dst, src, true) end
 
-function copy(var)
-   return type(var) == 'table' and setdefaults({}, var) or var
+function M.copy(var)
+   return type(var) == 'table' and M.setdefaults({}, var) or var
 end
 
-function extend(dst, src)
+function M.extend(dst, src)
    for _, v in ipairs(src) do table.insert(dst, v) end
    return dst
 end
 
-function keys(tbl)
+function M.keys(tbl)
    local res = {}
    for k, v in pairs(tbl) do table.insert(res, k) end
    return res
 end
 
-function map(func, tbl)
+function M.map(func, tbl)
    local res = {}
    for k, v in pairs(tbl) do res[k] = func(v) end
    return res
 end
+
+return M