aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetter Rasmussen2016-02-06 23:30:39 +0100
committerPetter Rasmussen2016-02-06 23:30:39 +0100
commit0ede2d49e12ddc3a6c2f270f2a74fb938c821e12 (patch)
treef178e895b280dd0ca94094ea4dd22c8fb8ff5848
parent0535cc04bc89943cd585f2f4d7f774ec1b8cc683 (diff)
downloadgdrive-0ede2d49e12ddc3a6c2f270f2a74fb938c821e12.tar.bz2
optional -> flagGroup
-rw-r--r--cli/handler.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/cli/handler.go b/cli/handler.go
index b196f53..a1a7257 100644
--- a/cli/handler.go
+++ b/cli/handler.go
@@ -42,10 +42,10 @@ func (self *Handler) getParser() Parser {
var parsers []Parser
for _, pattern := range self.SplitPattern() {
- if isOptional(pattern) {
- name := optionalName(pattern)
- parser := getFlagParser(self.FlagGroups.getFlags(name))
- parsers = append(parsers, parser)
+ if isFlagGroup(pattern) {
+ groupName := flagGroupName(pattern)
+ flags := self.FlagGroups.getFlags(groupName)
+ parsers = append(parsers, getFlagParser(flags))
} else if isCaptureGroup(pattern) {
parsers = append(parsers, CaptureGroupParser{pattern})
} else {
@@ -110,10 +110,10 @@ func isCaptureGroup(arg string) bool {
return strings.HasPrefix(arg, "<") && strings.HasSuffix(arg, ">")
}
-func isOptional(arg string) bool {
+func isFlagGroup(arg string) bool {
return strings.HasPrefix(arg, "[") && strings.HasSuffix(arg, "]")
}
-func optionalName(s string) string {
+func flagGroupName(s string) string {
return s[1:len(s) - 1]
}