interp: move oneIf under exitStatus

Author: mvdan

interp/api.go

@@ -189,6 +189,14 @@ type exitStatus struct {
 	err error
 }
 
+func (e *exitStatus) oneIf(b bool) {
+	if b {
+		e.code = 1
+	} else {
+		e.code = 0
+	}
+}
+
 func (e *exitStatus) fatal(err error) {
 	if !e.fatalExit && err != nil {
 		e.exiting = true

interp/builtin.go

@@ -38,13 +38,6 @@ func IsBuiltin(name string) bool {
 	return false
 }
 
-func oneIf(b bool) uint8 {
-	if b {
-		return 1
-	}
-	return 0
-}
-
 // TODO: atoi is duplicated in the expand package.
 
 // atoi is like [strconv.ParseInt](s, 10, 64), but it ignores errors and trims whitespace.
@@ -427,7 +420,7 @@ func (r *Runner) builtin(ctx context.Context, pos syntax.Pos, name string, args
 			exit.code = 2
 			return exit
 		}
-		exit.code = oneIf(r.bashTest(ctx, expr, true) == "")
+		exit.oneIf(r.bashTest(ctx, expr, true) == "")
 	case "exec":
 		// TODO: Consider unix.Exec, i.e. actually replacing
 		// the process. It's in theory what a shell should do,
@@ -667,7 +660,7 @@ func (r *Runner) builtin(ctx context.Context, pos syntax.Pos, name string, args
 			r.setVarString("OPTIND", strconv.FormatInt(int64(r.optState.argidx+1), 10))
 		}
 
-		exit.code = oneIf(done)
+		exit.oneIf(done)
 
 	case "shopt":
 		mode := ""

interp/runner.go

@@ -340,7 +340,7 @@ func (r *Runner) stmtSync(ctx context.Context, st *syntax.Stmt) {
 	}
 	if st.Negated {
 		// TODO: negate the entire [exitStatus] here, wiping errors
-		r.exit.code = oneIf(r.exit.code == 0)
+		r.exit.oneIf(r.exit.code == 0)
 	} else if b, ok := st.Cmd.(*syntax.BinaryCmd); ok && (b.Op == syntax.AndStmt || b.Op == syntax.OrStmt) {
 	} else if r.exit.code != 0 && !r.noErrExit {
 		r.trapCallback(ctx, r.callbackErr, "error")
@@ -611,7 +611,7 @@ func (r *Runner) cmd(ctx context.Context, cm syntax.Command) {
 	case *syntax.FuncDecl:
 		r.setFunc(cm.Name.Value, cm.Body)
 	case *syntax.ArithmCmd:
-		r.exit.code = oneIf(r.arithm(cm.X) == 0)
+		r.exit.oneIf(r.arithm(cm.X) == 0)
 	case *syntax.LetClause:
 		var val int
 		for _, expr := range cm.Exprs {
@@ -636,7 +636,7 @@ func (r *Runner) cmd(ctx context.Context, cm syntax.Command) {
 		}
 
 		trace.newLineFlush()
-		r.exit.code = oneIf(val == 0)
+		r.exit.oneIf(val == 0)
 	case *syntax.CaseClause:
 		trace.string("case ")
 		trace.expr(cm.Word)