From 83889bc5e4659e845d919e9a477a29167e7cb4f8 Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Wed, 11 Mar 2015 13:59:25 +0200
Subject: remove address module

---
 aconf/model/node.lua | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'aconf/model/node.lua')

diff --git a/aconf/model/node.lua b/aconf/model/node.lua
index f15b97e..4f09c99 100644
--- a/aconf/model/node.lua
+++ b/aconf/model/node.lua
@@ -13,7 +13,6 @@ local isinstance = object.isinstance
 local super = object.super
 
 local pth = require('aconf.path')
-local address = require('aconf.path.address')
 
 local util = require('aconf.util')
 local copy = util.copy
@@ -24,7 +23,7 @@ local update = util.update
 function M.null_addr(path, name)
    local comps = pth.split(path)
    table.insert(comps, pth.escape(name))
-   return address.join('/null', table.unpack(comps))
+   return pth.join('/null', table.unpack(comps))
 end
 
 
@@ -33,13 +32,13 @@ M.BoundMember = class()
 function M.BoundMember:init(parent, name, field)
    local pmt = getmetatable(parent)
 
-   if pmt.maddr and name ~= address.wildcard then self.addr = pmt.maddr(name)
+   if pmt.maddr and name ~= pth.wildcard then self.addr = pmt.maddr(name)
    else
-      self.addr = field.addr or address.escape(name)
+      self.addr = field.addr or pth.escape(name)
       if type(self.addr) == 'function' then
 	 self.addr = self.addr(pmt.path, name)
       end
-      self.addr = address.to_absolute(self.addr, pmt.addr)
+      self.addr = pth.to_absolute(self.addr, pmt.addr)
    end
 
    local context = {
@@ -374,12 +373,12 @@ function M.List:init(context, params)
       local addrs = expand()
 
       if not addrs[1] then
-	 addrs[1] = address.join(
+	 addrs[1] = pth.join(
 	    '/',
 	    table.unpack(
 	       util.map(
-		  function(c) return c == address.wildcard and 1 or c end,
-		  address.split(mt.field.addr)
+		  function(c) return c == pth.wildcard and 1 or c end,
+		  pth.split(mt.field.addr)
 	       )
 	    )
 	 )
@@ -387,9 +386,9 @@ function M.List:init(context, params)
 
       if addrs[i] then return addrs[i] end
 
-      local comps = address.split(addrs[#addrs])
+      local comps = pth.split(addrs[#addrs])
       comps[#comps] = comps[#comps] + i - #addrs
-      return address.join('/', table.unpack(comps))
+      return pth.join('/', table.unpack(comps))
    end
 
    function mt.members() return util.keys(expand()) end
-- 
cgit v1.2.3