renamed "NotEnoughArgumentsComplainer" to "NotEnoughArgumentsComplainerNotEnoughArguments"

bad_request.go

@@ -83,7 +83,7 @@ package pathmatch
 //	}
 //
 // Note that one can get more specific than just a BadRequest. For example:
-// NotEnoughArgumentsComplainer, PatternSyntaxErrorComplainer, UnsupportedArgumentType,
+// NotEnoughArguments, PatternSyntaxErrorComplainer, UnsupportedArgumentType,
 // and StructFieldWrongType.
 //
 // To be able to detect those more specific error types, put them BEFORE the "case pathmatch.BadRequest:"

not_enough_arguments_complainer.go

@@ -1,32 +1,28 @@
 package pathmatch
 
-
 import (
 	"fmt"
 )
 
-
+type NotEnoughArguments interface {
-type NotEnoughArgumentsComplainer interface {
 	BadRequest
-	NotEnoughArgumentsComplainer()
+	NotEnoughArguments()
 
 	ExpectedAtLeast() int
 	Actual() int
 }
 
-
+// internalNotEnoughArguments is the only underlying implementation that fits the
-// internalNotEnoughArgumentsComplainer is the only underlying implementation that fits the
+// NotEnoughArguments interface, in this library.
-// NotEnoughArgumentsComplainer interface, in this library.
+type internalNotEnoughArguments struct {
-type internalNotEnoughArgumentsComplainer struct {
 	expectedAtLeast int
 	actual          int
 }
 
-
+// newNotEnoughArguments creates a new internalNotEnoughArguments (struct) and
-// newNotEnoughArgumentsComplainer creates a new internalNotEnoughArgumentsComplainer (struct) and
+// returns it as a NotEnoughArguments (interface).
-// returns it as a NotEnoughArgumentsComplainer (interface).
+func newNotEnoughArguments(expectedAtLeast int, actual int) NotEnoughArguments {
-func newNotEnoughArgumentsComplainer(expectedAtLeast int, actual int) NotEnoughArgumentsComplainer {
+	err := internalNotEnoughArguments{
-	err := internalNotEnoughArgumentsComplainer{
 		expectedAtLeast:expectedAtLeast,
 		actual:actual,
 	}
@@ -34,10 +30,9 @@ func newNotEnoughArgumentsComplainer(expectedAtLeast int, actual int) NotEnoughA
 	return &err
 }
 
-
 // Error method is necessary to satisfy the 'error' interface (and the
-// NotEnoughArgumentsComplainer interface).
+// NotEnoughArguments interface).
-func (err *internalNotEnoughArgumentsComplainer) Error() string {
+func (err *internalNotEnoughArguments) Error() string {
 	plural := ""
 	if 1 < err.expectedAtLeast {
 		plural = "s"
@@ -45,25 +40,22 @@ func (err *internalNotEnoughArgumentsComplainer) Error() string {
 	return fmt.Sprintf("Bad Request: Not enough arguments. Expected at least %d argument%s, but actually got %d.", err.expectedAtLeast, plural, err.actual)
 }
 
-
 // BadRequest method is necessary to satisfy the 'BadRequest' interface.
 // It exists to make this error type detectable in a Go type-switch.
-func (err *internalNotEnoughArgumentsComplainer) BadRequest() {
+func (err *internalNotEnoughArguments) BadRequest() {
 	// Nothing here.
 }
 
-
+// NotEnoughArguments method is necessary to satisfy the 'NotEnoughArguments' interface.
-// NotEnoughArgumentsComplainer method is necessary to satisfy the 'NotEnoughArgumentsComplainer' interface.
 // It exists to make this error type detectable in a Go type-switch.
-func (err *internalNotEnoughArgumentsComplainer) NotEnoughArgumentsComplainer() {
+func (err *internalNotEnoughArguments) NotEnoughArguments() {
 	// Nothing here.
 }
 
-
+func (err *internalNotEnoughArguments) ExpectedAtLeast() int {
-func (err *internalNotEnoughArgumentsComplainer) ExpectedAtLeast() int {
 	return err.expectedAtLeast
 }
 
-func (err *internalNotEnoughArgumentsComplainer) Actual() int {
+func (err *internalNotEnoughArguments) Actual() int {
 	return err.actual
 }

set.go

@@ -17,7 +17,7 @@ func set(value string, argsIndex int, args ...interface{}) error {
 		expectedAtLeast := 1+argsIndex
 		actual          := lenArgs
 
-		return newNotEnoughArgumentsComplainer(expectedAtLeast, actual)
+		return newNotEnoughArguments(expectedAtLeast, actual)
 	}
 
 	arg := args[argsIndex]

set_test.go

@@ -351,9 +351,9 @@ func TestSetFail(t *testing.T) {
 					t.Errorf("For test #%d, did indeed expect an error, but did not expect it to fit the \"InternalError\" interface, but actually did: %T.", testNumber, err)
 					continue
 				}
-			case NotEnoughArgumentsComplainer:
+			case NotEnoughArguments:
 				if expected, actual := notEnoughArguments, test.ExpectedFit; expected != actual {
-					t.Errorf("For test #%d, did indeed expect an error, but did not expect it to fit the \"NotEnoughArgumentsComplainer\" interface, but actually did: %T.", testNumber, err)
+					t.Errorf("For test #%d, did indeed expect an error, but did not expect it to fit the \"NotEnoughArguments\" interface, but actually did: %T.", testNumber, err)
 					continue
 				}
 			case UnsupportedArgumentType: