From b0bd14035d1e2747ff98c46ca8715aab4f9533ea Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Wed, 21 Apr 2021 21:59:45 +0000
Subject: 48606 + 48607 + unposted test: zmathfunc: Force arguments to be
 numbers and catch errors.

---
 Functions/Math/zmathfunc | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'Functions')

diff --git a/Functions/Math/zmathfunc b/Functions/Math/zmathfunc
index 8e4b78549..12d2c2f3d 100644
--- a/Functions/Math/zmathfunc
+++ b/Functions/Math/zmathfunc
@@ -6,7 +6,12 @@ zsh_math_func_min() {
   shift
   local arg
   for arg ; do
-    (( $arg < result )) && result=$arg
+    (( arg < result ))
+    case $? in
+      (0) (( result = arg ));;
+      (1) ;;
+      (*) return $?;;
+    esac
   done
   (( result ))
   true # Careful here: `return 0` evaluates an arithmetic expression
@@ -19,7 +24,12 @@ zsh_math_func_max() {
   shift
   local arg
   for arg ; do
-    (( $arg > result )) && result=$arg
+    (( arg > result ))
+    case $? in
+      (0) (( result = arg ));;
+      (1) ;;
+      (*) return $?;;
+    esac
   done
   (( result ))
   true # Careful here: `return 0` evaluates an arithmetic expression
@@ -31,7 +41,7 @@ zsh_math_func_sum() {
   local sum
   local arg
   for arg ; do
-    (( sum += $arg ))
+    (( sum += arg ))
   done
   (( sum ))
   true # Careful here: `return 0` evaluates an arithmetic expression
-- 
cgit 1.4.1