update: changed collectArgs to no return

sttk · Mar 17, 2024 · 178e4f1 · 178e4f1
1 parent 842c4c5
commit 178e4f1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 28 deletions.
diff --git a/parse-with.go b/parse-with.go
@@ -194,7 +194,7 @@ func ParseWith(osArgs []string, optCfgs []OptCfg) (Cmd, error) {
 		}
 	}
 
-	var takeArg = func(opt string) bool {
+	var takeArgs = func(opt string) bool {
 		i, exists := cfgMap[opt]
 		if exists {
 			return optCfgs[i].HasArg
@@ -205,11 +205,10 @@ func ParseWith(osArgs []string, optCfgs []OptCfg) (Cmd, error) {
 	var args = make([]string, 0)
 	var opts = make(map[string][]string)
 
-	var collectArg = func(a ...string) error {
+	var collectArgs = func(a ...string) {
 		args = append(args, a...)
-		return nil
 	}
-	var collectOpt = func(name string, a ...string) error {
+	var collectOpts = func(name string, a ...string) error {
 		i, exists := cfgMap[name]
 		if !exists {
 			if !hasAnyOpt {
@@ -256,7 +255,7 @@ func ParseWith(osArgs []string, optCfgs []OptCfg) (Cmd, error) {
 		osArgs1 = osArgs[1:]
 	}
 
-	err := parseArgs(osArgs1, collectArg, collectOpt, takeArg)
+	err := parseArgs(osArgs1, collectArgs, collectOpts, takeArgs)
 
 	for _, cfg := range optCfgs {
 		arr, exists := opts[cfg.Name]

diff --git a/parse.go b/parse.go
@@ -120,9 +120,8 @@ func Parse() (Cmd, error) {
 	var args = make([]string, 0)
 	var opts = make(map[string][]string)
 
-	var collectArgs = func(a ...string) error {
+	var collectArgs = func(a ...string) {
 		args = append(args, a...)
-		return nil
 	}
 	var collectOpts = func(name string, a ...string) error {
 		arr, exists := opts[name]
@@ -154,7 +153,7 @@ func _false(_ string) bool {
 
 func parseArgs(
 	osArgs []string,
-	collectArgs func(...string) error,
+	collectArgs func(...string),
 	collectOpts func(string, ...string) error,
 	takeArgs func(string) bool,
 ) error {
@@ -166,13 +165,7 @@ func parseArgs(
 L0:
 	for iArg, arg := range osArgs {
 		if isNonOpt {
-			err := collectArgs(arg)
-			if err != nil {
-				if firstErr == nil {
-					firstErr = err
-				}
-				continue L0
-			}
+			collectArgs(arg)
 
 		} else if len(prevOptTakingArgs) > 0 {
 			err := collectOpts(prevOptTakingArgs, arg)
@@ -237,12 +230,7 @@ L0:
 
 		} else if strings.HasPrefix(arg, "-") {
 			if len(arg) == 1 {
-				err := collectArgs(arg)
-				if err != nil {
-					if firstErr == nil {
-						firstErr = err
-					}
-				}
+				collectArgs(arg)
 				continue L0
 			}
 
@@ -297,13 +285,7 @@ L0:
 			}
 
 		} else {
-			err := collectArgs(arg)
-			if err != nil {
-				if firstErr == nil {
-					firstErr = err
-				}
-				continue L0
-			}
+			collectArgs(arg)
 		}
 	}