From c9f1d41a42dc2fedc8074e009cd3ac1432db48d9 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Wed, 19 Mar 2014 14:46:19 +0200 Subject: model: remove key_removable from metatable --- aconf/model/node.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'aconf/model') diff --git a/aconf/model/node.lua b/aconf/model/node.lua index 9b69571..9a4f477 100644 --- a/aconf/model/node.lua +++ b/aconf/model/node.lua @@ -117,13 +117,13 @@ function M.TreeNode:init(context, params) return not isinstance(v, M.TreeNode) or getmetatable(v).removable() end - function mt.key_removable(k) + local function key_removable(k) return params.editable and mt.value_removable(mt.load(k, {dereference=false})) end function mt.check_removable(k, v) - if v == nil and not mt.key_removable(k) then + if v == nil and not key_removable(k) then raise(pth.join(mt.path, k), 'Cannot be deleted') end end @@ -143,7 +143,7 @@ function M.TreeNode:init(context, params) local res = copy(mt._meta) res.removable = {} for _, key in ipairs(mt.members()) do - if mt.key_removable(key) then table.insert(res.removable, key) end + if key_removable(key) then table.insert(res.removable, key) end end return res end -- cgit v1.2.3