adding multi-named flags

context.go

@@ -2,6 +2,7 @@ package cli
 
 import (
 	"flag"
+	"strings"
 	"strconv"
 )
 
@@ -22,52 +23,52 @@ func NewContext(app *App, set *flag.FlagSet, globalSet *flag.FlagSet) *Context {
 
 // Looks up the value of a local int flag, returns 0 if no int flag exists
 func (c *Context) Int(name string) int {
-	return c.lookupInt(name, c.flagSet)
+	return lookupInt(name, c.flagSet)
 }
 
 // Looks up the value of a local bool flag, returns false if no bool flag exists
 func (c *Context) Bool(name string) bool {
-	return c.lookupBool(name, c.flagSet)
+	return lookupBool(name, c.flagSet)
 }
 
 // Looks up the value of a local string flag, returns "" if no string flag exists
 func (c *Context) String(name string) string {
-	return c.lookupString(name, c.flagSet)
+	return lookupString(name, c.flagSet)
 }
 
 // Looks up the value of a local string slice flag, returns nil if no string slice flag exists
 func (c *Context) StringSlice(name string) []string {
-	return c.lookupStringSlice(name, c.flagSet)
+	return lookupStringSlice(name, c.flagSet)
 }
 
 // Looks up the value of a local int slice flag, returns nil if no int slice flag exists
 func (c *Context) IntSlice(name string) []int {
-	return c.lookupIntSlice(name, c.flagSet)
+	return lookupIntSlice(name, c.flagSet)
 }
 
 // Looks up the value of a global int flag, returns 0 if no int flag exists
 func (c *Context) GlobalInt(name string) int {
-	return c.lookupInt(name, c.globalSet)
+	return lookupInt(name, c.globalSet)
 }
 
 // Looks up the value of a global bool flag, returns false if no bool flag exists
 func (c *Context) GlobalBool(name string) bool {
-	return c.lookupBool(name, c.globalSet)
+	return lookupBool(name, c.globalSet)
 }
 
 // Looks up the value of a global string flag, returns "" if no string flag exists
 func (c *Context) GlobalString(name string) string {
-	return c.lookupString(name, c.globalSet)
+	return lookupString(name, c.globalSet)
 }
 
 // Looks up the value of a global string slice flag, returns nil if no string slice flag exists
 func (c *Context) GlobalStringSlice(name string) []string {
-	return c.lookupStringSlice(name, c.globalSet)
+	return lookupStringSlice(name, c.globalSet)
 }
 
 // Looks up the value of a global int slice flag, returns nil if no int slice flag exists
 func (c *Context) GlobalIntSlice(name string) []int {
-	return c.lookupIntSlice(name, c.globalSet)
+	return lookupIntSlice(name, c.globalSet)
 }
 
 // Returns the command line arguments associated with the context.
@@ -75,7 +76,7 @@ func (c *Context) Args() []string {
 	return c.flagSet.Args()
 }
 
-func (c *Context) lookupInt(name string, set *flag.FlagSet) int {
+func lookupInt(name string, set *flag.FlagSet) int {
 	f := set.Lookup(name)
 	if f != nil {
 		val, err := strconv.Atoi(f.Value.String())
@@ -88,7 +89,7 @@ func (c *Context) lookupInt(name string, set *flag.FlagSet) int {
 	return 0
 }
 
-func (c *Context) lookupString(name string, set *flag.FlagSet) string {
+func lookupString(name string, set *flag.FlagSet) string {
 	f := set.Lookup(name)
 	if f != nil {
 		return f.Value.String()
@@ -97,7 +98,7 @@ func (c *Context) lookupString(name string, set *flag.FlagSet) string {
 	return ""
 }
 
-func (c *Context) lookupStringSlice(name string, set *flag.FlagSet) []string {
+func lookupStringSlice(name string, set *flag.FlagSet) []string {
 	f := set.Lookup(name)
 	if f != nil {
 		return (f.Value.(*StringSlice)).Value()
@@ -107,7 +108,7 @@ func (c *Context) lookupStringSlice(name string, set *flag.FlagSet) []string {
 	return nil
 }
 
-func (c *Context) lookupIntSlice(name string, set *flag.FlagSet) []int {
+func lookupIntSlice(name string, set *flag.FlagSet) []int {
 	f := set.Lookup(name)
 	if f != nil {
 		return (f.Value.(*IntSlice)).Value()
@@ -117,7 +118,7 @@ func (c *Context) lookupIntSlice(name string, set *flag.FlagSet) []int {
 	return nil
 }
 
-func (c *Context) lookupBool(name string, set *flag.FlagSet) bool {
+func lookupBool(name string, set *flag.FlagSet) bool {
 	f := set.Lookup(name)
 	if f != nil {
 		val, err := strconv.ParseBool(f.Value.String())
@@ -129,3 +130,25 @@ func (c *Context) lookupBool(name string, set *flag.FlagSet) bool {
 
 	return false
 }
+
+func normalizeFlags(flags []Flag, set *flag.FlagSet) {
+	for _, f := range flags {
+		parts := strings.Split(f.GetName(), ", ")
+		if len(parts) == 1 {
+			continue
+		}
+		var ff *flag.Flag
+		for _, name := range parts {
+			ff = set.Lookup(name)
+			if ff != nil && ff.Value.String() != "" {
+				break
+			}
+		}
+		if ff == nil {
+			continue
+		}
+		for _, name := range parts {
+			set.Set(name, ff.Value.String())
+		}
+	}
+}