Tcl8.6 compatible error messages

These will help with error messages from [apply]

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

2 files changed, 5 insertions, 8 deletions

diff --git a/jim.c b/jim.c
index 50918bf..d5e04af 100644
--- a/jim.c
+++ b/jim.c
@@ -3802,13 +3802,13 @@ static int JimCreateProcedure(Jim_Interp *interp, Jim_Obj *cmdNameObj,
         Jim_ListIndex(interp, argListObjPtr, i, &argPtr, JIM_NONE);
         len = Jim_ListLength(interp, argPtr);
         if (len == 0) {
-            Jim_SetResultString(interp, "procedure has argument with no name", -1);
+            Jim_SetResultString(interp, "argument with no name", -1);
 err:
             JimDecrCmdRefCount(interp, cmdPtr);
             return JIM_ERR;
         }
         if (len > 2) {
-            Jim_SetResultString(interp, "procedure has argument with too many fields", -1);
+            Jim_SetResultFormatted(interp, "too many fields in argument specifier \"%#s\"", argPtr);
             goto err;
         }
 
@@ -3826,7 +3826,7 @@ err:
 
         if (Jim_CompareStringImmediate(interp, nameObjPtr, "args")) {
             if (cmdPtr->u.proc.argsPos >= 0) {
-                Jim_SetResultString(interp, "procedure has 'args' specified more than once", -1);
+                Jim_SetResultString(interp, "'args' specified more than once", -1);
                 goto err;
             }
             cmdPtr->u.proc.argsPos = i;
diff --git a/tests/proc.test b/tests/proc.test
index 00f3ea9..50c9674 100644
--- a/tests/proc.test
+++ b/tests/proc.test
@@ -248,15 +248,12 @@ test proc-old-5.3 {error conditions} {
 
 
 
-test proc-old-5.5 {error conditions} {
-    list [catch {proc tproc {{} y} {return foo}} msg] $msg
-} {1 {procedure has argument with no name}}
 test proc-old-5.6 {error conditions} {
     list [catch {proc tproc {{} y} {return foo}} msg] $msg
-} {1 {procedure has argument with no name}}
+} {1 {argument with no name}}
 test proc-old-5.7 {error conditions} {
     list [catch {proc tproc {{x 1 2} y} {return foo}} msg] $msg
-} {1 {procedure has argument with too many fields}}
+} {1 {too many fields in argument specifier "x 1 2"}}
 test proc-old-5.8 {error conditions} {
     catch {return}
 } 2