summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jim.c43
-rw-r--r--jim.h2
-rw-r--r--tests/misc.test28
3 files changed, 62 insertions, 11 deletions
diff --git a/jim.c b/jim.c
index 16b7d58..fa99c7c 100644
--- a/jim.c
+++ b/jim.c
@@ -3526,7 +3526,7 @@ int SetVariableFromAny(Jim_Interp *interp, struct Jim_Obj *objPtr)
/* -------------------- Variables related functions ------------------------- */
static int JimDictSugarSet(Jim_Interp *interp, Jim_Obj *ObjPtr, Jim_Obj *valObjPtr);
-static Jim_Obj *JimDictSugarGet(Jim_Interp *interp, Jim_Obj *ObjPtr);
+static Jim_Obj *JimDictSugarGet(Jim_Interp *interp, Jim_Obj *ObjPtr, int flags);
/* For now that's dummy. Variables lookup should be optimized
* in many ways, with caching of lookups, and possibly with
@@ -3689,7 +3689,13 @@ int Jim_SetVariableLink(Jim_Interp *interp, Jim_Obj *nameObjPtr,
/* Return the Jim_Obj pointer associated with a variable name,
* or NULL if the variable was not found in the current context.
* The same optimization discussed in the comment to the
- * 'SetVariable' function should apply here. */
+ * 'SetVariable' function should apply here.
+ *
+ * If JIM_UNSHARED is set and the variable is an array element (dict sugar)
+ * in a dictionary which is shared, the array variable value is duplicated first.
+ * This allows the array element to be updated (e.g. append, lappend) without
+ * affecting other references to the dictionary.
+ */
Jim_Obj *Jim_GetVariable(Jim_Interp *interp, Jim_Obj *nameObjPtr, int flags)
{
switch (SetVariableFromAny(interp, nameObjPtr)) {
@@ -3718,7 +3724,7 @@ Jim_Obj *Jim_GetVariable(Jim_Interp *interp, Jim_Obj *nameObjPtr, int flags)
case JIM_DICT_SUGAR:
/* [dict] syntax sugar. */
- return JimDictSugarGet(interp, nameObjPtr);
+ return JimDictSugarGet(interp, nameObjPtr, flags);
}
if (flags & JIM_ERRMSG) {
Jim_SetResultFormatted(interp, "can't read \"%#s\": no such variable", nameObjPtr);
@@ -3884,8 +3890,14 @@ static int JimDictSugarSet(Jim_Interp *interp, Jim_Obj *objPtr, Jim_Obj *valObjP
return err;
}
+/**
+ * Expands the array variable (dict sugar) and returns the result, or NULL on error.
+ *
+ * If JIM_UNSHARED is set and the dictionary is shared, it will be duplicated
+ * and stored back to the variable before expansion.
+ */
static Jim_Obj *JimDictExpandArrayVariable(Jim_Interp *interp, Jim_Obj *varObjPtr,
- Jim_Obj *keyObjPtr)
+ Jim_Obj *keyObjPtr, int flags)
{
Jim_Obj *dictObjPtr;
Jim_Obj *resObjPtr = NULL;
@@ -3908,19 +3920,28 @@ static Jim_Obj *JimDictExpandArrayVariable(Jim_Interp *interp, Jim_Obj *varObjPt
"can't read \"%#s(%#s)\": no such element in array", varObjPtr, keyObjPtr);
}
}
+ else if ((flags & JIM_UNSHARED) && Jim_IsShared(dictObjPtr)) {
+ dictObjPtr = Jim_DuplicateObj(interp, dictObjPtr);
+ if (Jim_SetVariable(interp, varObjPtr, dictObjPtr) != JIM_OK) {
+ /* This can probably never happen */
+ Jim_Panic(interp, "SetVariable failed for JIM_UNSHARED");
+ }
+ /* We know that the key exists. Get the result in the now-unshared dictionary */
+ Jim_DictKey(interp, dictObjPtr, keyObjPtr, &resObjPtr, JIM_NONE);
+ }
return resObjPtr;
}
/* Helper of Jim_GetVariable() to deal with dict-syntax variable names */
-static Jim_Obj *JimDictSugarGet(Jim_Interp *interp, Jim_Obj *objPtr)
+static Jim_Obj *JimDictSugarGet(Jim_Interp *interp, Jim_Obj *objPtr, int flags)
{
Jim_Obj *varObjPtr, *keyObjPtr, *resObjPtr;
JimDictSugarParseVarKey(interp, objPtr, &varObjPtr, &keyObjPtr);
- resObjPtr = JimDictExpandArrayVariable(interp, varObjPtr, keyObjPtr);
+ resObjPtr = JimDictExpandArrayVariable(interp, varObjPtr, keyObjPtr, flags);
Jim_DecrRefCount(interp, varObjPtr);
Jim_DecrRefCount(interp, keyObjPtr);
@@ -3995,7 +4016,7 @@ static Jim_Obj *Jim_ExpandDictSugar(Jim_Interp *interp, Jim_Obj *objPtr)
Jim_IncrRefCount(substKeyObjPtr);
resObjPtr =
JimDictExpandArrayVariable(interp, objPtr->internalRep.dictSubstValue.varNameObjPtr,
- substKeyObjPtr);
+ substKeyObjPtr, 0);
Jim_DecrRefCount(interp, substKeyObjPtr);
return resObjPtr;
@@ -5796,7 +5817,7 @@ int Jim_SetListIndex(Jim_Interp *interp, Jim_Obj *varNamePtr,
Jim_Obj *varObjPtr, *objPtr, *listObjPtr;
int shared, i, idx;
- varObjPtr = objPtr = Jim_GetVariable(interp, varNamePtr, JIM_ERRMSG);
+ varObjPtr = objPtr = Jim_GetVariable(interp, varNamePtr, JIM_ERRMSG | JIM_UNSHARED);
if (objPtr == NULL)
return JIM_ERR;
if ((shared = Jim_IsShared(objPtr)))
@@ -9086,7 +9107,7 @@ static int Jim_IncrCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *arg
if (Jim_GetWide(interp, argv[2], &increment) != JIM_OK)
return JIM_ERR;
}
- intObjPtr = Jim_GetVariable(interp, argv[1], JIM_NONE);
+ intObjPtr = Jim_GetVariable(interp, argv[1], JIM_UNSHARED);
if (!intObjPtr) {
/* Set missing variable to 0 */
wideValue = 0;
@@ -11284,7 +11305,7 @@ static int Jim_LappendCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *
Jim_WrongNumArgs(interp, 1, argv, "varName ?value value ...?");
return JIM_ERR;
}
- listObjPtr = Jim_GetVariable(interp, argv[1], JIM_NONE);
+ listObjPtr = Jim_GetVariable(interp, argv[1], JIM_UNSHARED);
if (!listObjPtr) {
/* Create the list if it does not exists */
listObjPtr = Jim_NewListObj(interp, NULL, 0);
@@ -11523,7 +11544,7 @@ static int Jim_AppendCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *a
return JIM_ERR;
}
else {
- stringObjPtr = Jim_GetVariable(interp, argv[1], JIM_NONE);
+ stringObjPtr = Jim_GetVariable(interp, argv[1], JIM_UNSHARED);
if (!stringObjPtr) {
/* Create the string if it does not exists */
stringObjPtr = Jim_NewEmptyStringObj(interp);
diff --git a/jim.h b/jim.h
index 320a200..0427bf4 100644
--- a/jim.h
+++ b/jim.h
@@ -147,6 +147,8 @@ extern "C" {
#define JIM_NONE 0 /* no flags set */
#define JIM_ERRMSG 1 /* set an error message in the interpreter. */
+#define JIM_UNSHARED 4 /* Flag to Jim_GetVariable() */
+
/* Flags for Jim_SubstObj() */
#define JIM_SUBST_NOVAR 1 /* don't perform variables substitutions */
#define JIM_SUBST_NOCMD 2 /* don't perform command substitutions */
diff --git a/tests/misc.test b/tests/misc.test
index f9a2de7..f259185 100644
--- a/tests/misc.test
+++ b/tests/misc.test
@@ -338,4 +338,32 @@ test parsevar-1.1 "Variables should include double colons" {
set x
} 2
+test sharing-1.1 "Problems with ref sharing in arrays: lappend" {
+ set a {a 1 c 2}
+ set b $a
+ lappend b(c) 3
+ set a(c)
+} 2
+
+test sharing-1.2 "Problems with ref sharing in arrays: append" {
+ set a {a 1 c 2}
+ set b $a
+ append b(c) 3
+ set a(c)
+} 2
+
+test sharing-1.3 "Problems with ref sharing in arrays: incr" {
+ set a {a 1 c 2}
+ set b $a
+ incr b(c)
+ set a(c)
+} 2
+
+test sharing-1.4 "Problems with ref sharing in arrays: lset" {
+ set a {a 1 c {2 3}}
+ set b $a
+ lset b(c) 1 x
+ set a(c)
+} {2 3}
+
testreport
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 11:44:53 +0000