]]--
-module( "luci.uvl.errors", package.seeall )
+local uci = require "luci.model.uci"
+local uvl = require "luci.uvl"
+local util = require "luci.util"
+local string = require "string"
-require("luci.util")
+local ipairs, error, type = ipairs, error, type
+local tonumber, unpack = tonumber, unpack
+local luci = luci
+
+module "luci.uvl.errors"
+
ERRCODES = {
{ 'UCILOAD', 'Unable to load config "%p": %1' },
{ 'OPT_UNKNOWN', 'Option "%i" (%I) not found in scheme' },
{ 'OPT_REQUIRED', 'Required option "%i" has no value' },
{ 'OPT_BADVALUE', 'Value "%1" of option "%i" is not defined in enum %2' },
- { 'OPT_INVVALUE', 'Value "%1" of given option "%i" does not validate as datatype "%2"' },
+ { 'OPT_INVVALUE', 'Value "%1" of option "%i" does not validate as datatype "%2"' },
{ 'OPT_NOTLIST', 'Option "%i" is defined as list but stored as plain value' },
{ 'OPT_DATATYPE', 'Option "%i" has unknown datatype "%1"' },
{ 'OPT_NOTFOUND', 'Option "%p.%s.%o" not found in config' },
+ { 'OPT_RANGE', 'Option "%p.%s.%o" is not within the specified range' },
{ 'DEP_NOTEQUAL', 'Dependency (%1) failed:\nOption "%i" is not eqal "%2"' },
{ 'DEP_NOVALUE', 'Dependency (%1) failed:\nOption "%i" has no value' },
-- build error constants and instance constructors
for i, v in ipairs(ERRCODES) do
- luci.uvl.errors[v[1]] = function(...)
+ _M[v[1]] = function(...)
return error(i, ...)
end
- luci.uvl.errors['ERR_'..v[1]] = i
+ _M['ERR_'..v[1]] = i
end
end
-error = luci.util.class()
+error = util.class()
function error.__init__(self, code, pso, args)
self.code = code
self.args = ( type(args) == "table" and args or { args } )
- if luci.util.instanceof( pso, luci.uvl.uvlitem ) then
+ if util.instanceof( pso, uvl.uvlitem ) then
self.stype = pso.sref[2]
self.package, self.section, self.option, self.value = unpack(pso.cref)
self.object = pso
pso = ( type(pso) == "table" and pso or { pso } )
if pso[2] then
- local uci = luci.model.uci.cursor()
+ local uci = uci.cursor()
self.stype = uci:get(pso[1], pso[2]) or pso[2]
end
if not self.childs then
self.childs = { err }
else
- table.insert( self.childs, err )
+ self.childs[#self.childs+1] = err
end
return self
end
end
return false
end
+
+function error.is_all(self, code)
+ if self.code == code then
+ return true
+ else
+ local equal = false
+ for _, c in ipairs(self.childs) do
+ equal = ( c.code == code )
+ end
+ return equal
+ end
+end