From 8dc35672c560ac30e537181f110ba5b5915bb7d1 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Tue, 28 Apr 2015 18:16:00 -0400
Subject: Make normalizedName external so we can make the functions external

---
 flag.go | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'flag.go')

diff --git a/flag.go b/flag.go
index ac14b81..ecd8abf 100644
--- a/flag.go
+++ b/flag.go
@@ -120,9 +120,9 @@ const (
 	PanicOnError
 )
 
-// normalizedName is a flag name that has been normalized according to rules
+// NormalizedName is a flag name that has been normalized according to rules
 // for the FlagSet (e.g. making '-' and '_' equivalent).
-type normalizedName string
+type NormalizedName string
 
 // A FlagSet represents a set of defined flags.
 type FlagSet struct {
@@ -133,8 +133,8 @@ type FlagSet struct {
 
 	name           string
 	parsed         bool
-	actual         map[normalizedName]*Flag
-	formal         map[normalizedName]*Flag
+	actual         map[NormalizedName]*Flag
+	formal         map[NormalizedName]*Flag
 	shorthands     map[byte]*Flag
 	args           []string // arguments after flags
 	exitOnError    bool     // does the program exit if there's an error?
@@ -165,7 +165,7 @@ type Value interface {
 }
 
 // sortFlags returns the flags as a slice in lexicographical sorted order.
-func sortFlags(flags map[normalizedName]*Flag) []*Flag {
+func sortFlags(flags map[NormalizedName]*Flag) []*Flag {
 	list := make(sort.StringSlice, len(flags))
 	i := 0
 	for k := range flags {
@@ -175,18 +175,18 @@ func sortFlags(flags map[normalizedName]*Flag) []*Flag {
 	list.Sort()
 	result := make([]*Flag, len(list))
 	for i, name := range list {
-		result[i] = flags[normalizedName(name)]
+		result[i] = flags[NormalizedName(name)]
 	}
 	return result
 }
 
-func (f *FlagSet) normalizeFlagName(name string) normalizedName {
+func (f *FlagSet) normalizeFlagName(name string) NormalizedName {
 	result := name
 	for _, sep := range f.wordSeparators {
 		result = strings.Replace(result, sep, "-", -1)
 	}
 	// Type convert to indicate normalization has been done.
-	return normalizedName(result)
+	return NormalizedName(result)
 }
 
 func (f *FlagSet) out() io.Writer {
@@ -240,7 +240,7 @@ func (f *FlagSet) Lookup(name string) *Flag {
 }
 
 // lookup returns the Flag structure of the named flag, returning nil if none exists.
-func (f *FlagSet) lookup(name normalizedName) *Flag {
+func (f *FlagSet) lookup(name NormalizedName) *Flag {
 	return f.formal[name]
 }
 
@@ -272,7 +272,7 @@ func (f *FlagSet) Set(name, value string) error {
 		return err
 	}
 	if f.actual == nil {
-		f.actual = make(map[normalizedName]*Flag)
+		f.actual = make(map[NormalizedName]*Flag)
 	}
 	f.actual[normalName] = flag
 	flag.Changed = true
@@ -417,7 +417,7 @@ func (f *FlagSet) AddFlag(flag *Flag) {
 		panic(msg) // Happens only if flags are declared with identical names
 	}
 	if f.formal == nil {
-		f.formal = make(map[normalizedName]*Flag)
+		f.formal = make(map[NormalizedName]*Flag)
 	}
 	f.formal[f.normalizeFlagName(flag.Name)] = flag
 
@@ -482,7 +482,7 @@ func (f *FlagSet) setFlag(flag *Flag, value string, origArg string) error {
 	}
 	// mark as visited for Visit()
 	if f.actual == nil {
-		f.actual = make(map[normalizedName]*Flag)
+		f.actual = make(map[NormalizedName]*Flag)
 	}
 	f.actual[f.normalizeFlagName(flag.Name)] = flag
 	flag.Changed = true
-- 
cgit v1.2.3