From 63942c3e11107bb1f3f5d874a2f3b694bb510f39 Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Fri, 28 Jun 2013 18:28:13 +0300
Subject: eliminate deprecated varargs style

---
 acf/error.lua            | 8 +++-----
 acf/model/net.lua        | 4 ++--
 acf/model/node.lua       | 4 ++--
 acf/model/permission.lua | 2 +-
 acf/object.lua           | 3 ++-
 acf/path.lua             | 6 ++++--
 6 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'acf')

diff --git a/acf/error.lua b/acf/error.lua
index 26dfb86..61788e5 100644
--- a/acf/error.lua
+++ b/acf/error.lua
@@ -13,9 +13,6 @@ local util = require('acf.util')
 require 'json'
 
 
-local function pack(...) return arg end
-
-
 local ErrorTable = class()
 
 function ErrorTable:init() self.errors = {} end
@@ -43,6 +40,7 @@ ErrorDict = class(ErrorTable)
 
 function ErrorDict:collect(func, ...)
    local function pack(success, ...)
+      local arg = {...}
       return success, success and arg or arg[1]
    end
 
@@ -78,7 +76,7 @@ end
 
 function relabel(label, ...)
    local err = ErrorDict()
-   local res = pack(err:collect(unpack(arg)))
+   local res = {err:collect(...)}
    if err:success() then return unpack(res) end
 
    elist = ErrorList(label)
@@ -90,7 +88,7 @@ end
 
 function call(...)
    local err = ErrorDict()
-   local res = pack(err:collect(unpack(arg)))
+   local res = {err:collect(...)}
    if err:success() then return true, unpack(res) end
    if err.errors.system then error(err.errors.system[1]) end
    return false, err.errors
diff --git a/acf/model/net.lua b/acf/model/net.lua
index 0792383..dc63e75 100644
--- a/acf/model/net.lua
+++ b/acf/model/net.lua
@@ -26,8 +26,8 @@ IPv4Address = class(String)
 function IPv4Address:validate(context, value)
    super(self, IPv4Address):validate(context, value)
    local function test(...)
-      if #arg ~= 4 then return true end
-      for _, octet in ipairs(arg) do
+      if #{...} ~= 4 then return true end
+      for _, octet in ipairs{...} do
 	 if tonumber(octet) > 255 then return true end
       end
    end
diff --git a/acf/model/node.lua b/acf/model/node.lua
index 67d3230..688336c 100644
--- a/acf/model/node.lua
+++ b/acf/model/node.lua
@@ -36,7 +36,7 @@ function BoundMember:init(parent, name, field)
 			 field.addr or pth.escape(name), pmt.addr
 		      )
 		   },
-		   unpack(arg)
+		   ...
 		)
 	     end
    end
@@ -237,7 +237,7 @@ end
 local function meta_func(attr)
    return function(node, ...)
 	     local res = getmetatable(node)[attr]
-	     if type(res) == 'function' then return res(unpack(arg)) end
+	     if type(res) == 'function' then return res(...) end
 	     return res
 	  end
 end
diff --git a/acf/model/permission.lua b/acf/model/permission.lua
index d62906e..94b3df0 100644
--- a/acf/model/permission.lua
+++ b/acf/model/permission.lua
@@ -11,7 +11,7 @@ local start = require('acf.transaction').start
 function define(path, ...)
    local txn = start()
    local db = txn:fetch('/auth/permissions')
-   for _, permission in ipairs(arg) do insert(db, permission..path) end
+   for _, permission in ipairs{...} do insert(db, permission..path) end
    txn:commit()
 end
 
diff --git a/acf/object.lua b/acf/object.lua
index cbccf70..670a8bb 100644
--- a/acf/object.lua
+++ b/acf/object.lua
@@ -12,7 +12,7 @@ function class(base)
       __call=function(self, ...)
 		local obj = {}
 		setmetatable(obj, {__index=cls, class=cls})
-		obj:init(unpack(arg))
+		obj:init(...)
 		return obj
 	     end
    }
@@ -41,6 +41,7 @@ function super(obj, cls)
       local v = cls._base[k]
       if type(v) ~= 'function' then return v end
       return function(...)
+		local arg = {...}
 		arg[1] = obj
 		return v(unpack(arg))
 	     end
diff --git a/acf/path.lua b/acf/path.lua
index cd7ea2c..be7387e 100644
--- a/acf/path.lua
+++ b/acf/path.lua
@@ -31,10 +31,12 @@ end
 function rawjoin(p1, p2, ...)
    if not p2 then return p1 end
    if not is_absolute(p2) then p2 = '/'..p2 end
-   return rawjoin((p1 == '/' and '' or p1)..p2, unpack(arg))
+   return rawjoin((p1 == '/' and '' or p1)..p2, ...)
 end
 
-function join(parent, ...) return rawjoin(parent, unpack(map(escape, arg))) end
+function join(parent, ...)
+   return rawjoin(parent, unpack(map(escape, {...})))
+end
 
 
 function split(path)
-- 
cgit v1.2.3