expr: clarify error message

* src/expr.c (eval4, eval3): Clarify that expr expects integers,
and not the broader category of numbers.
* tests/misc/expr: Update test accordingly.
Suggested by Dan Jacobson.

diff --git a/src/expr.c b/src/expr.c
index 048c59679239ef5ba6e60b83f4ec1c0c8d1ab363..1ebb4b9d96a09f3e3ac327e0b2247090fafeaa92 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -787,7 +787,7 @@ eval4 (bool evaluate)
       if (evaluate)
         {
           if (!toarith (l) || !toarith (r))
-            error (EXPR_INVALID, 0, _("non-numeric argument"));
+            error (EXPR_INVALID, 0, _("non-integer argument"));
           if (fxn != multiply && mpz_sgn (r->u.i) == 0)
             error (EXPR_INVALID, 0, _("division by zero"));
           ((fxn == multiply ? mpz_mul
@@ -824,7 +824,7 @@ eval3 (bool evaluate)
       if (evaluate)
         {
           if (!toarith (l) || !toarith (r))
-            error (EXPR_INVALID, 0, _("non-numeric argument"));
+            error (EXPR_INVALID, 0, _("non-integer argument"));
           (fxn == plus ? mpz_add : mpz_sub) (l->u.i, l->u.i, r->u.i);
         }
       freev (r);

diff --git a/tests/misc/expr b/tests/misc/expr
index 10dd1c5e55d459ef1040d20b0ede7ecd4e6b3556..6c4280f3108b945cca7c5c1ce4f4a3fb52363656 100755 (executable)
--- a/tests/misc/expr
+++ b/tests/misc/expr
@@ -70,7 +70,7 @@ my @Tests =
 
 
      # This erroneously succeeded and output `3' before 2.0.12.
-     ['fail-a', '3 + -', {ERR => "$prog: non-numeric argument\n"},
+     ['fail-a', '3 + -', {ERR => "$prog: non-integer argument\n"},
       {EXIT => 2}],
 
      # This erroneously succeeded before 5.3.1.