commands/cli: Use better variable name for parseArgs value index
Matt Bell committed
Nov 11, 2014 at 16:46 UTC
e14471f5e83928876e9845d6aeb411710f32e249
1 file changed
+9
-9
commands/cli/parse.go
+9
-9
@@ -134,40 +134,40 @@ func parseArgs(stringArgs []string, cmd *cmds.Command) ([]interface{}, error) {
134
}
135
}
136
137
- j := 0
137
+ valueIndex := 0 // the index of the current stringArgs value
138
for _, argDef := range cmd.Arguments {
139
// skip optional argument definitions if there aren't sufficient remaining values
140
- if len(stringArgs)-j <= lenRequired && !argDef.Required {
140
+ if len(stringArgs)-valueIndex <= lenRequired && !argDef.Required {
141
continue
142
} else if argDef.Required {
143
lenRequired--
144
}
145
146
- if j >= len(stringArgs) {
146
+ if valueIndex >= len(stringArgs) {
147
break
148
}
149
150
if argDef.Variadic {
151
- for _, arg := range stringArgs[j:] {
151
+ for _, arg := range stringArgs[valueIndex:] {
152
var err error
153
args, err = appendArg(args, argDef, arg)
154
if err != nil {
155
return nil, err
156
}
157
- j++
157
+ valueIndex++
158
}
159
} else {
160
var err error
161
- args, err = appendArg(args, argDef, stringArgs[j])
161
+ args, err = appendArg(args, argDef, stringArgs[valueIndex])
162
if err != nil {
163
return nil, err
164
}
165
- j++
165
+ valueIndex++
166
}
167
}
168
169
- if len(stringArgs)-j > 0 {
170
- args = append(args, make([]interface{}, len(stringArgs)-j))
169
+ if len(stringArgs)-valueIndex > 0 {
170
+ args = append(args, make([]interface{}, len(stringArgs)-valueIndex))
171
}
172
173
return args, nil