Differences From Artifact [27fac85947]:

• File generic/tclOOBasic.c — part of check-in [ce47ead183] at 2017-12-26 12:27:14 on branch core-8-branch — TclOO: Remove unneeded name manipulation from TclOOCopyObjectCmd. (user: pooryorick size: 36066) [more...]

To Artifact [40878060f1]:

• File generic/tclOOBasic.c — part of check-in [701d26870f] at 2018-04-22 23:09:47 on branch bug-e87bcf819f — Candidate fix for [e87bcf819f]. Makes sure the unset of a scalar variable linked to an array element terminates searches on that array. In order to accomplish this, some deep revisions in Var handling were done and new routine "Var * TclArrayContaining(Var *varPtr)" was created to return the (Var *) of the array that contains the (Var *) varPtr argument when it is an array element. Callers must verify the argument. The only code that was unhappy with these deep revisions was the varname method of TclOO, but revising it to the new situation was not too difficult. Arguably the code is better now, if a bit uglier and fragile to further deep Var tinkering. Second party review would be a good idea, as well as opinions on whether a backport to 8.6.* is warranted to fix corresponding bugs in the array enumeration suite of commands. (user: dgp size: 35802)

724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758

    /*
     * Now that we've pinned down what variable we're really talking about
     * (including traversing variable links), convert back to a name.
     */

    varNamePtr = Tcl_NewObj();
    if (aryVar != NULL) {
	Tcl_HashEntry *hPtr;
	Tcl_HashSearch search;

	Tcl_GetVariableFullName(interp, (Tcl_Var) aryVar, varNamePtr);

	/*
	 * WARNING! This code pokes inside the implementation of hash tables!
	 */

	hPtr = Tcl_FirstHashEntry((Tcl_HashTable *) aryVar->value.tablePtr,
		&search);
	while (hPtr != NULL) {
	    if (varPtr == Tcl_GetHashValue(hPtr)) {
		Tcl_AppendToObj(varNamePtr, "(", -1);
		Tcl_AppendObjToObj(varNamePtr, hPtr->key.objPtr);
		Tcl_AppendToObj(varNamePtr, ")", -1);
		break;
	    }
	    hPtr = Tcl_NextHashEntry(&search);
	}
    } else {
	Tcl_GetVariableFullName(interp, (Tcl_Var) varPtr, varNamePtr);
    }
    Tcl_SetObjResult(interp, varNamePtr);
    return TCL_OK;
}


|
|
<



<
<
<
<
<
<
<
<
|
|
|
<
<
<
<

724
725
726
727
728
729
730
731
732

733
734
735








736
737
738




739
740
741
742
743
744
745

    /*
     * Now that we've pinned down what variable we're really talking about
     * (including traversing variable links), convert back to a name.
     */

    varNamePtr = Tcl_NewObj();
    if (TclIsVarArrayElement(varPtr)) {
	aryVar = TclArrayContaining(varPtr);


	Tcl_GetVariableFullName(interp, (Tcl_Var) aryVar, varNamePtr);









	Tcl_AppendToObj(varNamePtr, "(", -1);
	Tcl_AppendObjToObj(varNamePtr, ((VarInHash *)varPtr)->entry.key.objPtr);
	Tcl_AppendToObj(varNamePtr, ")", -1);




    } else {
	Tcl_GetVariableFullName(interp, (Tcl_Var) varPtr, varNamePtr);
    }
    Tcl_SetObjResult(interp, varNamePtr);
    return TCL_OK;
}