Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* luci/libs: use one common quoting style for error messages in luci.uvl

Browse source
This commit is contained in:
Jo-Philipp Wich 2008-08-18 02:30:15 +00:00
parent 935f4a805a
commit 0fb1e9267b
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
libs/uvl/luasrc/uvl.lua
View file

@ -359,15 +359,15 @@ function UVL._read_scheme_parts( self, scheme, schemes )
local function _id( c, t ) local function _id( c, t )
if c == TYPE_SECTION then if c == TYPE_SECTION then
return string.format( return string.format(
"section '%s.%s'", 'section "%s.%s"',
scheme, t.name or '?' ) scheme, t.name or '?' )
elseif c == TYPE_VARIABLE then elseif c == TYPE_VARIABLE then
return string.format( return string.format(
"variable '%s.%s.%s'", 'variable "%s.%s.%s"',
scheme, t.section or '?.?', t.name or '?' ) scheme, t.section or '?.?', t.name or '?' )
elseif c == TYPE_ENUM then elseif c == TYPE_ENUM then
return string.format( return string.format(
"enum '%s.%s.%s'", 'enum "%s.%s.%s"',
scheme, t.variable or '?.?.?', t.value or '?' ) scheme, t.variable or '?.?.?', t.value or '?' )
end end
end end
@ -375,7 +375,7 @@ function UVL._read_scheme_parts( self, scheme, schemes )
-- helper function to check for required fields -- helper function to check for required fields
local function _req( c, t, r ) local function _req( c, t, r )
for i, v in ipairs(r) do for i, v in ipairs(r) do
_assert( t[v], "Missing required field '%s' in %s", v, _id(c, t) ) _assert( t[v], 'Missing required field "%s" in %s', v, _id(c, t) )
end end
end end
@ -393,7 +393,7 @@ function UVL._read_scheme_parts( self, scheme, schemes )
local r = luci.util.split( t[k], "." ) local r = luci.util.split( t[k], "." )
r[1] = ( #r[1] > 0 and r[1] or scheme ) r[1] = ( #r[1] > 0 and r[1] or scheme )
_assert( #r == c, "Malformed %s reference in %s", k, _id(c, t) ) _assert( #r == c, 'Malformed %s reference in %s', k, _id(c, t) )
return r return r
end end
@ -429,8 +429,8 @@ function UVL._read_scheme_parts( self, scheme, schemes )
if k:match("^depends") then if k:match("^depends") then
s["depends"] = _assert( s["depends"] = _assert(
self:_read_dependency( v2, s["depends"] ), self:_read_dependency( v2, s["depends"] ),
"Section '%s' in scheme '%s' has malformed " .. 'Section "%s" in scheme "%s" has malformed ' ..
"dependency specification in '%s'", 'dependency specification in "%s"',
v.name or '<nil>', scheme or '<nil>', k v.name or '<nil>', scheme or '<nil>', k
) )
elseif k == "dynamic" or k == "unique" or k == "required" then elseif k == "dynamic" or k == "unique" or k == "required" then
@ -458,11 +458,11 @@ function UVL._read_scheme_parts( self, scheme, schemes )
local r = _ref( TYPE_VARIABLE, v ) local r = _ref( TYPE_VARIABLE, v )
local p = _assert( self.packages[r[1]], local p = _assert( self.packages[r[1]],
"Variable '%s' in scheme '%s' references unknown package '%s'", 'Variable "%s" in scheme "%s" references unknown package "%s"',
v.name, scheme, r[1] ) v.name, scheme, r[1] )
local s = _assert( p.variables[r[2]], local s = _assert( p.variables[r[2]],
"Variable '%s' in scheme '%s' references unknown section '%s'", 'Variable "%s" in scheme "%s" references unknown section "%s"',
v.name, scheme, r[2] ) v.name, scheme, r[2] )
s[v.name] = s[v.name] or { } s[v.name] = s[v.name] or { }
@ -480,8 +480,8 @@ function UVL._read_scheme_parts( self, scheme, schemes )
elseif k:match("^validator") then elseif k:match("^validator") then
t["validators"] = _assert( t["validators"] = _assert(
self:_read_validator( v2, t["validators"] ), self:_read_validator( v2, t["validators"] ),
"Variable '%s' in scheme '%s' has malformed " .. 'Variable "%s" in scheme "%s" has malformed ' ..
"validator specification in '%s'", 'validator specification in "%s"',
v.name, scheme, k v.name, scheme, k
) )
elseif k == "required" then elseif k == "required" then
@ -509,21 +509,21 @@ function UVL._read_scheme_parts( self, scheme, schemes )
local r = _ref( TYPE_ENUM, v ) local r = _ref( TYPE_ENUM, v )
local p = _assert( self.packages[r[1]], local p = _assert( self.packages[r[1]],
"Enum '%s' in scheme '%s' references unknown package '%s'", 'Enum "%s" in scheme "%s" references unknown package "%s"',
v.value, scheme, r[1] ) v.value, scheme, r[1] )
local s = _assert( p.variables[r[2]], local s = _assert( p.variables[r[2]],
"Enum '%s' in scheme '%s' references unknown section '%s'", 'Enum "%s" in scheme "%s" references unknown section "%s"',
v.value, scheme, r[2] ) v.value, scheme, r[2] )
local t = _assert( s[r[3]], local t = _assert( s[r[3]],
"Enum '%s' in scheme '%s', section '%s' references " .. 'Enum "%s" in scheme "%s", section "%s" references ' ..
"unknown variable '%s'", 'unknown variable "%s"',
v.value, scheme, r[2], r[3] ) v.value, scheme, r[2], r[3] )
_assert( t.type == "enum", _assert( t.type == "enum",
"Enum '%s' in scheme '%s', section '%s' references " .. 'Enum "%s" in scheme "%s", section "%s" references ' ..
"variable '%s' with non enum type '%s'", 'variable "%s" with non enum type "%s"',
v.value, scheme, r[2], r[3], t.type ) v.value, scheme, r[2], r[3], t.type )
if not t.values then if not t.values then
@ -534,8 +534,8 @@ function UVL._read_scheme_parts( self, scheme, schemes )
if v.default then if v.default then
_assert( not t.default, _assert( not t.default,
"Enum '%s' in scheme '%s', section '%s' redeclares " .. 'Enum "%s" in scheme "%s", section "%s" redeclares ' ..
"the default value of variable '%s'", 'the default value of variable "%s"',
v.value, scheme, r[2], v.variable ) v.value, scheme, r[2], v.variable )
t.default = v.value t.default = v.value