From 753c179edb42d38628d69ccfc01f19e065d16eae Mon Sep 17 00:00:00 2001
From: Evan Fiordeliso <evan.fiordeliso@gmail.com>
Date: Sun, 12 Nov 2023 17:07:38 -0500
Subject: [PATCH] Rename TakesArg to RequiresVal

---
 opts/bool.go   | 4 ++--
 opts/float.go  | 4 ++--
 opts/int.go    | 4 ++--
 opts/option.go | 2 +-
 opts/parser.go | 6 +++---
 opts/string.go | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/opts/bool.go b/opts/bool.go
index 5f5fd34..2674109 100644
--- a/opts/bool.go
+++ b/opts/bool.go
@@ -54,8 +54,8 @@ func (o *BoolOption) Parse(raw string) error {
 	return nil
 }
 
-// TakesArg implements Option.
-func (*BoolOption) TakesArg() bool {
+// RequiresVal implements Option.
+func (*BoolOption) RequiresVal() bool {
 	return false
 }
 
diff --git a/opts/float.go b/opts/float.go
index bdc7617..309cd2d 100644
--- a/opts/float.go
+++ b/opts/float.go
@@ -51,8 +51,8 @@ func (o *FloatOption) Parse(raw string) error {
 	return nil
 }
 
-// TakesArg implements Option.
-func (*FloatOption) TakesArg() bool {
+// RequiresVal implements Option.
+func (*FloatOption) RequiresVal() bool {
 	return true
 }
 
diff --git a/opts/int.go b/opts/int.go
index 63341cb..d8860f6 100644
--- a/opts/int.go
+++ b/opts/int.go
@@ -51,8 +51,8 @@ func (o *IntOption) Parse(raw string) error {
 	return nil
 }
 
-// TakesArg implements Option.
-func (*IntOption) TakesArg() bool {
+// RequiresVal implements Option.
+func (*IntOption) RequiresVal() bool {
 	return true
 }
 
diff --git a/opts/option.go b/opts/option.go
index 44280f3..9cda97f 100644
--- a/opts/option.go
+++ b/opts/option.go
@@ -7,7 +7,7 @@ type Option interface {
 	ShortName() string
 	Description() string
 	Parse(raw string) error
-	TakesArg() bool
+	RequiresVal() bool
 }
 
 func Names(o Option) string {
diff --git a/opts/parser.go b/opts/parser.go
index d9b35ba..88f788e 100644
--- a/opts/parser.go
+++ b/opts/parser.go
@@ -109,7 +109,7 @@ func (p *Parser) parseLongOption(longName string) error {
 		return nil // Ignore unknown option. Continue parsing.
 	}
 
-	if value == "" && opt.TakesArg() {
+	if value == "" && opt.RequiresVal() {
 		var ok bool
 		value, ok = p.value()
 		if !ok {
@@ -137,7 +137,7 @@ func (p *Parser) parseShortOption(shortNames string) error {
 			return nil // Ignore unknown option. Continue parsing.
 		}
 
-		if !valOk && opt.TakesArg() {
+		if !valOk && opt.RequiresVal() {
 			return fmt.Errorf("%w: %s", ErrOptionRequiresValue, "-"+shortNames)
 		}
 
@@ -158,7 +158,7 @@ func (p *Parser) parseShortOption(shortNames string) error {
 				continue // Ignore unknown option. Continue parsing.
 			}
 
-			if opt.TakesArg() {
+			if opt.RequiresVal() {
 				if j > 0 {
 					return fmt.Errorf("%w: %s", ErrCannotChainOption, "-"+string(shortName))
 				}
diff --git a/opts/string.go b/opts/string.go
index cabecff..7b436f7 100644
--- a/opts/string.go
+++ b/opts/string.go
@@ -43,8 +43,8 @@ func (o *StringOption) Parse(raw string) error {
 	return nil
 }
 
-// TakesArg implements Option.
-func (*StringOption) TakesArg() bool {
+// RequiresVal implements Option.
+func (*StringOption) RequiresVal() bool {
 	return true
 }