expr: TIP 526, only support a single arg

Avoid unexpected issues by concatenating multiple arguments.
This does create an incompatibility with early versions, but
it is generally trivial to convert existing code to one of two forms:

1. expr {$a + $b}    -- usually correct
2. expr "$a + $b"    -- usually incorrect

Signed-off-by: Steve Bennett <steveb@workware.net.au>

1 files changed, 3 insertions, 18 deletions

diff --git a/jim.c b/jim.c
index f893a01..f749500 100644
--- a/jim.c
+++ b/jim.c
@@ -13590,26 +13590,11 @@ static int Jim_UplevelCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *
 /* [expr] */
 static int Jim_ExprCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
-    int retcode;
-
     if (argc == 2) {
-        retcode = Jim_EvalExpression(interp, argv[1]);
-    }
-    else if (argc > 2) {
-        Jim_Obj *objPtr;
-
-        objPtr = Jim_ConcatObj(interp, argc - 1, argv + 1);
-        Jim_IncrRefCount(objPtr);
-        retcode = Jim_EvalExpression(interp, objPtr);
-        Jim_DecrRefCount(interp, objPtr);
+        return Jim_EvalExpression(interp, argv[1]);
     }
-    else {
-        Jim_WrongNumArgs(interp, 1, argv, "expression ?...?");
-        return JIM_ERR;
-    }
-    if (retcode != JIM_OK)
-        return retcode;
-    return JIM_OK;
+    Jim_WrongNumArgs(interp, 1, argv, "expression");
+    return JIM_ERR;
 }
 
 /* [break] */