Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
dms3
go-dms3
Commits
50751617
Commit
50751617
authored
Nov 11, 2014
by
Matt Bell
Committed by
Juan Batiz-Benet
Nov 14, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
commands: s/j/valueIndex/
parent
eedc2e9c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
commands/command.go
commands/command.go
+7
-7
No files found.
commands/command.go
View file @
50751617
...
...
@@ -167,18 +167,18 @@ func (c *Command) CheckArguments(req Request) error {
}
// iterate over the arg definitions
j
:=
0
valueIndex
:=
0
// the index of the current value (in `args`)
for
_
,
argDef
:=
range
c
.
Arguments
{
// skip optional argument definitions if there aren't sufficient remaining values
if
len
(
args
)
-
j
<=
numRequired
&&
!
argDef
.
Required
{
if
len
(
args
)
-
valueIndex
<=
numRequired
&&
!
argDef
.
Required
{
continue
}
// the value for this argument definition. can be nil if it wasn't provided by the caller
var
v
interface
{}
if
j
<
len
(
args
)
{
v
=
args
[
j
]
j
++
if
valueIndex
<
len
(
args
)
{
v
=
args
[
valueIndex
]
valueIndex
++
}
err
:=
checkArgValue
(
v
,
argDef
)
...
...
@@ -187,8 +187,8 @@ func (c *Command) CheckArguments(req Request) error {
}
// any additional values are for the variadic arg definition
if
argDef
.
Variadic
&&
j
<
len
(
args
)
-
1
{
for
_
,
val
:=
range
args
[
j
:
]
{
if
argDef
.
Variadic
&&
valueIndex
<
len
(
args
)
-
1
{
for
_
,
val
:=
range
args
[
valueIndex
:
]
{
err
:=
checkArgValue
(
val
,
argDef
)
if
err
!=
nil
{
return
err
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment