switched options to func

Author: emar-kar

configparser.go

@@ -46,12 +46,7 @@ type Config map[string]*Section
 type ConfigParser struct {
 	config   Config
 	defaults *Section
-	opt      *Options
-}
-
-// Options allows to control parser behavior.
-type Options struct {
-	AllowNoValue bool
+	opt      *options
 }
 
 // Keys returns a sorted slice of keys
@@ -79,12 +74,17 @@ func New() *ConfigParser {
 	return &ConfigParser{
 		config:   make(Config),
 		defaults: newSection(defaultSectionName),
-		opt:      &Options{},
+		opt:      &options{},
 	}
 }
 
 // NewWithOptions creates a new ConfigParser with options.
-func NewWithOptions(opt *Options) *ConfigParser {
+func NewWithOptions(opts ...OptFunc) *ConfigParser {
+	opt := &options{}
+	for _, fn := range opts {
+		fn(opt)
+	}
+
 	return &ConfigParser{
 		config:   make(Config),
 		defaults: newSection(defaultSectionName),
@@ -123,8 +123,8 @@ func ParseReader(in io.Reader) (*ConfigParser, error) {
 }
 
 // ParseReaderWithOptions parses a ConfigParser from the provided input with given options.
-func ParseReaderWithOptions(in io.Reader, opt *Options) (*ConfigParser, error) {
-	p := NewWithOptions(opt)
+func ParseReaderWithOptions(in io.Reader, opts ...OptFunc) (*ConfigParser, error) {
+	p := NewWithOptions(opts...)
 	err := p.ParseReader(in)
 
 	return p, err
@@ -145,8 +145,8 @@ func Parse(filename string) (*ConfigParser, error) {
 }
 
 // ParseWithOptions takes a filename and parses it into a ConfigParser value with given options.
-func ParseWithOptions(filename string, opt *Options) (*ConfigParser, error) {
-	p := NewWithOptions(opt)
+func ParseWithOptions(filename string, opts ...OptFunc) (*ConfigParser, error) {
+	p := NewWithOptions(opts...)
 	data, err := os.ReadFile(filename)
 	if err != nil {
 		return nil, err
@@ -237,7 +237,7 @@ func (p *ConfigParser) ParseReader(in io.Reader) error {
 			if err := curSect.Add(key, value); err != nil {
 				return fmt.Errorf("failed to add %q = %q: %w", key, value, err)
 			}
-		} else if match = keyWNoValue.FindStringSubmatch(line); len(match) > 0 && p.opt.AllowNoValue && curSect != nil {
+		} else if match = keyWNoValue.FindStringSubmatch(line); len(match) > 0 && p.opt.allowNoValue && curSect != nil {
 			key := strings.TrimSpace(match[1])
 			value := match[4]
 			if err := curSect.Add(key, value); err != nil {

configparser_test.go

@@ -124,8 +124,9 @@ func (s *ConfigParserSuite) TestParseFromReader(c *gc.C) {
 
 // If AllowNoValue is set to true, parser should recognize options without values.
 func (s *ConfigParserSuite) TestParseReaderWithOptionsWNoValue(c *gc.C) {
-	opt := &configparser.Options{AllowNoValue: true}
-	parsed, err := configparser.ParseReaderWithOptions(strings.NewReader("[empty]\noption\n\n"), opt)
+	parsed, err := configparser.ParseReaderWithOptions(
+		strings.NewReader("[empty]\noption\n\n"), configparser.AllowNoValue,
+	)
 	c.Assert(err, gc.IsNil)
 
 	ok, err := parsed.HasOption("empty", "option")
@@ -138,8 +139,9 @@ func assertSuccessful(c *gc.C, err error) {
 }
 
 func (s *ConfigParserSuite) TestParseWithOptions(c *gc.C) {
-	opt := &configparser.Options{AllowNoValue: true}
-	parsed, err := configparser.ParseWithOptions("testdata/example.cfg", opt)
+	parsed, err := configparser.ParseWithOptions(
+		"testdata/example.cfg", configparser.AllowNoValue,
+	)
 	c.Assert(err, gc.IsNil)
 
 	ok, err := parsed.HasOption("empty", "foo")

options.go

@@ -0,0 +1,12 @@
+package configparser
+
+type options struct {
+	allowNoValue bool
+}
+
+// OptFunc modifies options.
+type OptFunc func(*options)
+
+// AllowNoValue allows option with no value to be saved
+// as empty line.
+func AllowNoValue(o *options) { o.allowNoValue = true }