Minor refactoring

error.go

@@ -1,6 +1,9 @@
 package ucfg
 
-import "errors"
+import (
+	"errors"
+	"fmt"
+)
 
 var (
 	ErrMissing = errors.New("field name missing")
@@ -30,3 +33,7 @@ func raise(err error) error {
 	// fmt.Println(string(debug.Stack()))
 	return err
 }
+
+func errDuplicateKey(name string) error {
+	return fmt.Errorf("duplicate field key '%v'", name)
+}

opts.go

@@ -0,0 +1,31 @@
+package ucfg
+
+type Option func(*options)
+
+type options struct {
+	tag     string
+	pathSep string
+}
+
+func StructTag(tag string) Option {
+	return func(o *options) {
+		o.tag = tag
+	}
+}
+
+func PathSep(sep string) Option {
+	return func(o *options) {
+		o.pathSep = sep
+	}
+}
+
+func makeOptions(opts []Option) options {
+	o := options{
+		tag:     "config",
+		pathSep: "", // no separator by default
+	}
+	for _, opt := range opts {
+		opt(&o)
+	}
+	return o
+}

ucfg.go

@@ -15,13 +15,6 @@ type fields struct {
 	fields map[string]value
 }
 
-type Option func(*options)
-
-type options struct {
-	tag     string
-	pathSep string
-}
-
 var (
 	tConfig         = reflect.TypeOf(Config{})
 	tConfigPtr      = reflect.PtrTo(tConfig)
@@ -90,30 +83,3 @@ func (c *Config) PathOf(field, sep string) string {
 	}
 	return field
 }
-
-func StructTag(tag string) Option {
-	return func(o *options) {
-		o.tag = tag
-	}
-}
-
-func PathSep(sep string) Option {
-	return func(o *options) {
-		o.pathSep = sep
-	}
-}
-
-func makeOptions(opts []Option) options {
-	o := options{
-		tag:     "config",
-		pathSep: "", // no separator by default
-	}
-	for _, opt := range opts {
-		opt(&o)
-	}
-	return o
-}
-
-func errDuplicateKey(name string) error {
-	return fmt.Errorf("duplicate field key '%v'", name)
-}