summaryrefslogtreecommitdiffstats
path: root/acf2
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2013-12-20 23:47:50 +0200
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2013-12-20 23:48:18 +0200
commita4865edb93a81706d686bcf5a9429ef94aba66a6 (patch)
treeb2b9da0f410b94978b798378dd28eba0ad739712 /acf2
parentefd962f6583e9cf04d8d5621a9126e015caba4fb (diff)
downloadacf2-a4865edb93a81706d686bcf5a9429ef94aba66a6.tar.bz2
acf2-a4865edb93a81706d686bcf5a9429ef94aba66a6.tar.xz
model: shortcut for TreeNode's last path component
Diffstat (limited to 'acf2')
-rw-r--r--acf2/model/init.lua1
-rw-r--r--acf2/model/node.lua7
2 files changed, 5 insertions, 3 deletions
diff --git a/acf2/model/init.lua b/acf2/model/init.lua
index 3288566..764eb2a 100644
--- a/acf2/model/init.lua
+++ b/acf2/model/init.lua
@@ -38,6 +38,7 @@ for _, m in ipairs{
'insert',
'meta',
'mmeta',
+ 'name',
'parent',
'path',
'pairs',
diff --git a/acf2/model/node.lua b/acf2/model/node.lua
index 85a857d..e4b843b 100644
--- a/acf2/model/node.lua
+++ b/acf2/model/node.lua
@@ -62,6 +62,7 @@ function M.TreeNode:init(context, dtype)
local mt = getmetatable(self)
update(mt, context)
+ mt.name = pth.name(mt.path)
mt.__eq = equal_tns
function mt.meta()
@@ -69,9 +70,8 @@ function M.TreeNode:init(context, dtype)
mt._meta = {type=dtype}
if mt.txn then
if mt.parent then
- mt._meta['ui-name'] = getmetatable(mt.parent).mmeta(
- pth.name(mt.path)
- )['ui-name']
+ mt._meta['ui-name'] =
+ getmetatable(mt.parent).mmeta(mt.name)['ui-name']
end
mt.init_meta(mt._meta)
end
@@ -315,6 +315,7 @@ for _, mf in ipairs{
'match',
'meta',
'mmeta',
+ 'name',
'parent',
'path',
'topology'