Revert autoadding of <> to custom argnames

This commit is contained in:
mpeterv
2014-08-06 13:33:50 +04:00
parent 4b97d03bf5
commit 8c16eca398
2 changed files with 6 additions and 6 deletions

View File

@@ -137,7 +137,7 @@ describe("tests related to usage message generation", function()
:add_help(false) :add_help(false)
parser:argument "inputs" parser:argument "inputs"
:args "1-2" :args "1-2"
:argname "input" :argname "<input>"
assert.equal( assert.equal(
[=[Usage: foo <input> [<input>]]=], [=[Usage: foo <input> [<input>]]=],
@@ -151,7 +151,7 @@ describe("tests related to usage message generation", function()
parser:option "--pair" parser:option "--pair"
:args(2) :args(2)
:count "*" :count "*"
:argname{"key", "value"} :argname{"<key>", "<value>"}
assert.equal( assert.equal(
[=[Usage: foo [--pair <key> <value>]]=], [=[Usage: foo [--pair <key> <value>]]=],

View File

@@ -295,18 +295,18 @@ function Argument:_get_argname(narg)
local argname = self._argname or self:_get_default_argname() local argname = self._argname or self:_get_default_argname()
if type(argname) == "table" then if type(argname) == "table" then
return "<" .. argname[narg] .. ">" return argname[narg]
else else
return "<" .. argname .. ">" return argname
end end
end end
function Argument:_get_default_argname() function Argument:_get_default_argname()
return self._name return "<" .. self._name .. ">"
end end
function Option:_get_default_argname() function Option:_get_default_argname()
return self:_get_target() return "<" .. self:_get_target() .. ">"
end end
-- Returns label to be shown in the help message. -- Returns label to be shown in the help message.