aboutsummaryrefslogtreecommitdiff
path: root/jim.c
diff options
context:
space:
mode:
authorSteve Bennett <steveb@workware.net.au>2023-02-24 12:59:56 +1000
committerSteve Bennett <steveb@workware.net.au>2023-02-24 13:02:31 +1000
commit7eb6fdddafb7ee98afd8dc170a23bfbb32708994 (patch)
tree9cfdb2dc8baffea9d0c58286b06be4c3c550f62d /jim.c
parent23603d8c3d482a9f92a949c9da1c71a0c8e68343 (diff)
downloadjimtcl-7eb6fdddafb7ee98afd8dc170a23bfbb32708994.zip
jimtcl-7eb6fdddafb7ee98afd8dc170a23bfbb32708994.tar.gz
jimtcl-7eb6fdddafb7ee98afd8dc170a23bfbb32708994.tar.bz2
dict with: return script result
Previously dict with returned the new dict value. Also fix an issue in the case where a dict element mirrors the name of the dictionary. Fixes: #241 Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'jim.c')
-rw-r--r--jim.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/jim.c b/jim.c
index ac78fda..772435e 100644
--- a/jim.c
+++ b/jim.c
@@ -7863,6 +7863,8 @@ int Jim_DictKeysVector(Jim_Interp *interp, Jim_Obj *dictPtr,
*
* If flags & JIM_ERRMSG, then failure to remove the key is considered an error
* and JIM_ERR is returned. Otherwise it is ignored and JIM_OK is returned.
+ *
+ * Normally the result is stored in the interp result. If JIM_NORESULT is set, this is not done.
*/
int Jim_SetDictKeysVector(Jim_Interp *interp, Jim_Obj *varNamePtr,
Jim_Obj *const *keyv, int keyc, Jim_Obj *newObjPtr, int flags)
@@ -7932,7 +7934,10 @@ int Jim_SetDictKeysVector(Jim_Interp *interp, Jim_Obj *varNamePtr,
if (Jim_SetVariable(interp, varNamePtr, varObjPtr) != JIM_OK) {
goto err;
}
- Jim_SetResult(interp, varObjPtr);
+
+ if (!(flags & JIM_NORESULT)) {
+ Jim_SetResult(interp, varObjPtr);
+ }
return JIM_OK;
err:
if (shared) {
@@ -15270,10 +15275,13 @@ static int JimDictWith(Jim_Interp *interp, Jim_Obj *dictVarName, Jim_Obj *const
}
for (i = 0; i < len; i += 2) {
- /* This will be NULL if the variable no longer exists, thus deleting the variable */
- objPtr = Jim_GetVariable(interp, dictValues[i], 0);
- newkeyv[keyc] = dictValues[i];
- Jim_SetDictKeysVector(interp, dictVarName, newkeyv, keyc + 1, objPtr, 0);
+ /* If the an element mirrors the dictionary name, skip it to avoid creating a recursive data structure */
+ if (Jim_StringCompareObj(interp, dictVarName, dictValues[i], 0) != 0) {
+ /* This will be NULL if the variable no longer exists, thus deleting the variable */
+ objPtr = Jim_GetVariable(interp, dictValues[i], 0);
+ newkeyv[keyc] = dictValues[i];
+ Jim_SetDictKeysVector(interp, dictVarName, newkeyv, keyc + 1, objPtr, JIM_NORESULT);
+ }
}
Jim_Free(newkeyv);
}