chore: update goNixArgParser

- refactor(optionSet): use value parameter to get copied argument - feat(optionSet): remove default option delimiter
mjpclab · Apr 6, 2020 · 10005c1 · 10005c1
1 parent 0e022af
commit 10005c1
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 30 deletions.
diff --git a/src/goNixArgParser/optionSet.go b/src/goNixArgParser/optionSet.go
@@ -7,8 +7,6 @@ import (
 	"strings"
 )
 
-var defaultOptionDelimiters = []rune{',', ' ', '\t', '\v', '\r', '\n'}
-
 func StringToSlice(input string) []string {
 	if len(input) == 0 {
 		return nil
@@ -90,7 +88,7 @@ func (s *OptionSet) isUdefFlag(input string) bool {
 	return false
 }
 
-func (s *OptionSet) Append(opt *Option) error {
+func (s *OptionSet) Append(opt Option) error {
 	// verify
 	if len(opt.Key) == 0 {
 		return errors.New("key is empty")
@@ -109,9 +107,7 @@ func (s *OptionSet) Append(opt *Option) error {
 		}
 	}
 
-	// copy
-	optCopied := *opt
-	option := &optCopied
+	option := &opt
 
 	// append
 	s.options = append(s.options, option)
@@ -161,7 +157,7 @@ func (s *OptionSet) Append(opt *Option) error {
 }
 
 func (s *OptionSet) AddFlag(key, flag, envVar, summary string) error {
-	return s.Append(&Option{
+	return s.Append(Option{
 		Key:     key,
 		Flags:   []*Flag{NewSimpleFlag(flag)},
 		EnvVars: StringToSlice(envVar),
@@ -170,7 +166,7 @@ func (s *OptionSet) AddFlag(key, flag, envVar, summary string) error {
 }
 
 func (s *OptionSet) AddFlags(key string, flags []string, envVar, summary string) error {
-	return s.Append(&Option{
+	return s.Append(Option{
 		Key:     key,
 		Flags:   NewSimpleFlags(flags),
 		EnvVars: StringToSlice(envVar),
@@ -179,7 +175,7 @@ func (s *OptionSet) AddFlags(key string, flags []string, envVar, summary string)
 }
 
 func (s *OptionSet) AddFlagValue(key, flag, envVar, defaultValue, summary string) error {
-	return s.Append(&Option{
+	return s.Append(Option{
 		Key:           key,
 		Flags:         []*Flag{NewSimpleFlag(flag)},
 		AcceptValue:   true,
@@ -191,12 +187,11 @@ func (s *OptionSet) AddFlagValue(key, flag, envVar, defaultValue, summary string
 }
 
 func (s *OptionSet) AddFlagValues(key, flag, envVar string, defaultValues []string, summary string) error {
-	return s.Append(&Option{
+	return s.Append(Option{
 		Key:           key,
 		Flags:         []*Flag{NewSimpleFlag(flag)},
 		AcceptValue:   true,
 		MultiValues:   true,
-		Delimiters:    defaultOptionDelimiters,
 		UniqueValues:  true,
 		EnvVars:       StringToSlice(envVar),
 		DefaultValues: defaultValues,
@@ -205,7 +200,7 @@ func (s *OptionSet) AddFlagValues(key, flag, envVar string, defaultValues []stri
 }
 
 func (s *OptionSet) AddFlagsValue(key string, flags []string, envVar, defaultValue, summary string) error {
-	return s.Append(&Option{
+	return s.Append(Option{
 		Key:           key,
 		Flags:         NewSimpleFlags(flags),
 		AcceptValue:   true,
@@ -217,12 +212,11 @@ func (s *OptionSet) AddFlagsValue(key string, flags []string, envVar, defaultVal
 }
 
 func (s *OptionSet) AddFlagsValues(key string, flags []string, envVar string, defaultValues []string, summary string) error {
-	return s.Append(&Option{
+	return s.Append(Option{
 		Key:           key,
 		Flags:         NewSimpleFlags(flags),
 		AcceptValue:   true,
 		MultiValues:   true,
-		Delimiters:    defaultOptionDelimiters,
 		UniqueValues:  true,
 		EnvVars:       StringToSlice(envVar),
 		DefaultValues: defaultValues,

diff --git a/src/goNixArgParser/optionSetParse1_test.go b/src/goNixArgParser/optionSetParse1_test.go
@@ -9,7 +9,7 @@ func TestParse1(t *testing.T) {
 	var err error
 
 	s := NewOptionSet("-", []string{"--"}, []string{",,"}, []string{"-"})
-	err = s.Append(&Option{
+	err = s.Append(Option{
 		Key:         "tag",
 		Summary:     "tag summary",
 		Description: "tag description",
@@ -20,7 +20,7 @@ func TestParse1(t *testing.T) {
 		t.Error(err)
 	}
 
-	err = s.Append(&Option{
+	err = s.Append(Option{
 		Key:         "single",
 		Summary:     "single summary",
 		Description: "single description",
@@ -31,7 +31,7 @@ func TestParse1(t *testing.T) {
 		t.Error(err)
 	}
 
-	err = s.Append(&Option{
+	err = s.Append(Option{
 		Key:         "multi",
 		Flags:       NewSimpleFlags([]string{"-m", "--multi"}),
 		AcceptValue: true,
@@ -42,7 +42,7 @@ func TestParse1(t *testing.T) {
 		t.Error(err)
 	}
 
-	err = s.Append(&Option{
+	err = s.Append(Option{
 		Key:           "deft",
 		Flags:         NewSimpleFlags([]string{"-df", "--default"}),
 		AcceptValue:   true,
@@ -52,7 +52,7 @@ func TestParse1(t *testing.T) {
 		t.Error(err)
 	}
 
-	err = s.Append(&Option{
+	err = s.Append(Option{
 		Key:         "singleMissingValue",
 		Flags:       NewSimpleFlags([]string{"-sm", "--single-missing"}),
 		AcceptValue: true,
@@ -61,7 +61,7 @@ func TestParse1(t *testing.T) {
 		t.Error(err)
 	}
 
-	err = s.Append(&Option{
+	err = s.Append(Option{
 		Key:         "flagX",
 		Flags:       NewSimpleFlags([]string{"-x"}),
 		AcceptValue: true,
@@ -70,7 +70,7 @@ func TestParse1(t *testing.T) {
 		t.Error(err)
 	}
 
-	err = s.Append(&Option{
+	err = s.Append(Option{
 		Key:         "flagY",
 		Flags:       NewSimpleFlags([]string{"-y"}),
 		AcceptValue: true,
@@ -79,7 +79,7 @@ func TestParse1(t *testing.T) {
 		t.Error(err)
 	}
 
-	err = s.Append(&Option{
+	err = s.Append(Option{
 		Key: "withEqual",
 		Flags: []*Flag{
 			{Name: "--with-equal", assignSigns: []string{"="}},
@@ -90,7 +90,7 @@ func TestParse1(t *testing.T) {
 		t.Error(err)
 	}
 
-	err = s.Append(&Option{
+	err = s.Append(Option{
 		Key: "withConcat",
 		Flags: []*Flag{
 			{Name: "-w", canConcatAssign: true},
@@ -101,7 +101,7 @@ func TestParse1(t *testing.T) {
 		t.Error(err)
 	}
 
-	err = s.Append(&Option{
+	err = s.Append(Option{
 		Key: "fromenv",
 		Flags: []*Flag{
 			{Name: "--from-env", assignSigns: []string{"="}},

diff --git a/src/goNixArgParser/optionSetParse2_test.go b/src/goNixArgParser/optionSetParse2_test.go
@@ -8,9 +8,9 @@ import (
 func TestParse2(t *testing.T) {
 	var err error
 
-	s := NewOptionSet("", nil, nil,nil)
+	s := NewOptionSet("", nil, nil, nil)
 
-	err = s.Append(&Option{
+	err = s.Append(Option{
 		Key:           "deft",
 		Flags:         []*Flag{{Name: "-df"}, {Name: "--default"}},
 		AcceptValue:   true,
@@ -55,7 +55,7 @@ func TestParse2(t *testing.T) {
 		t.Error(err)
 	}
 
-	err = s.Append(&Option{
+	err = s.Append(Option{
 		Key:         "props",
 		Summary:     "properties",
 		Description: "single description",

diff --git a/src/goNixArgParser/optionSetParse3_test.go b/src/goNixArgParser/optionSetParse3_test.go
@@ -9,7 +9,7 @@ func TestParse3(t *testing.T) {
 
 	s := NewOptionSet("-", nil, []string{",,"}, []string{"-"})
 
-	err = s.Append(&Option{
+	err = s.Append(Option{
 		Key:         "bool",
 		Flags:       []*Flag{{Name: "-b", canMerge: true}, {Name: "--bool"}},
 		AcceptValue: false,
@@ -18,7 +18,7 @@ func TestParse3(t *testing.T) {
 		t.Error(err)
 	}
 
-	err = s.Append(&Option{
+	err = s.Append(Option{
 		Key:         "port",
 		Flags:       []*Flag{{Name: "-p", canMerge: true, canFollowAssign: true, assignSigns: []string{"="}}, {Name: "--port", canFollowAssign: true}},
 		AcceptValue: true,
@@ -27,7 +27,7 @@ func TestParse3(t *testing.T) {
 		t.Error(err)
 	}
 
-	err = s.Append(&Option{
+	err = s.Append(Option{
 		Key:         "root",
 		Flags:       []*Flag{{Name: "-r"}, {Name: "--root", canFollowAssign: true}},
 		AcceptValue: true,