diff options
author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-01-23 21:00:42 +0200 |
---|---|---|
committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-01-23 21:57:35 +0200 |
commit | 9c41b91f0fdefbbf2f16a19c52ef9dbd06cc2bcf (patch) | |
tree | 98da7f806547f705a46f844f3e8104a8026891b2 | |
parent | de4c88b6dcb1037d57b4b432dc6cf13d2fe7101d (diff) | |
download | aconf-9c41b91f0fdefbbf2f16a19c52ef9dbd06cc2bcf.tar.bz2 aconf-9c41b91f0fdefbbf2f16a19c52ef9dbd06cc2bcf.tar.xz |
model: rename 'members' to '_members' to avoid clashes
-rw-r--r-- | aconf/model/model.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/aconf/model/model.lua b/aconf/model/model.lua index 259da09..153281f 100644 --- a/aconf/model/model.lua +++ b/aconf/model/model.lua @@ -1,5 +1,5 @@ --[[ -Copyright (c) 2012-2014 Kaarle Ritvanen +Copyright (c) 2012-2015 Kaarle Ritvanen See LICENSE file for license details --]] @@ -77,7 +77,7 @@ function M.new(base) if not base then base = M.Model end local res = class(base) - res.members = base == node.TreeNode and {} or copy(base.members) + res._members = base == node.TreeNode and {} or copy(base._members) local mt = copy(getmetatable(res)) @@ -94,7 +94,7 @@ function M.new(base) if isinstance(v, Member) then v.name = k - if not override then table.insert(t.members, k) end + if not override then table.insert(t._members, k) end end end @@ -128,7 +128,7 @@ function M.Model:init(context) local function _members(tpe) local res = {} - for _, name in ipairs(self.members) do + for _, name in ipairs(self._members) do local m = mt.member(name, true, tpe) if m then table.insert(res, m) end end |