Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch dkf/clean-up-var-impl Excluding Merge-Ins
This is equivalent to a diff from 9a5248b829 to a73467bf64
|
2024-09-07
| ||
| 23:01 | Update to TZDATA 2024b check-in: b1d5440647 user: jan.nijtmans tags: trunk, main | |
|
2024-09-05
| ||
| 13:30 | Some identification of possible refactorings in tclVar.c Leaf check-in: a73467bf64 user: dkf tags: dkf/clean-up-var-impl | |
|
2024-09-03
| ||
| 16:47 | merge trunk check-in: b68b00d45a user: dgp tags: core-9-0-0-rc | |
|
2024-09-02
| ||
| 11:23 | Merge-mark check-in: 9a5248b829 user: jan.nijtmans tags: trunk, main | |
| 11:22 | cherrypicked typos, errors and clarifications from the documentation-cleanup-for-transition branch (... check-in: a4f139837d user: jan.nijtmans tags: core-8-branch | |
| 11:00 | cherrypicked typos, errors and clarifications from the documentation-cleanup-for-transition branch (... check-in: 2496f1377a user: Torsten tags: trunk, main | |
Changes to generic/tclVar.c.
| ︙ | ︙ | |||
41 42 43 44 45 46 47 | Tcl_Obj *key, int *newPtr); static inline Var * VarHashFirstVar(TclVarHashTable *tablePtr, Tcl_HashSearch *searchPtr); static inline Var * VarHashNextVar(Tcl_HashSearch *searchPtr); static inline void CleanupVar(Var *varPtr, Var *arrayPtr); #define VarHashGetValue(hPtr) \ | | | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 |
Tcl_Obj *key, int *newPtr);
static inline Var * VarHashFirstVar(TclVarHashTable *tablePtr,
Tcl_HashSearch *searchPtr);
static inline Var * VarHashNextVar(Tcl_HashSearch *searchPtr);
static inline void CleanupVar(Var *varPtr, Var *arrayPtr);
#define VarHashGetValue(hPtr) \
((Var *) ((char *) (hPtr) - offsetof(VarInHash, entry)))
/*
* NOTE: VarHashCreateVar increments the recount of its key argument.
* All callers that will call Tcl_DecrRefCount on that argument must
* call Tcl_IncrRefCount on it before passing it in. This requirement
* can bubble up to callers of callers .... etc.
*/
|
| ︙ | ︙ | |||
134 135 136 137 138 139 140 141 142 143 144 145 146 147 |
/*
* A test to see if we are in a call frame that has local variables. This is
* true if we are inside a procedure body.
*/
#define HasLocalVars(framePtr) ((framePtr)->isProcCallFrame & FRAME_IS_PROC)
/*
* The following structure describes an enumerative search in progress on an
* array variable; this are invoked with options to the "array" command.
*/
typedef struct ArraySearch {
Tcl_Obj *name; /* Name of this search */
| > > > > > | 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 |
/*
* A test to see if we are in a call frame that has local variables. This is
* true if we are inside a procedure body.
*/
#define HasLocalVars(framePtr) ((framePtr)->isProcCallFrame & FRAME_IS_PROC)
/*
* Marker that a variable is not known to be in a local variable table.
*/
#define NOT_IN_LVT (-1)
/*
* The following structure describes an enumerative search in progress on an
* array variable; this are invoked with options to the "array" command.
*/
typedef struct ArraySearch {
Tcl_Obj *name; /* Name of this search */
|
| ︙ | ︙ | |||
167 168 169 170 171 172 173 |
* TIP #508: [array default]
*
* The following structure extends the regular TclVarHashTable used by array
* variables to store their optional default value.
*/
typedef struct ArrayVarHashTable {
| | | > > | < | | 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 |
* TIP #508: [array default]
*
* The following structure extends the regular TclVarHashTable used by array
* variables to store their optional default value.
*/
typedef struct ArrayVarHashTable {
TclVarHashTable table; /* The base hash table. */
Tcl_Obj *defaultObj; /* The default value, if one is present. If
* set, has TWO reference counts to ensure no
* accidental mutation. */
} ArrayVarHashTable;
/*
* Forward references to functions defined later in this file:
*/
static void AppendLocals(Tcl_Interp *interp, Tcl_Obj *listPtr,
Tcl_Obj *patternPtr, int flags);
static void ArrayPopulateSearch(Tcl_Interp *interp,
Tcl_Obj *arrayNameObj, Var *varPtr,
ArraySearch *searchPtr);
static void ArrayDoneSearch(Interp *iPtr, Var *varPtr,
ArraySearch *searchPtr);
static Tcl_NRPostProc ArrayForLoopCallback;
static Tcl_ObjCmdProc ArrayForNRCmd;
static void DeleteSearches(Interp *iPtr, Var *arrayVarPtr);
static void DeleteArray(Interp *iPtr, Tcl_Obj *arrayNamePtr,
Var *varPtr, int flags, int index);
static int LocateArray(Tcl_Interp *interp, Tcl_Obj *name,
Var **varPtrPtr, int *isArrayPtr);
static int NotArrayError(Tcl_Interp *interp, Tcl_Obj *name);
|
| ︙ | ︙ | |||
227 228 229 230 231 232 233 234 235 236 237 | static Tcl_DupInternalRepProc DupLocalVarName; static Tcl_FreeInternalRepProc FreeLocalVarName; static Tcl_FreeInternalRepProc FreeParsedVarName; static Tcl_DupInternalRepProc DupParsedVarName; /* * Types of Tcl_Objs used to cache variable lookups. * * localVarName - INTERNALREP DEFINITION: | > > > > > > > > > > > > > > > > > > > > > > > | | | > | < > > > > | > | | > | | | < | > | | | | | > | < > > > > > > > | > | < | > > | > | | | < | > | | | | | > > > > > > > > > > | | < | < < < | > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 |
static Tcl_DupInternalRepProc DupLocalVarName;
static Tcl_FreeInternalRepProc FreeLocalVarName;
static Tcl_FreeInternalRepProc FreeParsedVarName;
static Tcl_DupInternalRepProc DupParsedVarName;
/*
* Values fed out of TclLookupSimpleVar by the indexPtr argument when not set
* to a local variable table index (all valid LVT indices are >= 0).
*/
enum LookupSimpleVarBadIndices {
GLOBAL_REFERENCE = -1, /* Variable was in the global namespace. */
NAMESPACE_REFERENCE = -2, /* Variable was in a non-global NS. */
UNKNOWN_REFERENCE = -3 /* Variable was of unknown provenance; do not
* cache! Typically means that a resolver is
* doing something complicated. */
};
/* Flags to AppendLocals(), used to select what to describe. */
enum AppendLocalsFlags {
INCLUDE_LINKS = 1 << 0, /* Whether upvars should be included. */
CONSTANTS_ONLY = 1 << 1 /* Whether just constants should be included. */
};
enum MiscFlagCombinations {
SCOPES = TCL_GLOBAL_ONLY | TCL_NAMESPACE_ONLY,
SET_MODIFIERS = TCL_APPEND_VALUE | TCL_LIST_ELEMENT
};
/*
* Types of Tcl_Objs used to cache variable lookups.
*
* localVarName - INTERNALREP DEFINITION:
* twoPtrValue.ptr1: pointer to name obj in varFramePtr->localCache
* or NULL if it is this same obj
* twoPtrValue.ptr2: index into locals table
*
* parsedVarName - INTERNALREP DEFINITION:
* twoPtrValue.ptr1: pointer to the array name Tcl_Obj, or NULL if it is a
* scalar variable
* twoPtrValue.ptr2: pointer to the element name string (owned by this
* Tcl_Obj), or NULL if it is a scalar variable
*/
static const Tcl_ObjType localVarNameType = {
"localVarName",
FreeLocalVarName, DupLocalVarName, NULL, NULL,
TCL_OBJTYPE_V0
};
static inline void
LocalSetInternalRep(
Tcl_Obj *objPtr, /* Object to set the rep of. */
Tcl_Size index, /* LVT index. >= 0 */
Tcl_Obj *namePtr) /* Pointer into name table if not objPtr. */
{
Tcl_ObjInternalRep ir;
if (namePtr) {
Tcl_IncrRefCount(namePtr);
}
ir.twoPtrValue.ptr1 = namePtr;
ir.twoPtrValue.ptr2 = INT2PTR(index);
Tcl_StoreInternalRep(objPtr, &localVarNameType, &ir);
}
#define LocalGetInternalRep(objPtr, index, name) \
do { \
const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep( \
(objPtr), &localVarNameType); \
(name) = irPtr ? (Tcl_Obj *) irPtr->twoPtrValue.ptr1 : NULL; \
(index) = irPtr ? PTR2INT(irPtr->twoPtrValue.ptr2) : NOT_IN_LVT;\
} while (0)
static const Tcl_ObjType parsedVarNameType = {
"parsedVarName",
FreeParsedVarName, DupParsedVarName, NULL, NULL,
TCL_OBJTYPE_V0
};
static inline void
ParsedSetInternalRep(
Tcl_Obj *objPtr, /* Object to set the rep of. */
Tcl_Obj *arrayPtr, /* The array name Tcl_Obj, or NULL if it is a
* scalar variable. */
Tcl_Obj *elem) /* pointer to the element name string (will be
* owned by objPtr), or NULL if it is a scalar
* variable. */
{
Tcl_ObjInternalRep ir;
if (arrayPtr) {
Tcl_IncrRefCount(arrayPtr);
}
if (elem) {
Tcl_IncrRefCount(elem);
}
ir.twoPtrValue.ptr1 = arrayPtr;
ir.twoPtrValue.ptr2 = elem;
Tcl_StoreInternalRep(objPtr, &parsedVarNameType, &ir);
}
#define ParsedGetInternalRep(objPtr, parsed, array, elem) \
do { \
const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep( \
(objPtr), &parsedVarNameType); \
(parsed) = (irPtr != NULL); \
(array) = irPtr ? (Tcl_Obj *) irPtr->twoPtrValue.ptr1 : NULL; \
(elem) = irPtr ? (Tcl_Obj *) irPtr->twoPtrValue.ptr2 : NULL; \
} while (0)
/*
* Simple rules for when a pattern is simple enough to not need a table scan,
* or when a scanned entry matches the pattern.
*/
#define TrivialPattern(pattern) \
((pattern) && TclMatchIsTrivial(pattern))
#define PatternMatch(pattern, nameObj) \
(!(pattern) || Tcl_StringMatch(TclGetString(nameObj), (pattern)))
Var *
TclVarHashCreateVar(
TclVarHashTable *tablePtr,
const char *key,
int *newPtr)
{
Tcl_Obj *keyPtr = Tcl_NewStringObj(key, TCL_AUTO_LENGTH);
Var *varPtr = VarHashCreateVar(tablePtr, keyPtr, newPtr);
Tcl_BounceRefCount(keyPtr);
return varPtr;
}
static int
LocateArray(
Tcl_Interp *interp,
Tcl_Obj *name,
Var **varPtrPtr,
int *isArrayPtr)
{
Var *arrayPtr, *varPtr = TclObjLookupVarEx(interp, name, NULL, /*flags*/ 0,
/*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
if (TclCheckArrayTraces(interp, varPtr, arrayPtr, name,
NOT_IN_LVT) == TCL_ERROR) {
return TCL_ERROR;
}
if (varPtrPtr) {
*varPtrPtr = varPtr;
}
if (isArrayPtr) {
*isArrayPtr = (varPtr != NULL)
&& !TclIsVarUndefined(varPtr)
&& TclIsVarArray(varPtr);
}
return TCL_OK;
}
static int
NotArrayError(
Tcl_Interp *interp,
Tcl_Obj *name)
{
const char *nameStr = TclGetString(name);
Tcl_SetObjResult(interp,
Tcl_ObjPrintf("\"%s\" isn't an array", nameStr));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAY", nameStr, (char *)NULL);
return TCL_ERROR;
}
/*
*----------------------------------------------------------------------
*
* AsObj --
*
* Convenience function that converts a string to a zero-ref Tcl_Obj, but
* accepts a NULL and leaves that as a NULL (useful for part2 arguments).
*
*----------------------------------------------------------------------
*/
static inline Tcl_Obj *
AsObj(
const char *str) /* NUL-terminated string or NULL. */
{
return str ? Tcl_NewStringObj(str, TCL_AUTO_LENGTH) : NULL;
}
/*
*----------------------------------------------------------------------
*
* AsStr --
*
* Convenience function that converts a Tcl_Obj to a string, but accepts
* a NULL and leaves that as a NULL.
*
*----------------------------------------------------------------------
*/
static inline const char *
AsStr(
Tcl_Obj *objPtr) /* Object or NULL. */
{
return objPtr ? TclGetString(objPtr) : NULL;
}
/*
*----------------------------------------------------------------------
*
* TclCleanupVar --
*
* This function is called when it looks like it may be OK to free up a
|
| ︙ | ︙ | |||
375 376 377 378 379 380 381 382 |
static inline void
CleanupVar(
Var *varPtr, /* Pointer to variable that may be a candidate
* for being expunged. */
Var *arrayPtr) /* Array that contains the variable, or NULL
* if this variable isn't an array element. */
{
if (TclIsVarUndefined(varPtr) && TclIsVarInHash(varPtr)
| > > | < < | | < < | 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 |
static inline void
CleanupVar(
Var *varPtr, /* Pointer to variable that may be a candidate
* for being expunged. */
Var *arrayPtr) /* Array that contains the variable, or NULL
* if this variable isn't an array element. */
{
#define READY_TO_CLEAN(varPtr) \
(VarHashRefCount(varPtr) == (Tcl_Size) !TclIsVarDeadHash(varPtr))
if (TclIsVarUndefined(varPtr) && TclIsVarInHash(varPtr)
&& !TclIsVarTraced(varPtr) && READY_TO_CLEAN(varPtr)) {
if (VarHashRefCount(varPtr) == 0) {
Tcl_Free(varPtr);
} else {
VarHashDeleteEntry(varPtr);
}
}
if (arrayPtr && TclIsVarUndefined(arrayPtr) && TclIsVarInHash(arrayPtr)
&& !TclIsVarTraced(arrayPtr) && READY_TO_CLEAN(arrayPtr)) {
if (VarHashRefCount(arrayPtr) == 0) {
Tcl_Free(arrayPtr);
} else {
VarHashDeleteEntry(arrayPtr);
}
}
}
|
| ︙ | ︙ | |||
469 470 471 472 473 474 475 |
* name, if it doesn't already exist. If 0,
* return error if it doesn't exist. */
Var **arrayPtrPtr) /* If the name refers to an element of an
* array, *arrayPtrPtr gets filled in with
* address of array variable. Otherwise this
* is set to NULL. */
{
| < | < < < < < | | | 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 |
* name, if it doesn't already exist. If 0,
* return error if it doesn't exist. */
Var **arrayPtrPtr) /* If the name refers to an element of an
* array, *arrayPtrPtr gets filled in with
* address of array variable. Otherwise this
* is set to NULL. */
{
Tcl_Obj *part1Ptr = Tcl_NewStringObj(part1, TCL_AUTO_LENGTH);
Var *varPtr = TclObjLookupVar(interp, part1Ptr, part2, flags, msg,
createPart1, createPart2, arrayPtrPtr);
Tcl_BounceRefCount(part1Ptr);
return varPtr;
}
/*
*----------------------------------------------------------------------
*
* TclObjLookupVar, TclObjLookupVarEx --
|
| ︙ | ︙ | |||
548 549 550 551 552 553 554 |
* name, if it doesn't already exist. If 0,
* return error if it doesn't exist. */
Var **arrayPtrPtr) /* If the name refers to an element of an
* array, *arrayPtrPtr gets filled in with
* address of array variable. Otherwise this
* is set to NULL. */
{
| | < < < < < < < < < | < | < < | 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 |
* name, if it doesn't already exist. If 0,
* return error if it doesn't exist. */
Var **arrayPtrPtr) /* If the name refers to an element of an
* array, *arrayPtrPtr gets filled in with
* address of array variable. Otherwise this
* is set to NULL. */
{
Tcl_Obj *part2Ptr = AsObj(part2);
Var *resPtr = TclObjLookupVarEx(interp, part1Ptr, part2Ptr,
flags, msg, createPart1, createPart2, arrayPtrPtr);
Tcl_BounceRefCount(part2Ptr);
return resPtr;
}
/*
* When createPart1 is 1, callers must IncrRefCount part1Ptr if they
* plan to DecrRefCount it.
* When createPart2 is 1, callers must IncrRefCount part2Ptr if they
|
| ︙ | ︙ | |||
600 601 602 603 604 605 606 |
Var **arrayPtrPtr) /* If the name refers to an element of an
* array, *arrayPtrPtr gets filled in with
* address of array variable. Otherwise this
* is set to NULL. */
{
Interp *iPtr = (Interp *) interp;
CallFrame *varFramePtr = iPtr->varFramePtr;
| | < | | | | | | | | | | | | | | | | | | | | 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 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 |
Var **arrayPtrPtr) /* If the name refers to an element of an
* array, *arrayPtrPtr gets filled in with
* address of array variable. Otherwise this
* is set to NULL. */
{
Interp *iPtr = (Interp *) interp;
CallFrame *varFramePtr = iPtr->varFramePtr;
Var *varPtr; /* Points to the variable's in-frame Var
* structure. */
const char *errMsg = NULL;
int index, parsed = 0;
Tcl_Size localIndex;
Tcl_Obj *namePtr, *arrayPtr, *elem;
*arrayPtrPtr = NULL;
restart:
LocalGetInternalRep(part1Ptr, localIndex, namePtr);
if (localIndex >= 0) {
if (HasLocalVars(varFramePtr)
&& !(flags & SCOPES)
&& (localIndex < varFramePtr->numCompiledLocals)) {
/*
* Use the cached index if the names coincide.
*/
Tcl_Obj *checkNamePtr = localName(varFramePtr, localIndex);
if ((!namePtr && (checkNamePtr == part1Ptr)) ||
(namePtr && (checkNamePtr == namePtr))) {
varPtr = &varFramePtr->compiledLocals[localIndex];
goto donePart1;
}
}
goto doneParsing;
}
/*
* If part1Ptr is a parsedVarNameType, retrieve the preparsed parts.
*/
ParsedGetInternalRep(part1Ptr, parsed, arrayPtr, elem);
if (parsed && arrayPtr) {
if (part2Ptr) {
/*
* ERROR: part1Ptr is already an array element, cannot specify
* a part2.
*/
if (flags & TCL_LEAVE_ERR_MSG) {
TclObjVarErrMsg(interp, part1Ptr, part2Ptr, msg,
NOSUCHVAR, NOT_IN_LVT);
Tcl_SetErrorCode(interp, "TCL", "VALUE", "VARNAME", (char *)NULL);
}
return NULL;
}
part2Ptr = elem;
part1Ptr = arrayPtr;
goto restart;
}
if (!parsed) {
/*
* part1Ptr is possibly an unparsed array element.
*/
Tcl_Size len;
const char *part1 = TclGetStringFromObj(part1Ptr, &len);
if ((len > 1) && (part1[len - 1] == ')')) {
const char *part2 = strchr(part1, '(');
if (part2) {
if (part2Ptr) {
if (flags & TCL_LEAVE_ERR_MSG) {
TclObjVarErrMsg(interp, part1Ptr, part2Ptr, msg,
NEEDARRAY, NOT_IN_LVT);
Tcl_SetErrorCode(interp, "TCL", "VALUE", "VARNAME",
(char *)NULL);
}
return NULL;
}
arrayPtr = Tcl_NewStringObj(part1, (part2 - part1));
|
| ︙ | ︙ | |||
696 697 698 699 700 701 702 |
/*
* part1Ptr is not an array element; look it up, and convert it to one of
* the cached types if possible.
*/
varPtr = TclLookupSimpleVar(interp, part1Ptr, flags, createPart1,
&errMsg, &index);
| | | | > | 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 |
/*
* part1Ptr is not an array element; look it up, and convert it to one of
* the cached types if possible.
*/
varPtr = TclLookupSimpleVar(interp, part1Ptr, flags, createPart1,
&errMsg, &index);
if (!varPtr) {
if (errMsg && (flags & TCL_LEAVE_ERR_MSG)) {
TclObjVarErrMsg(interp, part1Ptr, part2Ptr, msg, errMsg,
NOT_IN_LVT);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
TclGetString(part1Ptr), (char *)NULL);
}
return NULL;
}
/*
|
| ︙ | ︙ | |||
760 761 762 763 764 765 766 |
}
donePart1:
while (TclIsVarLink(varPtr)) {
varPtr = varPtr->value.linkPtr;
}
| | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 |
}
donePart1:
while (TclIsVarLink(varPtr)) {
varPtr = varPtr->value.linkPtr;
}
if (part2Ptr) {
/*
* Array element sought: look it up.
*/
*arrayPtrPtr = varPtr;
varPtr = TclLookupArrayElement(interp, part1Ptr, part2Ptr, flags, msg,
createPart1, createPart2, varPtr, NOT_IN_LVT);
}
return varPtr;
}
/*
*----------------------------------------------------------------------
*
* ApplyResolvers --
*
* How to actually apply variable resolvers when looking up a variable.
*
* It is up to the caller to check for the TCL_AVOID_RESOLVERS flag
* before calling this.
*
* Results:
* TCL_OK if a variable has been resolved.
* TCL_ERROR if a definite failure has been determined (i.e., the
* resolution process is indicating that the variable definitely
* doesn't exist).
* TCL_CONTINUE if no resolver has decided to resolve the variable.
*
* Side effects:
* The interpreter's result is set on error. The resolvers may alter
* their internal state.
*
*----------------------------------------------------------------------
*/
static inline int
ApplyResolvers(
Tcl_Interp *interp,
Namespace *cxtNsPtr, /* Context namespace. */
const char *varName, /* Variable name. */
int flags,
Tcl_Var *varPtrPtr) /* OUT: Set to found var, or NULL on error. */
{
Interp *iPtr = (Interp *) interp;
int result = TCL_CONTINUE;
if (cxtNsPtr->varResProc || iPtr->resolverPtr) {
ResolverScheme *resPtr = iPtr->resolverPtr;
/*
* Apply the namespace's resolver, if there is one.
*/
if (cxtNsPtr->varResProc) {
result = cxtNsPtr->varResProc(interp, varName,
(Tcl_Namespace *) cxtNsPtr, flags, varPtrPtr);
}
/*
* Apply the list of global resolvers, at least until one of them
* elects to do something (and only if the namespace resolver didn't
* already do so).
*/
for (; result == TCL_CONTINUE && resPtr; resPtr = resPtr->nextPtr) {
if (resPtr->varResProc) {
result = resPtr->varResProc(interp, varName,
(Tcl_Namespace *) cxtNsPtr, flags, varPtrPtr);
}
}
/*
* Ensure that we have a defined state on error.
*/
if (result == TCL_ERROR) {
*varPtrPtr = NULL;
}
}
return result;
}
/*
*----------------------------------------------------------------------
*
* TclLookupSimpleVar --
*
* This function is used by to locate a simple variable (i.e., not an
|
| ︙ | ︙ | |||
841 842 843 844 845 846 847 |
* an "uplevel" is executing. */
TclVarHashTable *tablePtr; /* Points to the hashtable, if any, in which
* to look up the variable. */
Tcl_Var var; /* Used to search for global names. */
Var *varPtr; /* Points to the Var structure returned for
* the variable. */
Namespace *varNsPtr, *cxtNsPtr, *dummy1Ptr, *dummy2Ptr;
| < | < | < < < < < < < | < < < < < < < < < < | | | | | | | | | | | | | > | | | > | | | 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 |
* an "uplevel" is executing. */
TclVarHashTable *tablePtr; /* Points to the hashtable, if any, in which
* to look up the variable. */
Tcl_Var var; /* Used to search for global names. */
Var *varPtr; /* Points to the Var structure returned for
* the variable. */
Namespace *varNsPtr, *cxtNsPtr, *dummy1Ptr, *dummy2Ptr;
int isNew, result;
Tcl_Size i, varLen;
const char *varName = TclGetStringFromObj(varNamePtr, &varLen);
varPtr = NULL;
varNsPtr = NULL; /* Set non-NULL if a nonlocal variable. */
*indexPtr = UNKNOWN_REFERENCE;
if (flags & TCL_GLOBAL_ONLY) {
cxtNsPtr = iPtr->globalNsPtr;
} else {
cxtNsPtr = iPtr->varFramePtr->nsPtr;
}
/*
* If this namespace has a variable resolver, then give it first crack at
* the variable resolution. It may return a Tcl_Var value, it may signal
* to continue onward, or it may signal an error.
*/
if (!(flags & TCL_AVOID_RESOLVERS)) {
result = ApplyResolvers(interp, cxtNsPtr, varName, flags, &var);
if (result != TCL_CONTINUE) {
return (Var *) var;
}
}
/*
* Look up varName. Look it up as either a namespace variable or as a
* local variable in a procedure call frame (varFramePtr). Interpret
* varName as a namespace variable if:
* 1) so requested by a TCL_GLOBAL_ONLY or TCL_NAMESPACE_ONLY flag,
* 2) there is no active frame (we're at the global :: scope),
* 3) the active frame was pushed to define the namespace context for a
* "namespace eval" or "namespace inscope" command,
* 4) the name has namespace qualifiers ("::"s).
* Otherwise, if varName is a local variable, search first in the frame's
* array of compiler-allocated local variables, then in its hashtable for
* runtime-created local variables.
*
* If create and the variable isn't found, create the variable and, if
* necessary, create varFramePtr's local var hashtable.
*/
if (((flags & SCOPES) != 0)
|| !HasLocalVars(varFramePtr)
|| (strstr(varName, "::") != NULL)) {
const char *tail;
int lookGlobal = (flags & TCL_GLOBAL_ONLY)
|| (cxtNsPtr == iPtr->globalNsPtr)
|| ((varName[0] == ':') && (varName[1] == ':'));
if (lookGlobal) {
*indexPtr = GLOBAL_REFERENCE;
flags = (flags | TCL_GLOBAL_ONLY) & ~TCL_NAMESPACE_ONLY;
} else {
flags |= TCL_NAMESPACE_ONLY;
*indexPtr = NAMESPACE_REFERENCE;
}
/*
* Don't pass TCL_LEAVE_ERR_MSG, we may yet create the variable, or
* otherwise generate our own error!
*/
varPtr = (Var *) ObjFindNamespaceVar(interp, varNamePtr,
(Tcl_Namespace *) cxtNsPtr,
(flags | TCL_AVOID_RESOLVERS) & ~TCL_LEAVE_ERR_MSG);
if (!varPtr) {
Tcl_Obj *tailPtr;
if (!create) { /* Var wasn't found and not to create it. */
*errMsgPtr = NOSUCHVAR;
return NULL;
}
/*
* Var wasn't found so create it.
*/
TclGetNamespaceForQualName(interp, varName, cxtNsPtr, flags,
&varNsPtr, &dummy1Ptr, &dummy2Ptr, &tail);
if (!varNsPtr) {
*errMsgPtr = BADNAMESPACE;
return NULL;
} else if (!tail) {
*errMsgPtr = MISSINGNAME;
return NULL;
}
if (tail != varName) {
tailPtr = Tcl_NewStringObj(tail, TCL_AUTO_LENGTH);
} else {
tailPtr = varNamePtr;
}
varPtr = VarHashCreateVar(&varNsPtr->varTable, tailPtr, &isNew);
if (lookGlobal) {
/*
* The variable was created starting from the global
* namespace: a global reference is returned even if it wasn't
* explicitly requested.
*/
*indexPtr = GLOBAL_REFERENCE;
} else {
*indexPtr = NAMESPACE_REFERENCE;
}
}
} else { /* Local var: look in frame varFramePtr. */
Tcl_Size localCt = varFramePtr->numCompiledLocals;
if (localCt > 0) {
Tcl_Obj **objPtrPtr = &varFramePtr->localCachePtr->varName0;
const char *localNameStr;
Tcl_Size localLen;
for (i=0 ; i<localCt ; i++, objPtrPtr++) {
Tcl_Obj *objPtr = *objPtrPtr;
if (objPtr) {
localNameStr = TclGetStringFromObj(objPtr, &localLen);
if ((varLen == localLen)
&& (varName[0] == localNameStr[0])
&& !memcmp(varName, localNameStr, varLen)) {
*indexPtr = i;
return &varFramePtr->compiledLocals[i];
}
}
}
}
tablePtr = varFramePtr->varTablePtr;
if (create) {
if (!tablePtr) {
tablePtr = (TclVarHashTable *)
Tcl_Alloc(sizeof(TclVarHashTable));
TclInitVarHashTable(tablePtr, NULL);
tablePtr->arrayPtr = varPtr;
varFramePtr->varTablePtr = tablePtr;
}
varPtr = VarHashCreateVar(tablePtr, varNamePtr, &isNew);
} else {
varPtr = NULL;
if (tablePtr) {
varPtr = VarHashFindVar(tablePtr, varNamePtr);
}
if (!varPtr) {
*errMsgPtr = NOSUCHVAR;
}
}
}
return varPtr;
}
|
| ︙ | ︙ | |||
1084 1085 1086 1087 1088 1089 1090 |
if (TclIsVarUndefined(arrayPtr) && !TclIsVarArrayElement(arrayPtr)) {
if (!createArray) {
if (flags & TCL_LEAVE_ERR_MSG) {
TclObjVarErrMsg(interp, arrayNamePtr, elNamePtr, msg,
NOSUCHVAR, index);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
| | | | < | | | | | < | 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 |
if (TclIsVarUndefined(arrayPtr) && !TclIsVarArrayElement(arrayPtr)) {
if (!createArray) {
if (flags & TCL_LEAVE_ERR_MSG) {
TclObjVarErrMsg(interp, arrayNamePtr, elNamePtr, msg,
NOSUCHVAR, index);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
AsStr(arrayNamePtr), (char *)NULL);
}
return NULL;
}
/*
* Make sure we are not resurrecting a namespace variable from a
* deleted namespace!
*/
if (TclIsVarDeadHash(arrayPtr)) {
if (flags & TCL_LEAVE_ERR_MSG) {
TclObjVarErrMsg(interp, arrayNamePtr, elNamePtr, msg,
DANGLINGVAR, index);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
AsStr(arrayNamePtr), (char *)NULL);
}
return NULL;
}
TclInitArrayVar(arrayPtr);
} else if (!TclIsVarArray(arrayPtr)) {
if (flags & TCL_LEAVE_ERR_MSG) {
TclObjVarErrMsg(interp, arrayNamePtr, elNamePtr, msg, NEEDARRAY,
index);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
AsStr(arrayNamePtr), (char *)NULL);
}
return NULL;
}
if (createElem) {
varPtr = VarHashCreateVar(arrayPtr->value.tablePtr, elNamePtr,
&isNew);
if (isNew) {
if (arrayPtr->flags & VAR_SEARCH_ACTIVE) {
DeleteSearches((Interp *) interp, arrayPtr);
}
TclSetVarArrayElement(varPtr);
}
} else {
varPtr = VarHashFindVar(arrayPtr->value.tablePtr, elNamePtr);
if (!varPtr && (flags & TCL_LEAVE_ERR_MSG)) {
TclObjVarErrMsg(interp, arrayNamePtr, elNamePtr, msg,
NOSUCHELEMENT, index);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ELEMENT",
TclGetString(elNamePtr), (char *)NULL);
}
}
return varPtr;
}
/*
*----------------------------------------------------------------------
|
| ︙ | ︙ | |||
1173 1174 1175 1176 1177 1178 1179 |
* the name of a variable. */
const char *part2, /* If non-NULL, gives the name of an element
* in the array part1. */
int flags) /* OR-ed combination of TCL_GLOBAL_ONLY,
* TCL_NAMESPACE_ONLY and TCL_LEAVE_ERR_MSG *
* bits. */
{
| < | | < < < < < | | < | < < | < < | 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 |
* the name of a variable. */
const char *part2, /* If non-NULL, gives the name of an element
* in the array part1. */
int flags) /* OR-ed combination of TCL_GLOBAL_ONLY,
* TCL_NAMESPACE_ONLY and TCL_LEAVE_ERR_MSG *
* bits. */
{
Tcl_Obj *part1Ptr = Tcl_NewStringObj(part1, TCL_AUTO_LENGTH);
Tcl_Obj *part2Ptr = AsObj(part2);
Tcl_Obj *resultPtr = Tcl_ObjGetVar2(interp, part1Ptr, part2Ptr, flags);
Tcl_BounceRefCount(part1Ptr);
Tcl_BounceRefCount(part2Ptr);
return AsStr(resultPtr);
}
/*
*----------------------------------------------------------------------
*
* Tcl_GetVar2Ex --
*
|
| ︙ | ︙ | |||
1227 1228 1229 1230 1231 1232 1233 |
const char *part1, /* Name of an array (if part2 is non-NULL) or
* the name of a variable. */
const char *part2, /* If non-NULL, gives the name of an element
* in the array part1. */
int flags) /* OR-ed combination of TCL_GLOBAL_ONLY, and
* TCL_LEAVE_ERR_MSG bits. */
{
| | | < < < < < | | < | < < | 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 |
const char *part1, /* Name of an array (if part2 is non-NULL) or
* the name of a variable. */
const char *part2, /* If non-NULL, gives the name of an element
* in the array part1. */
int flags) /* OR-ed combination of TCL_GLOBAL_ONLY, and
* TCL_LEAVE_ERR_MSG bits. */
{
Tcl_Obj *part1Ptr = Tcl_NewStringObj(part1, TCL_AUTO_LENGTH);
Tcl_Obj *part2Ptr = AsObj(part2);
Tcl_Obj *resPtr = Tcl_ObjGetVar2(interp, part1Ptr, part2Ptr, flags);
Tcl_BounceRefCount(part1Ptr);
Tcl_BounceRefCount(part2Ptr);
return resPtr;
}
/*
*----------------------------------------------------------------------
*
* Tcl_ObjGetVar2 --
|
| ︙ | ︙ | |||
1288 1289 1290 1291 1292 1293 1294 |
{
Var *varPtr, *arrayPtr;
/*
* Filter to pass through only the flags this interface supports.
*/
| | | | | 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 |
{
Var *varPtr, *arrayPtr;
/*
* Filter to pass through only the flags this interface supports.
*/
flags &= SCOPES | TCL_LEAVE_ERR_MSG;
varPtr = TclObjLookupVarEx(interp, part1Ptr, part2Ptr, flags, "read",
/*createPart1*/ 0, /*createPart2*/ 1, &arrayPtr);
if (!varPtr) {
return NULL;
}
return TclPtrGetVarIdx(interp, varPtr, arrayPtr, part1Ptr, part2Ptr,
flags, NOT_IN_LVT);
}
/*
*----------------------------------------------------------------------
*
* TclPtrGetVar --
*
|
| ︙ | ︙ | |||
1335 1336 1337 1338 1339 1340 1341 |
Tcl_Obj *part1Ptr, /* Name of an array (if part2 is non-NULL) or
* the name of a variable. */
Tcl_Obj *part2Ptr, /* If non-NULL, gives the name of an element
* in the array part1. */
int flags) /* OR-ed combination of TCL_GLOBAL_ONLY, and
* TCL_LEAVE_ERR_MSG bits. */
{
| | | | | 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 |
Tcl_Obj *part1Ptr, /* Name of an array (if part2 is non-NULL) or
* the name of a variable. */
Tcl_Obj *part2Ptr, /* If non-NULL, gives the name of an element
* in the array part1. */
int flags) /* OR-ed combination of TCL_GLOBAL_ONLY, and
* TCL_LEAVE_ERR_MSG bits. */
{
if (!varPtr) {
Tcl_Panic("varPtr must not be NULL");
}
if (!part1Ptr) {
Tcl_Panic("part1Ptr must not be NULL");
}
return TclPtrGetVarIdx(interp, (Var *) varPtr, (Var *) arrayPtr,
part1Ptr, part2Ptr, flags, NOT_IN_LVT);
}
/*
*----------------------------------------------------------------------
*
* TclPtrGetVarIdx --
*
|
| ︙ | ︙ | |||
1381 1382 1383 1384 1385 1386 1387 |
Tcl_Obj *part1Ptr, /* Name of an array (if part2 is non-NULL) or
* the name of a variable. */
Tcl_Obj *part2Ptr, /* If non-NULL, gives the name of an element
* in the array part1. */
int flags, /* OR-ed combination of TCL_GLOBAL_ONLY, and
* TCL_LEAVE_ERR_MSG bits. */
int index) /* Index into the local variable table of the
| | | | < | | | | > > > | 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 |
Tcl_Obj *part1Ptr, /* Name of an array (if part2 is non-NULL) or
* the name of a variable. */
Tcl_Obj *part2Ptr, /* If non-NULL, gives the name of an element
* in the array part1. */
int flags, /* OR-ed combination of TCL_GLOBAL_ONLY, and
* TCL_LEAVE_ERR_MSG bits. */
int index) /* Index into the local variable table of the
* variable, or NOT_IN_LVT (-1). Only used when
* part1Ptr is NULL. */
{
Interp *iPtr = (Interp *) interp;
const char *msg;
Var *initialArrayPtr = arrayPtr;
TclVarFindHiddenArray(varPtr, arrayPtr);
/*
* Invoke any read traces that have been set for the variable.
*/
if ((varPtr->flags & VAR_TRACED_READ)
|| (arrayPtr && (arrayPtr->flags & VAR_TRACED_READ))) {
if (TclObjCallVarTraces(iPtr, arrayPtr, varPtr, part1Ptr, part2Ptr,
(flags & SCOPES) | TCL_TRACE_READS,
(flags & TCL_LEAVE_ERR_MSG), index) != TCL_OK) {
goto errorReturn;
}
}
/*
* Return the element if it's an existing scalar variable.
*/
if (TclIsVarScalar(varPtr) && !TclIsVarUndefined(varPtr)) {
return varPtr->value.objPtr;
}
/*
* Return the array default value if any.
*/
if (arrayPtr && TclIsVarArray(arrayPtr)) {
Tcl_Obj *defaultObj = TclGetArrayDefault(arrayPtr);
if (defaultObj) {
return defaultObj;
}
}
if (TclIsVarArrayElement(varPtr) && !arrayPtr) {
/*
* UGLY! Peek inside the implementation of things. This lets us get
* the default of an array even when we've been [upvar]ed to just an
* element of the array.
*/
|
| ︙ | ︙ | |||
1486 1487 1488 1489 1490 1491 1492 |
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
Tcl_Obj *varValueObj;
if (objc == 2) {
| | | | | 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 |
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
Tcl_Obj *varValueObj;
if (objc == 2) {
varValueObj = Tcl_ObjGetVar2(interp, objv[1], NULL, TCL_LEAVE_ERR_MSG);
if (!varValueObj) {
return TCL_ERROR;
}
Tcl_SetObjResult(interp, varValueObj);
return TCL_OK;
} else if (objc == 3) {
varValueObj = Tcl_ObjSetVar2(interp, objv[1], NULL, objv[2],
TCL_LEAVE_ERR_MSG);
if (!varValueObj) {
return TCL_ERROR;
}
Tcl_SetObjResult(interp, varValueObj);
return TCL_OK;
} else {
Tcl_WrongNumArgs(interp, 1, objv, "varName ?newValue?");
return TCL_ERROR;
|
| ︙ | ︙ | |||
1548 1549 1550 1551 1552 1553 1554 |
const char *newValue, /* New value for variable. */
int flags) /* Various flags that tell how to set value:
* any of TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
* TCL_APPEND_VALUE, TCL_LIST_ELEMENT, or
* TCL_LEAVE_ERR_MSG. */
{
Tcl_Obj *varValuePtr = Tcl_SetVar2Ex(interp, part1, part2,
| | < | < < | 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 |
const char *newValue, /* New value for variable. */
int flags) /* Various flags that tell how to set value:
* any of TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
* TCL_APPEND_VALUE, TCL_LIST_ELEMENT, or
* TCL_LEAVE_ERR_MSG. */
{
Tcl_Obj *varValuePtr = Tcl_SetVar2Ex(interp, part1, part2,
Tcl_NewStringObj(newValue, TCL_AUTO_LENGTH), flags);
return AsStr(varValuePtr);
}
/*
*----------------------------------------------------------------------
*
* Tcl_SetVar2Ex --
*
|
| ︙ | ︙ | |||
1608 1609 1610 1611 1612 1613 1614 |
* in the array part1. */
Tcl_Obj *newValuePtr, /* New value for variable. */
int flags) /* Various flags that tell how to set value:
* any of TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
* TCL_APPEND_VALUE, TCL_LIST_ELEMENT or
* TCL_LEAVE_ERR_MSG. */
{
| | | < < < < < < | > | < | < < | 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 |
* in the array part1. */
Tcl_Obj *newValuePtr, /* New value for variable. */
int flags) /* Various flags that tell how to set value:
* any of TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
* TCL_APPEND_VALUE, TCL_LIST_ELEMENT or
* TCL_LEAVE_ERR_MSG. */
{
Tcl_Obj *part1Ptr = Tcl_NewStringObj(part1, TCL_AUTO_LENGTH);
Tcl_Obj *part2Ptr = AsObj(part2);
Tcl_Obj *resPtr = Tcl_ObjSetVar2(interp, part1Ptr, part2Ptr, newValuePtr,
flags);
Tcl_BounceRefCount(part1Ptr);
Tcl_BounceRefCount(part2Ptr);
return resPtr;
}
/*
*----------------------------------------------------------------------
*
* Tcl_ObjSetVar2 --
|
| ︙ | ︙ | |||
1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 |
* variable traces may modify the variable's value.
*
* Side effects:
* The value of the given variable is set. If either the array or the
* entry didn't exist then a new variable is created.
* Callers must Incr part1Ptr if they plan to Decr it.
* Callers must Incr part2Ptr if they plan to Decr it.
*
*----------------------------------------------------------------------
*/
Tcl_Obj *
Tcl_ObjSetVar2(
Tcl_Interp *interp, /* Command interpreter in which variable is to
| > > > | 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 |
* variable traces may modify the variable's value.
*
* Side effects:
* The value of the given variable is set. If either the array or the
* entry didn't exist then a new variable is created.
* Callers must Incr part1Ptr if they plan to Decr it.
* Callers must Incr part2Ptr if they plan to Decr it.
*
* If the variable could not be created and the value has a zero reference
* count, the value is freed.
*
*----------------------------------------------------------------------
*/
Tcl_Obj *
Tcl_ObjSetVar2(
Tcl_Interp *interp, /* Command interpreter in which variable is to
|
| ︙ | ︙ | |||
1674 1675 1676 1677 1678 1679 1680 |
{
Var *varPtr, *arrayPtr;
/*
* Filter to pass through only the flags this interface supports.
*/
| | < | < | < | | 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 |
{
Var *varPtr, *arrayPtr;
/*
* Filter to pass through only the flags this interface supports.
*/
flags &= SCOPES | TCL_LEAVE_ERR_MSG | SET_MODIFIERS;
varPtr = TclObjLookupVarEx(interp, part1Ptr, part2Ptr, flags, "set",
/*createPart1*/ 1, /*createPart2*/ 1, &arrayPtr);
if (!varPtr) {
Tcl_BounceRefCount(newValuePtr);
return NULL;
}
return TclPtrSetVarIdx(interp, varPtr, arrayPtr, part1Ptr, part2Ptr,
newValuePtr, flags, NOT_IN_LVT);
}
/*
*----------------------------------------------------------------------
*
* TclPtrSetVar --
*
|
| ︙ | ︙ | |||
1730 1731 1732 1733 1734 1735 1736 |
* the name of a variable. */
Tcl_Obj *part2Ptr, /* If non-NULL, gives the name of an element
* in the array part1. */
Tcl_Obj *newValuePtr, /* New value for variable. */
int flags) /* OR-ed combination of TCL_GLOBAL_ONLY, and
* TCL_LEAVE_ERR_MSG bits. */
{
| | | | | | 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 |
* the name of a variable. */
Tcl_Obj *part2Ptr, /* If non-NULL, gives the name of an element
* in the array part1. */
Tcl_Obj *newValuePtr, /* New value for variable. */
int flags) /* OR-ed combination of TCL_GLOBAL_ONLY, and
* TCL_LEAVE_ERR_MSG bits. */
{
if (!varPtr) {
Tcl_Panic("varPtr must not be NULL");
}
if (!part1Ptr) {
Tcl_Panic("part1Ptr must not be NULL");
}
if (!newValuePtr) {
Tcl_Panic("newValuePtr must not be NULL");
}
return TclPtrSetVarIdx(interp, (Var *) varPtr, (Var *) arrayPtr,
part1Ptr, part2Ptr, newValuePtr, flags, NOT_IN_LVT);
}
/*
*----------------------------------------------------------------------
*
* ListAppendInVar, StringAppendInVar --
*
|
| ︙ | ︙ | |||
1770 1771 1772 1773 1774 1775 1776 |
ListAppendInVar(
Tcl_Interp *interp,
Var *varPtr,
Var *arrayPtr,
Tcl_Obj *oldValuePtr,
Tcl_Obj *newValuePtr)
{
| | | | 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 |
ListAppendInVar(
Tcl_Interp *interp,
Var *varPtr,
Var *arrayPtr,
Tcl_Obj *oldValuePtr,
Tcl_Obj *newValuePtr)
{
if (!oldValuePtr) {
/*
* No previous value. Check for defaults if there's an array we can
* ask this of.
*/
if (arrayPtr) {
Tcl_Obj *defValuePtr = TclGetArrayDefault(arrayPtr);
if (defValuePtr) {
oldValuePtr = Tcl_DuplicateObj(defValuePtr);
}
}
if (!oldValuePtr) {
/*
* No default. [lappend] semantics say this is like being an empty
* string.
*/
TclNewObj(oldValuePtr);
}
|
| ︙ | ︙ | |||
1817 1818 1819 1820 1821 1822 1823 |
{
/*
* If there was no previous value, either we use the array's default (if
* this is an array with a default at all) or we treat this as a simple
* set.
*/
| | | 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 |
{
/*
* If there was no previous value, either we use the array's default (if
* this is an array with a default at all) or we treat this as a simple
* set.
*/
if (!oldValuePtr) {
if (arrayPtr) {
Tcl_Obj *defValuePtr = TclGetArrayDefault(arrayPtr);
if (defValuePtr) {
/*
* This is *almost* the same as the shared path below, except
* that the original value reference in defValuePtr is not
|
| ︙ | ︙ | |||
1862 1863 1864 1865 1866 1867 1868 |
TclDecrRefCount(oldValuePtr);
oldValuePtr = varPtr->value.objPtr;
Tcl_IncrRefCount(oldValuePtr); /* Since var is ref */
}
Tcl_AppendObjToObj(oldValuePtr, newValuePtr);
| < | < | 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 |
TclDecrRefCount(oldValuePtr);
oldValuePtr = varPtr->value.objPtr;
Tcl_IncrRefCount(oldValuePtr); /* Since var is ref */
}
Tcl_AppendObjToObj(oldValuePtr, newValuePtr);
Tcl_BounceRefCount(newValuePtr);
}
/*
*----------------------------------------------------------------------
*
* TclPtrSetVarIdx --
*
|
| ︙ | ︙ | |||
1915 1916 1917 1918 1919 1920 1921 |
int index) /* Index of local var where part1 is to be
* found. */
{
Interp *iPtr = (Interp *) interp;
Tcl_Obj *oldValuePtr;
Tcl_Obj *resultPtr = NULL;
int result;
| < | 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 |
int index) /* Index of local var where part1 is to be
* found. */
{
Interp *iPtr = (Interp *) interp;
Tcl_Obj *oldValuePtr;
Tcl_Obj *resultPtr = NULL;
int result;
/*
* If the variable is in a hashtable and its hPtr field is NULL, then we
* may have an upvar to an array element where the array was deleted or an
* upvar to a namespace variable whose namespace was deleted. Generate an
* error (allowing the variable to be reset would screw up our storage
* allocation and is meaningless anyway).
|
| ︙ | ︙ | |||
1945 1946 1947 1948 1949 1950 1951 |
}
/*
* It's an error to try to set a constant.
*/
if (TclIsVarConstant(varPtr)) {
if (flags & TCL_LEAVE_ERR_MSG) {
| | | | | < | > | | | | | | | 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 |
}
/*
* It's an error to try to set a constant.
*/
if (TclIsVarConstant(varPtr)) {
if (flags & TCL_LEAVE_ERR_MSG) {
TclObjVarErrMsg(interp, part1Ptr, part2Ptr, "set", ISCONST, index);
Tcl_SetErrorCode(interp, "TCL", "WRITE", "CONST", (char *)NULL);
}
goto earlyError;
}
/*
* It's an error to try to set an array variable itself.
*/
if (TclIsVarArray(varPtr)) {
if (flags & TCL_LEAVE_ERR_MSG) {
TclObjVarErrMsg(interp, part1Ptr, part2Ptr, "set", ISARRAY, index);
Tcl_SetErrorCode(interp, "TCL", "WRITE", "ARRAY", (char *)NULL);
}
goto earlyError;
}
TclVarFindHiddenArray(varPtr, arrayPtr);
/*
* Invoke any read traces that have been set for the variable if it is
* requested. This was done for INST_LAPPEND_* but that was inconsistent
* with the non-bc instruction, and would cause failures trying to
* lappend to any non-existing ::env var, which is inconsistent with
* documented behavior. [Bug #3057639].
*/
if ((flags & TCL_TRACE_READS) && ((varPtr->flags & VAR_TRACED_READ)
|| (arrayPtr && (arrayPtr->flags & VAR_TRACED_READ)))) {
if (TclObjCallVarTraces(iPtr, arrayPtr, varPtr, part1Ptr, part2Ptr,
TCL_TRACE_READS, (flags & TCL_LEAVE_ERR_MSG),
index) != TCL_OK) {
goto earlyError;
}
}
/*
* Set the variable's new value. If appending, append the new value to the
* variable, either as a list element or as a string. Also, if appending,
* then if the variable's old value is unshared we can modify it directly,
* otherwise we must create a new copy to modify: this is "copy on write".
*/
oldValuePtr = varPtr->value.objPtr;
if ((flags & TCL_LIST_ELEMENT) && !(flags & TCL_APPEND_VALUE)) {
varPtr->value.objPtr = NULL;
}
if (flags & SET_MODIFIERS) {
if (flags & TCL_LIST_ELEMENT) { /* Append list element. */
result = ListAppendInVar(interp, varPtr, arrayPtr, oldValuePtr,
newValuePtr);
if (result != TCL_OK) {
goto earlyError;
}
} else { /* Append string. */
StringAppendInVar(varPtr, arrayPtr, oldValuePtr, newValuePtr);
}
} else if (newValuePtr != oldValuePtr) {
/*
* In this case we are replacing the value, so we don't need to do
* more than swap the objects.
*/
varPtr->value.objPtr = newValuePtr;
Tcl_IncrRefCount(newValuePtr); /* Var is another ref. */
if (oldValuePtr) {
TclDecrRefCount(oldValuePtr); /* Discard old value. */
}
}
/*
* Invoke any write traces for the variable.
*/
if ((varPtr->flags & VAR_TRACED_WRITE)
|| (arrayPtr && (arrayPtr->flags & VAR_TRACED_WRITE))) {
if (TclObjCallVarTraces(iPtr, arrayPtr, varPtr, part1Ptr, part2Ptr,
(flags & SCOPES) | TCL_TRACE_WRITES,
(flags & TCL_LEAVE_ERR_MSG), index) != TCL_OK) {
goto cleanup;
}
}
/*
* Return the variable's value unless the variable was changed in some
* gross way by a trace (e.g. it was unset and then recreated as an
|
| ︙ | ︙ | |||
2052 2053 2054 2055 2056 2057 2058 |
/*
* If the variable doesn't exist anymore and no-one's using it, then free
* up the relevant structures and hash table entries.
*/
cleanup:
| | < | < | 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 |
/*
* If the variable doesn't exist anymore and no-one's using it, then free
* up the relevant structures and hash table entries.
*/
cleanup:
if (!resultPtr) {
Tcl_SetErrorCode(interp, "TCL", "WRITE", "VARNAME", (char *)NULL);
}
if (TclIsVarUndefined(varPtr)) {
TclCleanupVar(varPtr, arrayPtr);
}
return resultPtr;
earlyError:
Tcl_BounceRefCount(newValuePtr);
goto cleanup;
}
/*
*----------------------------------------------------------------------
*
* TclIncrObjVar2 --
|
| ︙ | ︙ | |||
2115 2116 2117 2118 2119 2120 2121 |
* TCL_APPEND_VALUE, TCL_LIST_ELEMENT,
* TCL_LEAVE_ERR_MSG. */
{
Var *varPtr, *arrayPtr;
varPtr = TclObjLookupVarEx(interp, part1Ptr, part2Ptr, flags, "read",
1, 1, &arrayPtr);
| | | | 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 |
* TCL_APPEND_VALUE, TCL_LIST_ELEMENT,
* TCL_LEAVE_ERR_MSG. */
{
Var *varPtr, *arrayPtr;
varPtr = TclObjLookupVarEx(interp, part1Ptr, part2Ptr, flags, "read",
1, 1, &arrayPtr);
if (!varPtr) {
Tcl_AddErrorInfo(interp,
"\n (reading value of variable to increment)");
return NULL;
}
return TclPtrIncrObjVarIdx(interp, varPtr, arrayPtr, part1Ptr, part2Ptr,
incrPtr, flags, NOT_IN_LVT);
}
/*
*----------------------------------------------------------------------
*
* TclPtrIncrObjVar --
*
|
| ︙ | ︙ | |||
2170 2171 2172 2173 2174 2175 2176 |
Tcl_Obj *incrPtr, /* Increment value. */
/* TODO: Which of these flag values really make sense? */
int flags) /* Various flags that tell how to incr value:
* any of TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
* TCL_APPEND_VALUE, TCL_LIST_ELEMENT,
* TCL_LEAVE_ERR_MSG. */
{
| | | | | 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 |
Tcl_Obj *incrPtr, /* Increment value. */
/* TODO: Which of these flag values really make sense? */
int flags) /* Various flags that tell how to incr value:
* any of TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
* TCL_APPEND_VALUE, TCL_LIST_ELEMENT,
* TCL_LEAVE_ERR_MSG. */
{
if (!varPtr) {
Tcl_Panic("varPtr must not be NULL");
}
if (!part1Ptr) {
Tcl_Panic("part1Ptr must not be NULL");
}
return TclPtrIncrObjVarIdx(interp, (Var *) varPtr, (Var *) arrayPtr,
part1Ptr, part2Ptr, incrPtr, flags, NOT_IN_LVT);
}
/*
*----------------------------------------------------------------------
*
* TclPtrIncrObjVarIdx --
*
|
| ︙ | ︙ | |||
2226 2227 2228 2229 2230 2231 2232 |
Tcl_Obj *incrPtr, /* Increment value. */
/* TODO: Which of these flag values really make sense? */
int flags, /* Various flags that tell how to incr value:
* any of TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
* TCL_APPEND_VALUE, TCL_LIST_ELEMENT,
* TCL_LEAVE_ERR_MSG. */
int index) /* Index into the local variable table of the
| | | | | | | < < < | > > > > | | | < | > > > | | | < < < < | 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 |
Tcl_Obj *incrPtr, /* Increment value. */
/* TODO: Which of these flag values really make sense? */
int flags, /* Various flags that tell how to incr value:
* any of TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
* TCL_APPEND_VALUE, TCL_LIST_ELEMENT,
* TCL_LEAVE_ERR_MSG. */
int index) /* Index into the local variable table of the
* variable, or NOT_IN_LVT (-1). Only used when
* part1Ptr is NULL. */
{
Tcl_Obj *varValuePtr;
/*
* It's an error to try to increment a constant.
*/
if (TclIsVarConstant(varPtr)) {
if (flags & TCL_LEAVE_ERR_MSG) {
TclObjVarErrMsg(interp, part1Ptr, part2Ptr, "incr", ISCONST, index);
Tcl_SetErrorCode(interp, "TCL", "WRITE", "CONST", (char *)NULL);
}
return NULL;
}
if (TclIsVarInHash(varPtr)) {
VarHashRefCount(varPtr)++;
}
varValuePtr = TclPtrGetVarIdx(interp, varPtr, arrayPtr, part1Ptr,
part2Ptr, flags, index);
if (TclIsVarInHash(varPtr)) {
VarHashRefCount(varPtr)--;
}
if (!varValuePtr) {
TclNewIntObj(varValuePtr, 0);
}
if (Tcl_IsShared(varValuePtr)) {
/* Copy on write */
varValuePtr = Tcl_DuplicateObj(varValuePtr);
if (TclIncrObj(interp, varValuePtr, incrPtr) != TCL_OK) {
Tcl_DecrRefCount(varValuePtr);
return NULL;
}
} else {
/* Unshared - can Incr in place */
if (TclIncrObj(interp, varValuePtr, incrPtr) != TCL_OK) {
return NULL;
}
}
/*
* This seems dumb to write the incremeted value into the var after we just
* adjusted the value in place, but the spec for [incr] requires that write
* traces fire, and making this call is the way to make that happen.
*
* This also handles the case where we are creating the variable, and is
* unified with the second half of the shared value handling.
*/
return TclPtrSetVarIdx(interp, varPtr, arrayPtr, part1Ptr,
part2Ptr, varValuePtr, flags, index);
}
/*
*----------------------------------------------------------------------
*
* Tcl_UnsetVar2 --
*
|
| ︙ | ︙ | |||
2313 2314 2315 2316 2317 2318 2319 2320 |
* be looked up. */
const char *part1, /* Name of variable or array. */
const char *part2, /* Name of element within array or NULL. */
int flags) /* OR-ed combination of any of
* TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
* TCL_LEAVE_ERR_MSG. */
{
int result;
| > > < < < < < | | < | < | 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 |
* be looked up. */
const char *part1, /* Name of variable or array. */
const char *part2, /* Name of element within array or NULL. */
int flags) /* OR-ed combination of any of
* TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
* TCL_LEAVE_ERR_MSG. */
{
Tcl_Obj *part1Ptr = Tcl_NewStringObj(part1, TCL_AUTO_LENGTH);
Tcl_Obj *part2Ptr = AsObj(part2);
int result;
/*
* Filter to pass through only the flags this interface supports.
*/
flags &= SCOPES | TCL_LEAVE_ERR_MSG;
result = TclObjUnsetVar2(interp, part1Ptr, part2Ptr, flags);
Tcl_BounceRefCount(part1Ptr);
Tcl_BounceRefCount(part2Ptr);
return result;
}
/*
*----------------------------------------------------------------------
*
* TclObjUnsetVar2 --
|
| ︙ | ︙ | |||
2369 2370 2371 2372 2373 2374 2375 |
* TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
* TCL_LEAVE_ERR_MSG. */
{
Var *varPtr, *arrayPtr;
varPtr = TclObjLookupVarEx(interp, part1Ptr, part2Ptr, flags, "unset",
/*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
| | | | 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 |
* TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
* TCL_LEAVE_ERR_MSG. */
{
Var *varPtr, *arrayPtr;
varPtr = TclObjLookupVarEx(interp, part1Ptr, part2Ptr, flags, "unset",
/*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
if (!varPtr) {
return TCL_ERROR;
}
return TclPtrUnsetVarIdx(interp, varPtr, arrayPtr, part1Ptr, part2Ptr,
flags, NOT_IN_LVT);
}
/*
*----------------------------------------------------------------------
*
* TclPtrUnsetVar --
*
|
| ︙ | ︙ | |||
2414 2415 2416 2417 2418 2419 2420 |
* the name of a variable. */
Tcl_Obj *part2Ptr, /* If non-NULL, gives the name of an element
* in the array part1. */
int flags) /* OR-ed combination of any of
* TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
* TCL_LEAVE_ERR_MSG. */
{
| | | | | 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 |
* the name of a variable. */
Tcl_Obj *part2Ptr, /* If non-NULL, gives the name of an element
* in the array part1. */
int flags) /* OR-ed combination of any of
* TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
* TCL_LEAVE_ERR_MSG. */
{
if (!varPtr) {
Tcl_Panic("varPtr must not be NULL");
}
if (!part1Ptr) {
Tcl_Panic("part1Ptr must not be NULL");
}
return TclPtrUnsetVarIdx(interp, (Var *) varPtr, (Var *) arrayPtr,
part1Ptr, part2Ptr, flags, NOT_IN_LVT);
}
/*
*----------------------------------------------------------------------
*
* TclPtrUnsetVarIdx --
*
|
| ︙ | ︙ | |||
2461 2462 2463 2464 2465 2466 2467 |
* the name of a variable. */
Tcl_Obj *part2Ptr, /* If non-NULL, gives the name of an element
* in the array part1. */
int flags, /* OR-ed combination of any of
* TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
* TCL_LEAVE_ERR_MSG. */
int index) /* Index into the local variable table of the
| | | | | | | 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 |
* the name of a variable. */
Tcl_Obj *part2Ptr, /* If non-NULL, gives the name of an element
* in the array part1. */
int flags, /* OR-ed combination of any of
* TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
* TCL_LEAVE_ERR_MSG. */
int index) /* Index into the local variable table of the
* variable, or NOT_IN_LVT (-1). Only used when
* part1Ptr is NULL. */
{
Interp *iPtr = (Interp *) interp;
int result = (TclIsVarUndefined(varPtr) ? TCL_ERROR : TCL_OK);
Var *initialArrayPtr = arrayPtr;
/*
* It's an error to try to unset a constant.
*/
if (TclIsVarConstant(varPtr)) {
if (flags & TCL_LEAVE_ERR_MSG) {
TclObjVarErrMsg(interp, part1Ptr, part2Ptr, "unset", ISCONST, index);
Tcl_SetErrorCode(interp, "TCL", "UNSET", "CONST", (char *)NULL);
}
return TCL_ERROR;
}
/*
* Keep the variable alive until we're done with it. We used to
* increase/decrease the refCount for each operation, making it hard to
|
| ︙ | ︙ | |||
2498 2499 2500 2501 2502 2503 2504 |
UnsetVarStruct(varPtr, arrayPtr, iPtr, part1Ptr, part2Ptr, flags, index);
/*
* It's an error to unset an undefined variable.
*/
| < | | | | < | 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 |
UnsetVarStruct(varPtr, arrayPtr, iPtr, part1Ptr, part2Ptr, flags, index);
/*
* It's an error to unset an undefined variable.
*/
if ((result != TCL_OK) && (flags & TCL_LEAVE_ERR_MSG)) {
TclObjVarErrMsg(interp, part1Ptr, part2Ptr, "unset",
!initialArrayPtr ? NOSUCHVAR : NOSUCHELEMENT, index);
Tcl_SetErrorCode(interp, "TCL", "UNSET", "VARNAME", (char *)NULL);
}
/*
* Finally, if the variable is truly not in use then free up its Var
* structure and remove it from its hash table, if any. The ref count of
* its value object, if any, was decremented above.
*/
|
| ︙ | ︙ | |||
2597 2598 2599 2600 2601 2602 2603 | * Transfer any existing traces on var, IF there are unset traces. * Otherwise just delete them. */ int isNew; tPtr = Tcl_FindHashEntry(&iPtr->varTraces, varPtr); | | < > < | | | | 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 |
* Transfer any existing traces on var, IF there are unset traces.
* Otherwise just delete them.
*/
int isNew;
tPtr = Tcl_FindHashEntry(&iPtr->varTraces, varPtr);
tracePtr = (VarTrace *) Tcl_GetHashValue(tPtr);
varPtr->flags &= ~VAR_ALL_TRACES;
Tcl_DeleteHashEntry(tPtr);
if (dummyVar.flags & VAR_TRACED_UNSET) {
tPtr = Tcl_CreateHashEntry(&iPtr->varTraces,
&dummyVar, &isNew);
Tcl_SetHashValue(tPtr, tracePtr);
}
}
if ((dummyVar.flags & VAR_TRACED_UNSET)
|| (arrayPtr && (arrayPtr->flags & VAR_TRACED_UNSET))) {
/*
* Pass the array element name to TclObjCallVarTraces(), because
* it cannot be determined from dummyVar. Alternatively, indicate
* via flags whether the variable involved in the code that caused
* the trace to be triggered was an array element, for the correct
* formatting of error messages.
*/
if (part2Ptr) {
flags |= VAR_ARRAY_ELEMENT;
} else if (TclIsVarArrayElement(varPtr)) {
part2Ptr = VarHashGetKey(varPtr);
}
dummyVar.flags &= ~VAR_TRACE_ACTIVE;
TclObjCallVarTraces(iPtr, arrayPtr, &dummyVar, part1Ptr, part2Ptr,
(flags & (SCOPES | VAR_ARRAY_ELEMENT)) | TCL_TRACE_UNSETS,
/*leaveErrMsg*/ 0, index);
/*
* The traces that we just called may have triggered a change in
* the set of traces. If so, reload the traces to manipulate.
*/
tracePtr = NULL;
if (TclIsVarTraced(&dummyVar)) {
tPtr = Tcl_FindHashEntry(&iPtr->varTraces, &dummyVar);
if (tPtr) {
tracePtr = (VarTrace *) Tcl_GetHashValue(tPtr);
Tcl_DeleteHashEntry(tPtr);
}
}
}
if (tracePtr) {
ActiveVarTrace *activePtr;
|
| ︙ | ︙ | |||
2664 2665 2666 2667 2668 2669 2670 |
activePtr->nextTracePtr = NULL;
}
}
dummyVar.flags &= ~VAR_ALL_TRACES;
}
}
| | | | < | 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 |
activePtr->nextTracePtr = NULL;
}
}
dummyVar.flags &= ~VAR_ALL_TRACES;
}
}
if (TclIsVarScalar(&dummyVar) && !TclIsVarUndefined(&dummyVar)) {
/*
* Decrement the ref count of the var's value.
*/
Tcl_Obj *objPtr = dummyVar.value.objPtr;
TclDecrRefCount(objPtr);
} else if (TclIsVarArray(&dummyVar)) {
/*
* If the variable is an array, delete all of its elements. This must
* be done after calling and deleting the traces on the array, above
* (that's the way traces are defined). If the array name is not
* present and is required for a trace on some element, it will be
* computed at DeleteArray.
*/
DeleteArray(iPtr, part1Ptr, &dummyVar,
(flags & SCOPES) | TCL_TRACE_UNSETS, index);
} else if (TclIsVarLink(&dummyVar)) {
/*
* For global/upvar variables referenced in procedures, decrement the
* reference count on the variable referred to, and free the
* referenced variable if it's no longer needed.
*/
|
| ︙ | ︙ | |||
2752 2753 2754 2755 2756 2757 2758 |
* -nocomplain (which must come first and be given exactly to be an
* option).
*/
i = 1;
name = TclGetString(objv[i]);
if (name[0] == '-') {
| | | | 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 |
* -nocomplain (which must come first and be given exactly to be an
* option).
*/
i = 1;
name = TclGetString(objv[i]);
if (name[0] == '-') {
if (!strcmp("-nocomplain", name)) {
i++;
if (i == objc) {
return TCL_OK;
}
flags = 0;
name = TclGetString(objv[i]);
}
if (!strcmp("--", name)) {
i++;
}
}
for (; i < objc; i++) {
if ((TclObjUnsetVar2(interp, objv[i], NULL, flags) != TCL_OK)
&& (flags == TCL_LEAVE_ERR_MSG)) {
|
| ︙ | ︙ | |||
2809 2810 2811 2812 2813 2814 2815 |
if (objc < 2) {
Tcl_WrongNumArgs(interp, 1, objv, "varName ?value ...?");
return TCL_ERROR;
}
if (objc == 2) {
| | | | | > | | 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 |
if (objc < 2) {
Tcl_WrongNumArgs(interp, 1, objv, "varName ?value ...?");
return TCL_ERROR;
}
if (objc == 2) {
varValuePtr = Tcl_ObjGetVar2(interp, objv[1], NULL, TCL_LEAVE_ERR_MSG);
if (!varValuePtr) {
return TCL_ERROR;
}
} else {
varPtr = TclObjLookupVarEx(interp, objv[1], NULL, TCL_LEAVE_ERR_MSG,
"set", /*createPart1*/ 1, /*createPart2*/ 1, &arrayPtr);
if (!varPtr) {
return TCL_ERROR;
}
for (i=2 ; i<objc ; i++) {
/*
* Note that we do not need to increase the refCount of the Var
* pointers: should a trace delete the variable, the return value
* of TclPtrSetVarIdx will be NULL or emptyObjPtr, and we will not
* access the variable again.
*/
varValuePtr = TclPtrSetVarIdx(interp, varPtr, arrayPtr, objv[1],
NULL, objv[i], TCL_APPEND_VALUE | TCL_LEAVE_ERR_MSG,
NOT_IN_LVT);
if (!varValuePtr ||
(varValuePtr == ((Interp *) interp)->emptyObjPtr)) {
return TCL_ERROR;
}
}
}
Tcl_SetObjResult(interp, varValuePtr);
return TCL_OK;
|
| ︙ | ︙ | |||
2874 2875 2876 2877 2878 2879 2880 |
if (objc < 2) {
Tcl_WrongNumArgs(interp, 1, objv, "varName ?value ...?");
return TCL_ERROR;
}
if (objc == 2) {
newValuePtr = Tcl_ObjGetVar2(interp, objv[1], NULL, 0);
| | | | 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 |
if (objc < 2) {
Tcl_WrongNumArgs(interp, 1, objv, "varName ?value ...?");
return TCL_ERROR;
}
if (objc == 2) {
newValuePtr = Tcl_ObjGetVar2(interp, objv[1], NULL, 0);
if (!newValuePtr) {
/*
* The variable doesn't exist yet. Just create it with an empty
* initial value.
*/
TclNewObj(varValuePtr);
newValuePtr = Tcl_ObjSetVar2(interp, objv[1], NULL, varValuePtr,
TCL_LEAVE_ERR_MSG);
if (!newValuePtr) {
return TCL_ERROR;
}
} else {
result = TclListObjLength(interp, newValuePtr, &numElems);
if (result != TCL_OK) {
return result;
}
|
| ︙ | ︙ | |||
2913 2914 2915 2916 2917 2918 2919 | * Protect the variable pointers around the TclPtrGetVarIdx call * to insure that they remain valid even if the variable was undefined * and unused. */ varPtr = TclObjLookupVarEx(interp, objv[1], NULL, TCL_LEAVE_ERR_MSG, "set", /*createPart1*/ 1, /*createPart2*/ 1, &arrayPtr); | | | | | | | | 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 |
* Protect the variable pointers around the TclPtrGetVarIdx call
* to insure that they remain valid even if the variable was undefined
* and unused.
*/
varPtr = TclObjLookupVarEx(interp, objv[1], NULL, TCL_LEAVE_ERR_MSG,
"set", /*createPart1*/ 1, /*createPart2*/ 1, &arrayPtr);
if (!varPtr) {
return TCL_ERROR;
}
if (TclIsVarInHash(varPtr)) {
VarHashRefCount(varPtr)++;
}
if (arrayPtr && TclIsVarInHash(arrayPtr)) {
VarHashRefCount(arrayPtr)++;
}
varValuePtr = TclPtrGetVarIdx(interp, varPtr, arrayPtr, objv[1], NULL,
TCL_LEAVE_ERR_MSG, NOT_IN_LVT);
if (TclIsVarInHash(varPtr)) {
VarHashRefCount(varPtr)--;
}
if (arrayPtr && TclIsVarInHash(arrayPtr)) {
VarHashRefCount(arrayPtr)--;
}
if (!varValuePtr) {
/*
* We couldn't read the old value: either the var doesn't yet
* exist or it's an array element. If it's new, we will try to
* create it with Tcl_ObjSetVar2 below.
*/
TclNewObj(varValuePtr);
createdNewObj = 1;
} else if (Tcl_IsShared(varValuePtr)) {
varValuePtr = Tcl_DuplicateObj(varValuePtr);
createdNewObj = 1;
}
result = TclListObjLength(interp, varValuePtr, &numElems);
if (result == TCL_OK) {
result = Tcl_ListObjReplace(interp, varValuePtr, numElems, 0,
(objc - 2), (objv + 2));
}
if (result != TCL_OK) {
if (createdNewObj) {
TclDecrRefCount(varValuePtr); /* Free unneeded obj. */
}
return result;
}
/*
* Now store the list object back into the variable. If there is an
* error setting the new value, decrement its ref count if it was new
* and we didn't create the variable.
*/
newValuePtr = TclPtrSetVarIdx(interp, varPtr, arrayPtr, objv[1], NULL,
varValuePtr, TCL_LEAVE_ERR_MSG, NOT_IN_LVT);
if (!newValuePtr) {
return TCL_ERROR;
}
}
/*
* Set the interpreter's object result to refer to the variable's value
* object.
|
| ︙ | ︙ | |||
3031 3032 3033 3034 3035 3036 3037 |
return donerc;
}
gotValue = 0;
while (1) {
Tcl_HashEntry *hPtr = searchPtr->nextEntry;
| | | | 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 |
return donerc;
}
gotValue = 0;
while (1) {
Tcl_HashEntry *hPtr = searchPtr->nextEntry;
if (hPtr) {
searchPtr->nextEntry = NULL;
} else {
hPtr = Tcl_NextHashEntry(&searchPtr->search);
if (!hPtr) {
gotValue = 0;
break;
}
}
varPtr = VarHashGetValue(hPtr);
if (!TclIsVarUndefined(varPtr)) {
gotValue = 1;
|
| ︙ | ︙ | |||
3104 3105 3106 3107 3108 3109 3110 |
if (TclListObjLength(interp, objv[1], &numVars) != TCL_OK) {
return TCL_ERROR;
}
if (numVars != 2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
| | | | | 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 |
if (TclListObjLength(interp, objv[1], &numVars) != TCL_OK) {
return TCL_ERROR;
}
if (numVars != 2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"must have two variable names", TCL_AUTO_LENGTH));
Tcl_SetErrorCode(interp, "TCL", "SYNTAX", "array", "for", (char *)NULL);
return TCL_ERROR;
}
arrayNameObj = objv[2];
if (LocateArray(interp, arrayNameObj, &varPtr, &isArray) != TCL_OK) {
return TCL_ERROR;
}
if (!isArray) {
return NotArrayError(interp, arrayNameObj);
}
/*
* Make a new array search, put it on the stack.
*/
searchPtr = (ArraySearch *) Tcl_Alloc(sizeof(ArraySearch));
ArrayPopulateSearch(interp, arrayNameObj, varPtr, searchPtr);
/*
* Make sure that these objects (which we need throughout the body of the
* loop) don't vanish.
*/
|
| ︙ | ︙ | |||
3154 3155 3156 3157 3158 3159 3160 |
static int
ArrayForLoopCallback(
void *data[],
Tcl_Interp *interp,
int result)
{
Interp *iPtr = (Interp *) interp;
| | | | | | < | 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 |
static int
ArrayForLoopCallback(
void *data[],
Tcl_Interp *interp,
int result)
{
Interp *iPtr = (Interp *) interp;
ArraySearch *searchPtr = (ArraySearch *) data[0];
Tcl_Obj *varListObj = (Tcl_Obj *) data[1];
Tcl_Obj *arrayNameObj = (Tcl_Obj *) data[2];
Tcl_Obj *scriptObj = (Tcl_Obj *) data[3];
Tcl_Obj **varv;
Tcl_Obj *keyObj, *valueObj;
Var *varPtr, *arrayPtr;
int done;
Tcl_Size varc;
/*
* Process the result from the previous execution of the script body.
*/
|
| ︙ | ︙ | |||
3193 3194 3195 3196 3197 3198 3199 |
* Get the next mapping from the array.
*/
keyObj = NULL;
valueObj = NULL;
varPtr = TclObjLookupVarEx(interp, arrayNameObj, NULL, /*flags*/ 0,
/*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
| | | | < | | < | 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 |
* Get the next mapping from the array.
*/
keyObj = NULL;
valueObj = NULL;
varPtr = TclObjLookupVarEx(interp, arrayNameObj, NULL, /*flags*/ 0,
/*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
if (!varPtr) {
done = TCL_ERROR;
} else {
done = ArrayObjNext(interp, arrayNameObj, varPtr, searchPtr, &keyObj,
&valueObj);
}
result = TCL_OK;
if (done != TCL_CONTINUE) {
Tcl_ResetResult(interp);
if (done == TCL_ERROR) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"array changed during iteration", TCL_AUTO_LENGTH));
Tcl_SetErrorCode(interp, "TCL", "READ", "array", "for", (char *)NULL);
varPtr->flags |= TCL_LEAVE_ERR_MSG;
result = done;
}
goto arrayfordone;
}
result = TclListObjGetElements(NULL, varListObj, &varc, &varv);
if (result != TCL_OK) {
goto arrayfordone;
}
if (!Tcl_ObjSetVar2(interp, varv[0], NULL, keyObj, TCL_LEAVE_ERR_MSG)) {
result = TCL_ERROR;
goto arrayfordone;
}
if (valueObj) {
if (!Tcl_ObjSetVar2(interp, varv[1], NULL, valueObj, TCL_LEAVE_ERR_MSG)) {
result = TCL_ERROR;
goto arrayfordone;
}
}
/*
* Run the script.
|
| ︙ | ︙ | |||
3281 3282 3283 3284 3285 3286 3287 |
hPtr = Tcl_CreateHashEntry(&iPtr->varSearches, varPtr, &isNew);
if (isNew) {
searchPtr->id = 1;
varPtr->flags |= VAR_SEARCH_ACTIVE;
searchPtr->nextPtr = NULL;
} else {
searchPtr->id = ((ArraySearch *) Tcl_GetHashValue(hPtr))->id + 1;
| | | 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 |
hPtr = Tcl_CreateHashEntry(&iPtr->varSearches, varPtr, &isNew);
if (isNew) {
searchPtr->id = 1;
varPtr->flags |= VAR_SEARCH_ACTIVE;
searchPtr->nextPtr = NULL;
} else {
searchPtr->id = ((ArraySearch *) Tcl_GetHashValue(hPtr))->id + 1;
searchPtr->nextPtr = (ArraySearch *) Tcl_GetHashValue(hPtr);
}
searchPtr->varPtr = varPtr;
searchPtr->nextEntry = VarHashFirstEntry(varPtr->value.tablePtr,
&searchPtr->search);
Tcl_SetHashValue(hPtr, searchPtr);
searchPtr->name = Tcl_ObjPrintf("s-%d-%s", searchPtr->id,
TclGetString(arrayNameObj));
|
| ︙ | ︙ | |||
3325 3326 3327 3328 3329 3330 3331 |
ArraySearch *searchPtr;
if (objc != 2) {
Tcl_WrongNumArgs(interp, 1, objv, "arrayName");
return TCL_ERROR;
}
| | | | 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 |
ArraySearch *searchPtr;
if (objc != 2) {
Tcl_WrongNumArgs(interp, 1, objv, "arrayName");
return TCL_ERROR;
}
if (LocateArray(interp, objv[1], &varPtr, &isArray) != TCL_OK) {
return TCL_ERROR;
}
if (!isArray) {
return NotArrayError(interp, objv[1]);
}
/*
* Make a new array search with a free name.
*/
searchPtr = (ArraySearch *) Tcl_Alloc(sizeof(ArraySearch));
ArrayPopulateSearch(interp, objv[1], varPtr, searchPtr);
Tcl_SetObjResult(interp, searchPtr->name);
return TCL_OK;
}
/*
*----------------------------------------------------------------------
|
| ︙ | ︙ | |||
3367 3368 3369 3370 3371 3372 3373 |
/*
* Unhook the search from the list of searches associated with the
* variable.
*/
hPtr = Tcl_FindHashEntry(&iPtr->varSearches, varPtr);
| | | > | 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 |
/*
* Unhook the search from the list of searches associated with the
* variable.
*/
hPtr = Tcl_FindHashEntry(&iPtr->varSearches, varPtr);
if (!hPtr) {
return;
}
if (searchPtr == Tcl_GetHashValue(hPtr)) {
if (searchPtr->nextPtr) {
Tcl_SetHashValue(hPtr, searchPtr->nextPtr);
} else {
varPtr->flags &= ~VAR_SEARCH_ACTIVE;
Tcl_DeleteHashEntry(hPtr);
}
} else {
for (prevPtr = (ArraySearch *) Tcl_GetHashValue(hPtr); ;
prevPtr=prevPtr->nextPtr) {
if (prevPtr->nextPtr == searchPtr) {
prevPtr->nextPtr = searchPtr->nextPtr;
break;
}
}
}
}
|
| ︙ | ︙ | |||
3424 3425 3426 3427 3428 3429 3430 |
if (objc != 3) {
Tcl_WrongNumArgs(interp, 1, objv, "arrayName searchId");
return TCL_ERROR;
}
varNameObj = objv[1];
searchObj = objv[2];
| | | | | | 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 |
if (objc != 3) {
Tcl_WrongNumArgs(interp, 1, objv, "arrayName searchId");
return TCL_ERROR;
}
varNameObj = objv[1];
searchObj = objv[2];
if (LocateArray(interp, varNameObj, &varPtr, &isArray) != TCL_OK) {
return TCL_ERROR;
}
if (!isArray) {
return NotArrayError(interp, varNameObj);
}
/*
* Get the search.
*/
searchPtr = ParseSearchId(interp, varPtr, varNameObj, searchObj);
if (!searchPtr) {
return TCL_ERROR;
}
/*
* Scan forward to find if there are any further elements in the array
* that are defined.
*/
while (1) {
if (searchPtr->nextEntry) {
varPtr = VarHashGetValue(searchPtr->nextEntry);
if (!TclIsVarUndefined(varPtr)) {
gotValue = 1;
break;
}
}
searchPtr->nextEntry = Tcl_NextHashEntry(&searchPtr->search);
if (!searchPtr->nextEntry) {
gotValue = 0;
break;
}
}
Tcl_SetObjResult(interp, iPtr->execEnvPtr->constants[gotValue]);
return TCL_OK;
}
|
| ︙ | ︙ | |||
3501 3502 3503 3504 3505 3506 3507 |
if (objc != 3) {
Tcl_WrongNumArgs(interp, 1, objv, "arrayName searchId");
return TCL_ERROR;
}
varNameObj = objv[1];
searchObj = objv[2];
| | | | | | 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 |
if (objc != 3) {
Tcl_WrongNumArgs(interp, 1, objv, "arrayName searchId");
return TCL_ERROR;
}
varNameObj = objv[1];
searchObj = objv[2];
if (LocateArray(interp, varNameObj, &varPtr, &isArray) != TCL_OK) {
return TCL_ERROR;
}
if (!isArray) {
return NotArrayError(interp, varNameObj);
}
/*
* Get the search.
*/
searchPtr = ParseSearchId(interp, varPtr, varNameObj, searchObj);
if (!searchPtr) {
return TCL_ERROR;
}
/*
* Get the next element from the search, or the empty string on
* exhaustion. Note that the [array anymore] command may well have already
* pulled a value from the hash enumeration, so we have to check the cache
* there first.
*/
while (1) {
Tcl_HashEntry *hPtr = searchPtr->nextEntry;
if (!hPtr) {
hPtr = Tcl_NextHashEntry(&searchPtr->search);
if (!hPtr) {
return TCL_OK;
}
} else {
searchPtr->nextEntry = NULL;
}
varPtr = VarHashGetValue(hPtr);
if (!TclIsVarUndefined(varPtr)) {
|
| ︙ | ︙ | |||
3582 3583 3584 3585 3586 3587 3588 |
if (objc != 3) {
Tcl_WrongNumArgs(interp, 1, objv, "arrayName searchId");
return TCL_ERROR;
}
varNameObj = objv[1];
searchObj = objv[2];
| | | | 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 |
if (objc != 3) {
Tcl_WrongNumArgs(interp, 1, objv, "arrayName searchId");
return TCL_ERROR;
}
varNameObj = objv[1];
searchObj = objv[2];
if (LocateArray(interp, varNameObj, &varPtr, &isArray) != TCL_OK) {
return TCL_ERROR;
}
if (!isArray) {
return NotArrayError(interp, varNameObj);
}
/*
* Get the search.
*/
searchPtr = ParseSearchId(interp, varPtr, varNameObj, searchObj);
if (!searchPtr) {
return TCL_ERROR;
}
ArrayDoneSearch(iPtr, varPtr, searchPtr);
Tcl_DecrRefCount(searchPtr->name);
Tcl_Free(searchPtr);
return TCL_OK;
|
| ︙ | ︙ | |||
3629 3630 3631 3632 3633 3634 3635 |
static int
ArrayExistsCmd(
TCL_UNUSED(void *),
Tcl_Interp *interp,
int objc,
Tcl_Obj *const objv[])
{
| | | | 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 |
static int
ArrayExistsCmd(
TCL_UNUSED(void *),
Tcl_Interp *interp,
int objc,
Tcl_Obj *const objv[])
{
Interp *iPtr = (Interp *) interp;
int isArray;
if (objc != 2) {
Tcl_WrongNumArgs(interp, 1, objv, "arrayName");
return TCL_ERROR;
}
if (LocateArray(interp, objv[1], NULL, &isArray) != TCL_OK) {
return TCL_ERROR;
}
Tcl_SetObjResult(interp, iPtr->execEnvPtr->constants[isArray]);
return TCL_OK;
}
|
| ︙ | ︙ | |||
3691 3692 3693 3694 3695 3696 3697 |
patternObj = objv[2];
break;
default:
Tcl_WrongNumArgs(interp, 1, objv, "arrayName ?pattern?");
return TCL_ERROR;
}
| | | < | | | < < < < | | < < < < | < < < | | 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 |
patternObj = objv[2];
break;
default:
Tcl_WrongNumArgs(interp, 1, objv, "arrayName ?pattern?");
return TCL_ERROR;
}
if (LocateArray(interp, varNameObj, &varPtr, &isArray) != TCL_OK) {
return TCL_ERROR;
}
/* If not an array, it's an empty result. */
if (!isArray) {
return TCL_OK;
}
pattern = AsStr(patternObj);
/*
* Store the array names in a new object.
*/
TclNewObj(nameLstObj);
if (TrivialPattern(pattern)) {
varPtr2 = VarHashFindVar(varPtr->value.tablePtr, patternObj);
if (!varPtr2) {
goto searchDone;
}
if (TclIsVarUndefined(varPtr2)) {
goto searchDone;
}
(void) Tcl_ListObjAppendElement(NULL, nameLstObj,
VarHashGetKey(varPtr2));
goto searchDone;
}
for (varPtr2 = VarHashFirstVar(varPtr->value.tablePtr, &search);
varPtr2; varPtr2 = VarHashNextVar(&search)) {
if (TclIsVarUndefined(varPtr2)) {
continue;
}
nameObj = VarHashGetKey(varPtr2);
if (!PatternMatch(pattern, nameObj)) {
continue; /* Element name doesn't match pattern. */
}
(void) Tcl_ListObjAppendElement(NULL, nameLstObj, nameObj);
}
/*
* Make sure the Var structure of the array is not removed by a trace
* while we're working.
*/
searchDone:
if (TclIsVarInHash(varPtr)) {
VarHashRefCount(varPtr)++;
}
/*
* Get the array values corresponding to each element name.
*/
TclNewObj(tmpResObj);
(void) TclListObjGetElements(NULL, nameLstObj, &count, &nameObjPtr);
for (i=0 ; i<count ; i++) {
nameObj = *nameObjPtr++;
valueObj = Tcl_ObjGetVar2(interp, varNameObj, nameObj,
TCL_LEAVE_ERR_MSG);
if (!valueObj) {
/*
* Some trace played a trick on us; we need to diagnose to adapt
* our behaviour: was the array element unset, or did the
* modification modify the complete array?
*/
if (TclIsVarArray(varPtr)) {
|
| ︙ | ︙ | |||
3793 3794 3795 3796 3797 3798 3799 |
goto errorInArrayGet;
}
}
if (TclIsVarInHash(varPtr)) {
VarHashRefCount(varPtr)--;
}
Tcl_SetObjResult(interp, tmpResObj);
| | | | | 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 |
goto errorInArrayGet;
}
}
if (TclIsVarInHash(varPtr)) {
VarHashRefCount(varPtr)--;
}
Tcl_SetObjResult(interp, tmpResObj);
Tcl_BounceRefCount(nameLstObj);
return TCL_OK;
errorInArrayGet:
if (TclIsVarInHash(varPtr)) {
VarHashRefCount(varPtr)--;
}
Tcl_BounceRefCount(nameLstObj);
Tcl_BounceRefCount(tmpResObj); /* Free unneeded temp result. */
return result;
}
/*
*----------------------------------------------------------------------
*
* ArrayNamesCmd --
|
| ︙ | ︙ | |||
3832 3833 3834 3835 3836 3837 3838 |
Tcl_Interp *interp,
int objc,
Tcl_Obj *const objv[])
{
static const char *const options[] = {
"-exact", "-glob", "-regexp", NULL
};
| | > > | | | | 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 |
Tcl_Interp *interp,
int objc,
Tcl_Obj *const objv[])
{
static const char *const options[] = {
"-exact", "-glob", "-regexp", NULL
};
enum arrayNamesOptionsEnum {
OPT_EXACT, OPT_GLOB, OPT_REGEXP
} mode = OPT_GLOB;
Var *varPtr, *varPtr2;
Tcl_Obj *nameObj, *resultObj, *patternObj;
Tcl_HashSearch search;
const char *pattern;
int isArray;
if ((objc < 2) || (objc > 4)) {
Tcl_WrongNumArgs(interp, 1, objv, "arrayName ?mode? ?pattern?");
return TCL_ERROR;
}
patternObj = (objc > 2 ? objv[objc - 1] : NULL);
if (LocateArray(interp, objv[1], &varPtr, &isArray) != TCL_OK) {
return TCL_ERROR;
}
/*
* Finish parsing the arguments.
*/
|
| ︙ | ︙ | |||
3869 3870 3871 3872 3873 3874 3875 |
}
/*
* Check for the trivial cases where we can use a direct lookup.
*/
TclNewObj(resultObj);
| | < < | < | | 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 |
}
/*
* Check for the trivial cases where we can use a direct lookup.
*/
TclNewObj(resultObj);
pattern = AsStr(patternObj);
if ((mode == OPT_GLOB && TrivialPattern(pattern)) || (mode == OPT_EXACT)) {
varPtr2 = VarHashFindVar(varPtr->value.tablePtr, patternObj);
if (varPtr2 && !TclIsVarUndefined(varPtr2)) {
/*
* This can't fail; lappending to an empty object always works.
*/
Tcl_ListObjAppendElement(NULL, resultObj, VarHashGetKey(varPtr2));
}
Tcl_SetObjResult(interp, resultObj);
|
| ︙ | ︙ | |||
3952 3953 3954 3955 3956 3957 3958 |
TclFindArrayPtrElements(
Var *arrayPtr,
Tcl_HashTable *tablePtr)
{
Var *varPtr;
Tcl_HashSearch search;
| < | | 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 |
TclFindArrayPtrElements(
Var *arrayPtr,
Tcl_HashTable *tablePtr)
{
Var *varPtr;
Tcl_HashSearch search;
if (!arrayPtr || !TclIsVarArray(arrayPtr) || TclIsVarUndefined(arrayPtr)) {
return;
}
for (varPtr=VarHashFirstVar(arrayPtr->value.tablePtr, &search);
varPtr!=NULL ; varPtr=VarHashNextVar(&search)) {
Tcl_HashEntry *hPtr;
Tcl_Obj *nameObj;
|
| ︙ | ︙ | |||
4006 4007 4008 4009 4010 4011 4012 |
int result;
if (objc != 3) {
Tcl_WrongNumArgs(interp, 1, objv, "arrayName list");
return TCL_ERROR;
}
| | | | > | | 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 |
int result;
if (objc != 3) {
Tcl_WrongNumArgs(interp, 1, objv, "arrayName list");
return TCL_ERROR;
}
if (LocateArray(interp, objv[1], NULL, NULL) != TCL_OK) {
return TCL_ERROR;
}
arrayNameObj = objv[1];
varPtr = TclObjLookupVarEx(interp, arrayNameObj, NULL,
/*flags*/ TCL_LEAVE_ERR_MSG, /*msg*/ "set", /*createPart1*/ 1,
/*createPart2*/ 1, &arrayPtr);
if (!varPtr) {
return TCL_ERROR;
}
if (arrayPtr) {
CleanupVar(varPtr, arrayPtr);
TclObjVarErrMsg(interp, arrayNameObj, NULL, "set", NEEDARRAY,
NOT_IN_LVT);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
TclGetString(arrayNameObj), (char *)NULL);
return TCL_ERROR;
}
/*
* Install the contents of the dictionary or list into the array.
*/
arrayElemObj = objv[2];
if (TclHasInternalRep(arrayElemObj, &tclDictType) && !arrayElemObj->bytes) {
Tcl_Obj *keyPtr, *valuePtr;
Tcl_DictSearch search;
int done;
Tcl_Size size;
if (Tcl_DictObjSize(interp, arrayElemObj, &size) != TCL_OK) {
return TCL_ERROR;
|
| ︙ | ︙ | |||
4062 4063 4064 4065 4066 4067 4068 |
Tcl_DictObjNext(&search, &keyPtr, &valuePtr, &done)) {
/*
* At this point, it would be nice if the key was directly usable
* by the array. This isn't the case though.
*/
Var *elemVarPtr = TclLookupArrayElement(interp, arrayNameObj,
| | | | | | 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 |
Tcl_DictObjNext(&search, &keyPtr, &valuePtr, &done)) {
/*
* At this point, it would be nice if the key was directly usable
* by the array. This isn't the case though.
*/
Var *elemVarPtr = TclLookupArrayElement(interp, arrayNameObj,
keyPtr, TCL_LEAVE_ERR_MSG, "set", 1, 1, varPtr, NOT_IN_LVT);
if (!elemVarPtr ||
!TclPtrSetVarIdx(interp, elemVarPtr, varPtr, arrayNameObj,
keyPtr, valuePtr, TCL_LEAVE_ERR_MSG, NOT_IN_LVT)) {
Tcl_DictObjDone(&search);
return TCL_ERROR;
}
}
return TCL_OK;
} else {
/*
|
| ︙ | ︙ | |||
4088 4089 4090 4091 4092 4093 4094 |
result = TclListObjLength(interp, arrayElemObj, &elemLen);
if (result != TCL_OK) {
return result;
}
if (elemLen & 1) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
| | > | 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 |
result = TclListObjLength(interp, arrayElemObj, &elemLen);
if (result != TCL_OK) {
return result;
}
if (elemLen & 1) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"list must have an even number of elements",
TCL_AUTO_LENGTH));
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "FORMAT", (char *)NULL);
return TCL_ERROR;
}
if (elemLen == 0) {
goto ensureArray;
}
result = TclListObjGetElements(interp, arrayElemObj,
|
| ︙ | ︙ | |||
4113 4114 4115 4116 4117 4118 4119 |
copyListObj = TclListObjCopy(NULL, arrayElemObj);
if (!copyListObj) {
return TCL_ERROR;
}
for (i=0 ; i<elemLen ; i+=2) {
Var *elemVarPtr = TclLookupArrayElement(interp, arrayNameObj,
| | > | | | | | | | 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 |
copyListObj = TclListObjCopy(NULL, arrayElemObj);
if (!copyListObj) {
return TCL_ERROR;
}
for (i=0 ; i<elemLen ; i+=2) {
Var *elemVarPtr = TclLookupArrayElement(interp, arrayNameObj,
elemPtrs[i], TCL_LEAVE_ERR_MSG, "set", 1, 1, varPtr,
NOT_IN_LVT);
if (!elemVarPtr ||
!TclPtrSetVarIdx(interp, elemVarPtr, varPtr, arrayNameObj,
elemPtrs[i], elemPtrs[i + 1], TCL_LEAVE_ERR_MSG,
NOT_IN_LVT)) {
result = TCL_ERROR;
break;
}
}
Tcl_DecrRefCount(copyListObj);
return result;
}
/*
* The list is empty make sure we have an array, or create one if
* necessary.
*/
ensureArray:
if (varPtr) {
if (TclIsVarArray(varPtr)) {
/*
* Already an array, done.
*/
return TCL_OK;
}
if (TclIsVarArrayElement(varPtr) || !TclIsVarUndefined(varPtr)) {
/*
* Either an array element, or a scalar: lose!
*/
TclObjVarErrMsg(interp, arrayNameObj, NULL, "array set",
NEEDARRAY, NOT_IN_LVT);
Tcl_SetErrorCode(interp, "TCL", "WRITE", "ARRAY", (char *)NULL);
return TCL_ERROR;
}
}
TclInitArrayVar(varPtr);
return TCL_OK;
}
|
| ︙ | ︙ | |||
4190 4191 4192 4193 4194 4195 4196 |
int isArray, size = 0;
if (objc != 2) {
Tcl_WrongNumArgs(interp, 1, objv, "arrayName");
return TCL_ERROR;
}
| | | 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 |
int isArray, size = 0;
if (objc != 2) {
Tcl_WrongNumArgs(interp, 1, objv, "arrayName");
return TCL_ERROR;
}
if (LocateArray(interp, objv[1], &varPtr, &isArray) != TCL_OK) {
return TCL_ERROR;
}
/* We can only iterate over the array if it exists... */
if (isArray) {
/*
|
| ︙ | ︙ | |||
4250 4251 4252 4253 4254 4255 4256 |
if (objc != 2) {
Tcl_WrongNumArgs(interp, 1, objv, "arrayName");
return TCL_ERROR;
}
varNameObj = objv[1];
| | | | | | 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 |
if (objc != 2) {
Tcl_WrongNumArgs(interp, 1, objv, "arrayName");
return TCL_ERROR;
}
varNameObj = objv[1];
if (LocateArray(interp, varNameObj, &varPtr, &isArray) != TCL_OK) {
return TCL_ERROR;
}
if (!isArray) {
return NotArrayError(interp, varNameObj);
}
stats = Tcl_HashStats((Tcl_HashTable *) varPtr->value.tablePtr);
if (!stats) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"error reading array statistics", TCL_AUTO_LENGTH));
return TCL_ERROR;
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(stats, TCL_AUTO_LENGTH));
Tcl_Free(stats);
return TCL_OK;
}
/*
*----------------------------------------------------------------------
*
|
| ︙ | ︙ | |||
4297 4298 4299 4300 4301 4302 4303 |
int objc,
Tcl_Obj *const objv[])
{
Var *varPtr, *varPtr2, *protectedVarPtr;
Tcl_Obj *varNameObj, *patternObj, *nameObj;
Tcl_HashSearch search;
const char *pattern;
| | | | | | 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 |
int objc,
Tcl_Obj *const objv[])
{
Var *varPtr, *varPtr2, *protectedVarPtr;
Tcl_Obj *varNameObj, *patternObj, *nameObj;
Tcl_HashSearch search;
const char *pattern;
int unsetFlags = 0; /* Should this be TCL_LEAVE_ERR_MSG? */
int isArray;
switch (objc) {
case 2:
varNameObj = objv[1];
patternObj = NULL;
break;
case 3:
varNameObj = objv[1];
patternObj = objv[2];
break;
default:
Tcl_WrongNumArgs(interp, 1, objv, "arrayName ?pattern?");
return TCL_ERROR;
}
if (LocateArray(interp, varNameObj, &varPtr, &isArray) != TCL_OK) {
return TCL_ERROR;
}
if (!isArray) {
return TCL_OK;
}
if (!patternObj) {
/*
* When no pattern is given, just unset the whole array.
*/
return TclObjUnsetVar2(interp, varNameObj, NULL, 0);
}
/*
* With a trivial pattern, we can just unset.
*/
pattern = TclGetString(patternObj);
if (TrivialPattern(pattern)) {
varPtr2 = VarHashFindVar(varPtr->value.tablePtr, patternObj);
if (!varPtr2 || TclIsVarUndefined(varPtr2)) {
return TCL_OK;
}
return TclPtrUnsetVarIdx(interp, varPtr2, varPtr, varNameObj,
patternObj, unsetFlags, NOT_IN_LVT);
}
/*
* Non-trivial case (well, deeply tricky really). We peek inside the hash
* iterator in order to allow us to guarantee that the following element
* in the array will not be scrubbed until we have dealt with it. This
* stops the overall iterator from ending up pointing into deallocated
|
| ︙ | ︙ | |||
4370 4371 4372 4373 4374 4375 4376 | /* * Guard the next (peeked) item in the search chain by incrementing * its refcount. This guarantees that the hash table iterator won't be * dangling on the next time through the loop. */ | | | | | 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 |
/*
* Guard the next (peeked) item in the search chain by incrementing
* its refcount. This guarantees that the hash table iterator won't be
* dangling on the next time through the loop.
*/
if (search.nextEntryPtr) {
protectedVarPtr = VarHashGetValue(search.nextEntryPtr);
VarHashRefCount(protectedVarPtr)++;
} else {
protectedVarPtr = NULL;
}
/*
* If the variable is undefined, clean it out as it has been hit by
* something else (i.e., an unset trace).
*/
if (TclIsVarUndefined(varPtr2)) {
CleanupVar(varPtr2, varPtr);
continue;
}
nameObj = VarHashGetKey(varPtr2);
if (PatternMatch(pattern, nameObj)
&& TclPtrUnsetVarIdx(interp, varPtr2, varPtr, varNameObj,
nameObj, unsetFlags, NOT_IN_LVT) != TCL_OK) {
/*
* If we incremented a refcount, we must decrement it here as we
* will not be coming back properly due to the error.
*/
if (protectedVarPtr) {
VarHashRefCount(protectedVarPtr)--;
|
| ︙ | ︙ | |||
4483 4484 4485 4486 4487 4488 4489 |
int otherFlags, /* 0, TCL_GLOBAL_ONLY or TCL_NAMESPACE_ONLY:
* indicates scope of "other" variable. */
Tcl_Obj *myNamePtr, /* Name of variable which will refer to
* otherP1/otherP2. Must be a scalar. */
int myFlags, /* 0, TCL_GLOBAL_ONLY or TCL_NAMESPACE_ONLY:
* indicates scope of myName. */
int index) /* If the variable to be linked is an indexed
| | > | | < | | | | 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600 4601 4602 |
int otherFlags, /* 0, TCL_GLOBAL_ONLY or TCL_NAMESPACE_ONLY:
* indicates scope of "other" variable. */
Tcl_Obj *myNamePtr, /* Name of variable which will refer to
* otherP1/otherP2. Must be a scalar. */
int myFlags, /* 0, TCL_GLOBAL_ONLY or TCL_NAMESPACE_ONLY:
* indicates scope of myName. */
int index) /* If the variable to be linked is an indexed
* scalar, this is its index. Otherwise,
* NOT_IN_LVT (-1) */
{
Interp *iPtr = (Interp *) interp;
Var *otherPtr, *arrayPtr;
CallFrame *varFramePtr;
/*
* Find "other" in "framePtr". If not looking up other in just the current
* namespace, temporarily replace the current var frame pointer in the
* interpreter in order to use TclObjLookupVar.
*/
if (!framePtr) {
framePtr = iPtr->rootFramePtr;
}
varFramePtr = iPtr->varFramePtr;
if (!(otherFlags & TCL_NAMESPACE_ONLY)) {
iPtr->varFramePtr = framePtr;
}
otherPtr = TclObjLookupVar(interp, otherP1Ptr, otherP2,
(otherFlags | TCL_LEAVE_ERR_MSG), "access",
/*createPart1*/ 1, /*createPart2*/ 1, &arrayPtr);
if (!(otherFlags & TCL_NAMESPACE_ONLY)) {
iPtr->varFramePtr = varFramePtr;
}
if (!otherPtr) {
return TCL_ERROR;
}
/*
* Check that we are not trying to create a namespace var linked to a
* local variable in a procedure. If we allowed this, the local
* variable in the shorter-lived procedure frame could go away leaving
* the namespace var's reference invalid.
*/
if (index < 0) {
if (!(arrayPtr ? (TclIsVarInHash(arrayPtr) && TclGetVarNsPtr(arrayPtr))
: (TclIsVarInHash(otherPtr) && TclGetVarNsPtr(otherPtr)))
&& ((myFlags & SCOPES)
|| !varFramePtr
|| !HasLocalVars(varFramePtr)
|| (strstr(TclGetString(myNamePtr), "::") != NULL))) {
Tcl_SetObjResult((Tcl_Interp *) iPtr, Tcl_ObjPrintf(
"bad variable name \"%s\": can't create namespace "
"variable that refers to procedure variable",
TclGetString(myNamePtr)));
Tcl_SetErrorCode(interp, "TCL", "UPVAR", "INVERTED", (char *)NULL);
|
| ︙ | ︙ | |||
4570 4571 4572 4573 4574 4575 4576 |
* error messages, too. */
Var *otherPtr, /* Pointer to the variable being linked-to. */
const char *myName, /* Name of variable which will refer to
* otherP1/otherP2. Must be a scalar. */
int myFlags, /* 0, TCL_GLOBAL_ONLY or TCL_NAMESPACE_ONLY:
* indicates scope of myName. */
int index) /* If the variable to be linked is an indexed
| | > | < < < < < < | < < | > | | > | | | | 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 |
* error messages, too. */
Var *otherPtr, /* Pointer to the variable being linked-to. */
const char *myName, /* Name of variable which will refer to
* otherP1/otherP2. Must be a scalar. */
int myFlags, /* 0, TCL_GLOBAL_ONLY or TCL_NAMESPACE_ONLY:
* indicates scope of myName. */
int index) /* If the variable to be linked is an indexed
* scalar, this is its index. Otherwise,
* NOT_IN_LVT (-1) */
{
Tcl_Obj *myNamePtr = AsObj(myName);
int result = TclPtrObjMakeUpvarIdx(interp, otherPtr, myNamePtr, myFlags,
index);
Tcl_BounceRefCount(myNamePtr);
return result;
}
int
TclPtrObjMakeUpvar(
Tcl_Interp *interp, /* Interpreter containing variables. Used for
* error messages, too. */
Tcl_Var otherPtr, /* Pointer to the variable being linked-to. */
Tcl_Obj *myNamePtr, /* Name of variable which will refer to
* otherP1/otherP2. Must be a scalar. */
int myFlags) /* 0, TCL_GLOBAL_ONLY or TCL_NAMESPACE_ONLY:
* indicates scope of myName. */
{
return TclPtrObjMakeUpvarIdx(interp, (Var *) otherPtr, myNamePtr, myFlags,
NOT_IN_LVT);
}
/* Callers must Incr myNamePtr if they plan to Decr it. */
int
TclPtrObjMakeUpvarIdx(
Tcl_Interp *interp, /* Interpreter containing variables. Used for
* error messages, too. */
Var *otherPtr, /* Pointer to the variable being linked-to. */
Tcl_Obj *myNamePtr, /* Name of variable which will refer to
* otherP1/otherP2. Must be a scalar. */
int myFlags, /* 0, TCL_GLOBAL_ONLY or TCL_NAMESPACE_ONLY:
* indicates scope of myName. */
int index) /* If the variable to be linked is an indexed
* scalar, this is its index. Otherwise,
* NOT_IN_LVT (-1) */
{
Interp *iPtr = (Interp *) interp;
CallFrame *varFramePtr = iPtr->varFramePtr;
const char *errMsg, *p, *myName;
Var *varPtr;
if (index >= 0) {
if (!HasLocalVars(varFramePtr)) {
Tcl_Panic("ObjMakeUpvar called with an index outside from a proc");
}
varPtr = &varFramePtr->compiledLocals[index];
myNamePtr = localName(iPtr->varFramePtr, index);
myName = AsStr(myNamePtr);
} else {
/*
* Do not permit the new variable to look like an array reference, as
* it will not be reachable in that case [Bug 600812, TIP 184]. The
* "definition" of what "looks like an array reference" is consistent
* (and must remain consistent) with the code in TclObjLookupVar().
*/
myName = TclGetString(myNamePtr);
p = strstr(myName, "(");
if (p != NULL) {
p += strlen(p) - 1;
if (*p == ')') {
/*
* myName looks like an array reference.
*/
Tcl_SetObjResult((Tcl_Interp *) iPtr, Tcl_ObjPrintf(
"bad variable name \"%s\": can't create a scalar "
|
| ︙ | ︙ | |||
4663 4664 4665 4666 4667 4668 4669 | * upvar purposes: * - Bug #696893 - variable is either proc-local or in the current * namespace; never follow the second (global) resolution path. * - Bug #631741 - do not use special namespace or interp resolvers. */ varPtr = TclLookupSimpleVar(interp, myNamePtr, | | | | > | | 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 |
* upvar purposes:
* - Bug #696893 - variable is either proc-local or in the current
* namespace; never follow the second (global) resolution path.
* - Bug #631741 - do not use special namespace or interp resolvers.
*/
varPtr = TclLookupSimpleVar(interp, myNamePtr,
myFlags | TCL_AVOID_RESOLVERS, /*create*/ 1, &errMsg, &index);
if (!varPtr) {
TclObjVarErrMsg(interp, myNamePtr, NULL, "create", errMsg,
NOT_IN_LVT);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
TclGetString(myNamePtr), (char *)NULL);
return TCL_ERROR;
}
}
if (varPtr == otherPtr) {
Tcl_SetObjResult((Tcl_Interp *) iPtr, Tcl_NewStringObj(
"can't upvar from variable to itself", TCL_AUTO_LENGTH));
Tcl_SetErrorCode(interp, "TCL", "UPVAR", "SELF", (char *)NULL);
return TCL_ERROR;
}
if (TclIsVarTraced(varPtr)) {
Tcl_SetObjResult((Tcl_Interp *) iPtr, Tcl_ObjPrintf(
"variable \"%s\" has traces: can't use for upvar", myName));
|
| ︙ | ︙ | |||
4762 4763 4764 4765 4766 4767 4768 |
CallFrame *framePtr;
Tcl_Obj *part1Ptr, *localNamePtr;
if (TclGetFrame(interp, frameName, &framePtr) == -1) {
return TCL_ERROR;
}
| | < | < | > | | | 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 |
CallFrame *framePtr;
Tcl_Obj *part1Ptr, *localNamePtr;
if (TclGetFrame(interp, frameName, &framePtr) == -1) {
return TCL_ERROR;
}
part1Ptr = Tcl_NewStringObj(part1, TCL_AUTO_LENGTH);
localNamePtr = Tcl_NewStringObj(localNameStr, TCL_AUTO_LENGTH);
result = ObjMakeUpvar(interp, framePtr, part1Ptr, part2, 0,
localNamePtr, flags, NOT_IN_LVT);
Tcl_BounceRefCount(part1Ptr);
Tcl_BounceRefCount(localNamePtr);
return result;
}
/*
*----------------------------------------------------------------------
*
* Tcl_GetVariableFullName --
|
| ︙ | ︙ | |||
4817 4818 4819 4820 4821 4822 4823 |
/*
* Add the full name of the containing namespace (if any), followed by the
* "::" separator, then the variable name.
*/
nsPtr = TclGetVarNsPtr(varPtr);
if (nsPtr) {
| | | 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 |
/*
* Add the full name of the containing namespace (if any), followed by the
* "::" separator, then the variable name.
*/
nsPtr = TclGetVarNsPtr(varPtr);
if (nsPtr) {
Tcl_AppendToObj(objPtr, nsPtr->fullName, TCL_AUTO_LENGTH);
if (nsPtr != iPtr->globalNsPtr) {
Tcl_AppendToObj(objPtr, "::", 2);
}
}
if (TclIsVarInHash(varPtr)) {
if (!TclIsVarDeadHash(varPtr)) {
namePtr = VarHashGetKey(varPtr);
|
| ︙ | ︙ | |||
4873 4874 4875 4876 4877 4878 4879 |
return TCL_ERROR;
}
part1Ptr = objv[1];
varPtr = TclObjLookupVarEx(interp, part1Ptr, NULL, TCL_LEAVE_ERR_MSG,
"const", /*createPart1*/ 1, /*createPart2*/ 1, &arrayPtr);
if (TclIsVarArray(varPtr)) {
| | > | | > | | > | | | < > | 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979 4980 4981 4982 |
return TCL_ERROR;
}
part1Ptr = objv[1];
varPtr = TclObjLookupVarEx(interp, part1Ptr, NULL, TCL_LEAVE_ERR_MSG,
"const", /*createPart1*/ 1, /*createPart2*/ 1, &arrayPtr);
if (TclIsVarArray(varPtr)) {
TclObjVarErrMsg(interp, part1Ptr, NULL, "make constant", ISARRAY,
NOT_IN_LVT);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "CONST", (char *)NULL);
return TCL_ERROR;
}
if (TclIsVarArrayElement(varPtr)) {
if (TclIsVarUndefined(varPtr)) {
CleanupVar(varPtr, arrayPtr);
}
TclObjVarErrMsg(interp, part1Ptr, NULL, "make constant", ISARRAYELEMENT,
NOT_IN_LVT);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "CONST", (char *)NULL);
return TCL_ERROR;
}
/*
* If already exists, either a constant (no problem) or an error.
*/
if (!TclIsVarUndefined(varPtr)) {
if (TclIsVarConstant(varPtr)) {
return TCL_OK;
}
TclObjVarErrMsg(interp, part1Ptr, NULL, "make constant", EXISTS,
NOT_IN_LVT);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "CONST", (char *)NULL);
return TCL_ERROR;
}
/*
* Make the variable and flag it as a constant.
*/
if (!TclPtrSetVar(interp, (Tcl_Var) varPtr, NULL, objv[1], NULL,
objv[2], TCL_LEAVE_ERR_MSG)) {
if (TclIsVarUndefined(varPtr)) {
CleanupVar(varPtr, arrayPtr);
}
return TCL_ERROR;
}
TclSetVarConstant(varPtr);
return TCL_OK;
}
/*
*----------------------------------------------------------------------
*
|
| ︙ | ︙ | |||
4977 4978 4979 4980 4981 4982 4983 |
if ((*tail == ':') && (tail > varName)) {
tail++;
}
if (tail == varName) {
tailPtr = objPtr;
} else {
| | | | 5038 5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 |
if ((*tail == ':') && (tail > varName)) {
tail++;
}
if (tail == varName) {
tailPtr = objPtr;
} else {
tailPtr = Tcl_NewStringObj(tail, TCL_AUTO_LENGTH);
Tcl_IncrRefCount(tailPtr);
}
/*
* Link to the variable "varName" in the global :: namespace.
*/
result = ObjMakeUpvar(interp, NULL, objPtr, NULL,
TCL_GLOBAL_ONLY, /*myName*/ tailPtr, /*myFlags*/ 0, NOT_IN_LVT);
if (tail != varName) {
Tcl_DecrRefCount(tailPtr);
}
if (result != TCL_OK) {
return result;
|
| ︙ | ︙ | |||
5059 5060 5061 5062 5063 5064 5065 | varNamePtr = objv[i]; varName = TclGetString(varNamePtr); varPtr = TclObjLookupVarEx(interp, varNamePtr, NULL, (TCL_NAMESPACE_ONLY | TCL_LEAVE_ERR_MSG), "define", /*createPart1*/ 1, /*createPart2*/ 0, &arrayPtr); | | | | | | | | | 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146 5147 5148 5149 5150 5151 5152 5153 5154 5155 5156 5157 5158 5159 5160 5161 5162 5163 5164 5165 5166 5167 5168 5169 |
varNamePtr = objv[i];
varName = TclGetString(varNamePtr);
varPtr = TclObjLookupVarEx(interp, varNamePtr, NULL,
(TCL_NAMESPACE_ONLY | TCL_LEAVE_ERR_MSG), "define",
/*createPart1*/ 1, /*createPart2*/ 0, &arrayPtr);
if (arrayPtr) {
/*
* Variable cannot be an element in an array. If arrayPtr is
* non-NULL, it is, so throw up an error and return.
*/
TclObjVarErrMsg(interp, varNamePtr, NULL, "define",
ISARRAYELEMENT, NOT_IN_LVT);
Tcl_SetErrorCode(interp, "TCL", "UPVAR", "LOCAL_ELEMENT", (char *)NULL);
return TCL_ERROR;
}
if (!varPtr) {
return TCL_ERROR;
}
/*
* Mark the variable as a namespace variable and increment its
* reference count so that it will persist until its namespace is
* destroyed or until the variable is unset.
*/
TclSetVarNamespaceVar(varPtr);
/*
* If a value was specified, set the variable to that value.
* Otherwise, if the variable is new, leave it undefined. (If the
* variable already exists and no value was specified, leave its value
* unchanged; just create the local link if we're in a Tcl procedure).
*/
if (i + 1 < objc) { /* A value was specified. */
varValuePtr = TclPtrSetVarIdx(interp, varPtr, arrayPtr,
varNamePtr, NULL, objv[i + 1],
(TCL_NAMESPACE_ONLY | TCL_LEAVE_ERR_MSG), NOT_IN_LVT);
if (!varValuePtr) {
return TCL_ERROR;
}
}
/*
* If we are executing inside a Tcl procedure, create a local variable
* linked to the new namespace variable "varName".
|
| ︙ | ︙ | |||
5129 5130 5131 5132 5133 5134 5135 |
* Create a local link "tail" to the variable "varName" in the
* current namespace.
*/
if (tail == varName) {
tailPtr = varNamePtr;
} else {
| | < | | | 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 |
* Create a local link "tail" to the variable "varName" in the
* current namespace.
*/
if (tail == varName) {
tailPtr = varNamePtr;
} else {
tailPtr = Tcl_NewStringObj(tail, TCL_AUTO_LENGTH);
}
result = ObjMakeUpvar(interp, NULL, varNamePtr, /*otherP2*/ NULL,
/*otherFlags*/ TCL_NAMESPACE_ONLY,
/*myName*/ tailPtr, /*myFlags*/ 0, NOT_IN_LVT);
if (tail != varName) {
Tcl_BounceRefCount(tailPtr);
}
if (result != TCL_OK) {
return result;
}
}
}
|
| ︙ | ︙ | |||
5236 5237 5238 5239 5240 5241 5242 |
/*
* Iterate over each (other variable, local variable) pair. Divide the
* other variable name into two parts, then call MakeUpvar to do all the
* work of linking it to the local variable.
*/
for (; objc>0 ; objc-=2, objv+=2) {
| | | | 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 5308 5309 5310 5311 |
/*
* Iterate over each (other variable, local variable) pair. Divide the
* other variable name into two parts, then call MakeUpvar to do all the
* work of linking it to the local variable.
*/
for (; objc>0 ; objc-=2, objv+=2) {
result = ObjMakeUpvar(interp, framePtr, /*othervarName*/ objv[0],
NULL, 0, /*myVarName*/ objv[1], /*flags*/ 0, NOT_IN_LVT);
if (result != TCL_OK) {
return TCL_ERROR;
}
}
return TCL_OK;
}
|
| ︙ | ︙ | |||
5282 5283 5284 5285 5286 5287 5288 |
char *end;
if (varPtr->flags & VAR_SEARCH_ACTIVE) {
Tcl_HashEntry *hPtr =
Tcl_FindHashEntry(&iPtr->varSearches, varPtr);
/* First look for same (Tcl_Obj *) */
| | | | | | | | 5342 5343 5344 5345 5346 5347 5348 5349 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 5365 5366 5367 5368 5369 5370 5371 5372 5373 5374 5375 |
char *end;
if (varPtr->flags & VAR_SEARCH_ACTIVE) {
Tcl_HashEntry *hPtr =
Tcl_FindHashEntry(&iPtr->varSearches, varPtr);
/* First look for same (Tcl_Obj *) */
for (searchPtr = (ArraySearch *) Tcl_GetHashValue(hPtr);
searchPtr != NULL; searchPtr = searchPtr->nextPtr) {
if (searchPtr->name == handleObj) {
return searchPtr;
}
}
/* Fallback: do string compares. */
for (searchPtr = (ArraySearch *) Tcl_GetHashValue(hPtr);
searchPtr != NULL; searchPtr = searchPtr->nextPtr) {
if (!strcmp(TclGetString(searchPtr->name), handle)) {
return searchPtr;
}
}
}
if ((handle[0] != 's') || (handle[1] != '-')
|| (strtoul(handle + 2, &end, 10), end == (handle + 2))
|| (*end != '-')) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"illegal search identifier \"%s\"", handle));
} else if (strcmp(end + 1, TclGetString(varNamePtr))) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"search identifier \"%s\" isn't for variable \"%s\"",
handle, TclGetString(varNamePtr)));
} else {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"couldn't find search \"%s\"", handle));
}
|
| ︙ | ︙ | |||
5341 5342 5343 5344 5345 5346 5347 |
* deleted. */
{
ArraySearch *searchPtr, *nextPtr;
Tcl_HashEntry *sPtr;
if (arrayVarPtr->flags & VAR_SEARCH_ACTIVE) {
sPtr = Tcl_FindHashEntry(&iPtr->varSearches, arrayVarPtr);
| | | | 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 |
* deleted. */
{
ArraySearch *searchPtr, *nextPtr;
Tcl_HashEntry *sPtr;
if (arrayVarPtr->flags & VAR_SEARCH_ACTIVE) {
sPtr = Tcl_FindHashEntry(&iPtr->varSearches, arrayVarPtr);
for (searchPtr = (ArraySearch *) Tcl_GetHashValue(sPtr);
searchPtr != NULL; searchPtr = nextPtr) {
nextPtr = searchPtr->nextPtr;
Tcl_DecrRefCount(searchPtr->name);
Tcl_Free(searchPtr);
}
arrayVarPtr->flags &= ~VAR_SEARCH_ACTIVE;
Tcl_DeleteHashEntry(sPtr);
}
|
| ︙ | ︙ | |||
5376 5377 5378 5379 5380 5381 5382 |
void
TclDeleteNamespaceVars(
Namespace *nsPtr)
{
TclVarHashTable *tablePtr = &nsPtr->varTable;
Tcl_Interp *interp = nsPtr->interp;
| | | 5436 5437 5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 |
void
TclDeleteNamespaceVars(
Namespace *nsPtr)
{
TclVarHashTable *tablePtr = &nsPtr->varTable;
Tcl_Interp *interp = nsPtr->interp;
Interp *iPtr = (Interp *) interp;
Tcl_HashSearch search;
int flags = 0;
Var *varPtr;
/*
* Determine what flags to pass to the trace callback functions.
*/
|
| ︙ | ︙ | |||
5398 5399 5400 5401 5402 5403 5404 |
for (varPtr = VarHashFirstVar(tablePtr, &search); varPtr != NULL;
varPtr = VarHashFirstVar(tablePtr, &search)) {
Tcl_Obj *objPtr;
TclNewObj(objPtr);
VarHashRefCount(varPtr)++; /* Make sure we get to remove from
* hash. */
Tcl_GetVariableFullName(interp, (Tcl_Var) varPtr, objPtr);
| | | | | 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468 5469 5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 |
for (varPtr = VarHashFirstVar(tablePtr, &search); varPtr != NULL;
varPtr = VarHashFirstVar(tablePtr, &search)) {
Tcl_Obj *objPtr;
TclNewObj(objPtr);
VarHashRefCount(varPtr)++; /* Make sure we get to remove from
* hash. */
Tcl_GetVariableFullName(interp, (Tcl_Var) varPtr, objPtr);
UnsetVarStruct(varPtr, NULL, iPtr, /*part1*/ objPtr,
NULL, flags, NOT_IN_LVT);
/*
* We just unset the variable. However, an unset trace might
* have re-set it, or might have re-established traces on it.
* This namespace and its vartable are going away unconditionally,
* so we cannot let such things linger. That would be a leak.
*
* First we destroy all traces. ...
*/
if (TclIsVarTraced(varPtr)) {
Tcl_HashEntry *tPtr = Tcl_FindHashEntry(&iPtr->varTraces, varPtr);
VarTrace *tracePtr = (VarTrace *) Tcl_GetHashValue(tPtr);
ActiveVarTrace *activePtr;
while (tracePtr) {
VarTrace *prevPtr = tracePtr;
tracePtr = tracePtr->nextPtr;
prevPtr->nextPtr = NULL;
|
| ︙ | ︙ | |||
5438 5439 5440 5441 5442 5443 5444 |
/*
* ...and then, if the variable still holds a value, we unset it
* again. This time with no traces left, we're sure it goes away.
*/
if (!TclIsVarUndefined(varPtr)) {
| | | | | 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508 5509 5510 5511 5512 5513 5514 5515 |
/*
* ...and then, if the variable still holds a value, we unset it
* again. This time with no traces left, we're sure it goes away.
*/
if (!TclIsVarUndefined(varPtr)) {
UnsetVarStruct(varPtr, NULL, iPtr, /*part1*/ objPtr,
NULL, flags, NOT_IN_LVT);
}
Tcl_BounceRefCount(objPtr); /* free no longer needed obj */
VarHashRefCount(varPtr)--;
VarHashDeleteEntry(varPtr);
}
VarHashDeleteTable(tablePtr);
}
/*
|
| ︙ | ︙ | |||
5494 5495 5496 5497 5498 5499 5500 |
} else if (tablePtr == &currNsPtr->varTable) {
flags |= TCL_NAMESPACE_ONLY;
}
for (varPtr = VarHashFirstVar(tablePtr, &search); varPtr != NULL;
varPtr = VarHashFirstVar(tablePtr, &search)) {
UnsetVarStruct(varPtr, NULL, iPtr, VarHashGetKey(varPtr), NULL, flags,
| | | 5554 5555 5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 |
} else if (tablePtr == &currNsPtr->varTable) {
flags |= TCL_NAMESPACE_ONLY;
}
for (varPtr = VarHashFirstVar(tablePtr, &search); varPtr != NULL;
varPtr = VarHashFirstVar(tablePtr, &search)) {
UnsetVarStruct(varPtr, NULL, iPtr, VarHashGetKey(varPtr), NULL, flags,
NOT_IN_LVT);
VarHashDeleteEntry(varPtr);
}
VarHashDeleteTable(tablePtr);
}
/*
*----------------------------------------------------------------------
|
| ︙ | ︙ | |||
5584 5585 5586 5587 5588 5589 5590 |
Var *elPtr;
ActiveVarTrace *activePtr;
Tcl_Obj *objPtr;
VarTrace *tracePtr;
for (elPtr = VarHashFirstVar(varPtr->value.tablePtr, &search);
elPtr != NULL; elPtr = VarHashNextVar(&search)) {
| | | 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 5656 5657 5658 |
Var *elPtr;
ActiveVarTrace *activePtr;
Tcl_Obj *objPtr;
VarTrace *tracePtr;
for (elPtr = VarHashFirstVar(varPtr->value.tablePtr, &search);
elPtr != NULL; elPtr = VarHashNextVar(&search)) {
if (TclIsVarScalar(elPtr) && !TclIsVarUndefined(elPtr)) {
objPtr = elPtr->value.objPtr;
TclDecrRefCount(objPtr);
elPtr->value.objPtr = NULL;
}
/*
* Lie about the validity of the hashtable entry. In this way the
|
| ︙ | ︙ | |||
5606 5607 5608 5609 5610 5611 5612 |
*/
if (elPtr->flags & VAR_TRACED_UNSET) {
Tcl_Obj *elNamePtr = VarHashGetKey(elPtr);
elPtr->flags &= ~VAR_TRACE_ACTIVE;
TclObjCallVarTraces(iPtr, NULL, elPtr, arrayNamePtr,
| | | | 5666 5667 5668 5669 5670 5671 5672 5673 5674 5675 5676 5677 5678 5679 5680 5681 5682 5683 |
*/
if (elPtr->flags & VAR_TRACED_UNSET) {
Tcl_Obj *elNamePtr = VarHashGetKey(elPtr);
elPtr->flags &= ~VAR_TRACE_ACTIVE;
TclObjCallVarTraces(iPtr, NULL, elPtr, arrayNamePtr,
elNamePtr, flags, /*leaveErrMsg*/ 0, index);
}
tPtr = Tcl_FindHashEntry(&iPtr->varTraces, elPtr);
tracePtr = (VarTrace *) Tcl_GetHashValue(tPtr);
while (tracePtr) {
VarTrace *prevPtr = tracePtr;
tracePtr = tracePtr->nextPtr;
prevPtr->nextPtr = NULL;
Tcl_EventuallyFree(prevPtr, TCL_DYNAMIC);
}
|
| ︙ | ︙ | |||
5668 5669 5670 5671 5672 5673 5674 |
Tcl_Interp *interp, /* Interpreter in which to record message. */
const char *part1,
const char *part2, /* Variable's two-part name. */
const char *operation, /* String describing operation that failed,
* e.g. "read", "set", or "unset". */
const char *reason) /* String describing why operation failed. */
{
| | | < < | < | | < | < | | | | | | | | 5728 5729 5730 5731 5732 5733 5734 5735 5736 5737 5738 5739 5740 5741 5742 5743 5744 5745 5746 5747 5748 5749 5750 5751 5752 5753 5754 5755 5756 5757 5758 5759 5760 5761 5762 5763 5764 5765 5766 5767 5768 5769 5770 5771 5772 5773 5774 5775 5776 5777 5778 5779 5780 5781 5782 5783 5784 5785 5786 5787 5788 5789 |
Tcl_Interp *interp, /* Interpreter in which to record message. */
const char *part1,
const char *part2, /* Variable's two-part name. */
const char *operation, /* String describing operation that failed,
* e.g. "read", "set", or "unset". */
const char *reason) /* String describing why operation failed. */
{
Tcl_Obj *part1Ptr = Tcl_NewStringObj(part1, TCL_AUTO_LENGTH);
Tcl_Obj *part2Ptr = AsObj(part2);
TclObjVarErrMsg(interp, part1Ptr, part2Ptr, operation, reason, NOT_IN_LVT);
Tcl_BounceRefCount(part1Ptr);
Tcl_BounceRefCount(part2Ptr);
}
void
TclObjVarErrMsg(
Tcl_Interp *interp, /* Interpreter in which to record message. */
Tcl_Obj *part1Ptr, /* (may be NULL, if index >= 0) */
Tcl_Obj *part2Ptr, /* Variable's two-part name. */
const char *operation, /* String describing operation that failed,
* e.g. "read", "set", or "unset". */
const char *reason, /* String describing why operation failed. */
int index) /* Index into the local variable table of the
* variable, or NOT_IN_LVT (-1). Only used when
* part1Ptr is NULL. */
{
if (!part1Ptr) {
if (index == NOT_IN_LVT) {
Tcl_Panic("invalid part1Ptr and invalid index together");
}
part1Ptr = localName(((Interp *) interp)->varFramePtr, index);
}
Tcl_SetObjResult(interp, Tcl_ObjPrintf("can't %s \"%s%s%s%s\": %s",
operation, TclGetString(part1Ptr), (part2Ptr ? "(" : ""),
(part2Ptr ? TclGetString(part2Ptr) : ""), (part2Ptr ? ")" : ""),
reason));
}
/*
*----------------------------------------------------------------------
*
* Internal functions for variable name object types --
*
*----------------------------------------------------------------------
*/
/*
* localVarName -
*
* INTERNALREP DEFINITION:
* twoPtrValue.ptr1: pointer to name obj in varFramePtr->localCache
* or NULL if it is this same obj
* twoPtrValue.ptr2: index into locals table
*/
static void
FreeLocalVarName(
Tcl_Obj *objPtr)
{
Tcl_Size index;
|
| ︙ | ︙ | |||
5757 5758 5759 5760 5761 5762 5763 |
LocalSetInternalRep(dupPtr, index, namePtr);
}
/*
* parsedVarName -
*
* INTERNALREP DEFINITION:
| | | | | | | 5812 5813 5814 5815 5816 5817 5818 5819 5820 5821 5822 5823 5824 5825 5826 5827 5828 5829 5830 5831 5832 5833 5834 5835 5836 5837 5838 5839 5840 5841 5842 5843 5844 5845 5846 5847 5848 5849 5850 5851 5852 5853 5854 5855 5856 5857 |
LocalSetInternalRep(dupPtr, index, namePtr);
}
/*
* parsedVarName -
*
* INTERNALREP DEFINITION:
* twoPtrValue.ptr1: pointer to the array name Tcl_Obj (NULL if scalar)
* twoPtrValue.ptr2: pointer to the element name string (owned by this
* Tcl_Obj), or NULL if it is a scalar variable
*/
static void
FreeParsedVarName(
Tcl_Obj *objPtr)
{
Tcl_Obj *arrayPtr, *elem;
int parsed;
ParsedGetInternalRep(objPtr, parsed, arrayPtr, elem);
parsed++; /* Silence compiler. */
if (arrayPtr) {
TclDecrRefCount(arrayPtr);
TclDecrRefCount(elem);
}
}
static void
DupParsedVarName(
Tcl_Obj *srcPtr,
Tcl_Obj *dupPtr)
{
Tcl_Obj *arrayPtr, *elem;
int parsed;
ParsedGetInternalRep(srcPtr, parsed, arrayPtr, elem);
parsed++; /* Silence compiler. */
ParsedSetInternalRep(dupPtr, arrayPtr, elem);
}
/*
*----------------------------------------------------------------------
*
* Tcl_FindNamespaceVar -- MOVED OVER from tclNamesp.c
|
| ︙ | ︙ | |||
5836 5837 5838 5839 5840 5841 5842 |
* TCL_NAMESPACE_ONLY (look up only in
* contextNsPtr, or the current namespace if
* contextNsPtr is NULL), and
* TCL_LEAVE_ERR_MSG. If both TCL_GLOBAL_ONLY
* and TCL_NAMESPACE_ONLY are given,
* TCL_GLOBAL_ONLY is ignored. */
{
| | | < | | 5891 5892 5893 5894 5895 5896 5897 5898 5899 5900 5901 5902 5903 5904 5905 5906 5907 5908 |
* TCL_NAMESPACE_ONLY (look up only in
* contextNsPtr, or the current namespace if
* contextNsPtr is NULL), and
* TCL_LEAVE_ERR_MSG. If both TCL_GLOBAL_ONLY
* and TCL_NAMESPACE_ONLY are given,
* TCL_GLOBAL_ONLY is ignored. */
{
Tcl_Obj *namePtr = Tcl_NewStringObj(name, TCL_AUTO_LENGTH);
Tcl_Var var = ObjFindNamespaceVar(interp, namePtr, contextNsPtr, flags);
Tcl_BounceRefCount(namePtr);
return var;
}
static Tcl_Var
ObjFindNamespaceVar(
Tcl_Interp *interp, /* The interpreter in which to find the
* variable. */
|
| ︙ | ︙ | |||
5867 5868 5869 5870 5871 5872 5873 |
* TCL_NAMESPACE_ONLY (look up only in
* contextNsPtr, or the current namespace if
* contextNsPtr is NULL), and
* TCL_LEAVE_ERR_MSG. If both TCL_GLOBAL_ONLY
* and TCL_NAMESPACE_ONLY are given,
* TCL_GLOBAL_ONLY is ignored. */
{
| < < | | < < | < < < < < < < < < < < < < < < < < | | | 5921 5922 5923 5924 5925 5926 5927 5928 5929 5930 5931 5932 5933 5934 5935 5936 5937 5938 5939 5940 5941 5942 5943 5944 5945 5946 5947 5948 5949 5950 5951 5952 5953 5954 5955 5956 5957 5958 5959 5960 5961 |
* TCL_NAMESPACE_ONLY (look up only in
* contextNsPtr, or the current namespace if
* contextNsPtr is NULL), and
* TCL_LEAVE_ERR_MSG. If both TCL_GLOBAL_ONLY
* and TCL_NAMESPACE_ONLY are given,
* TCL_GLOBAL_ONLY is ignored. */
{
Namespace *nsPtr[2], *cxtNsPtr;
const char *simpleName;
Var *varPtr;
int search;
int result;
Tcl_Var var;
Tcl_Obj *simpleNamePtr;
const char *name = TclGetString(namePtr);
/*
* If this namespace has a variable resolver, then give it first crack at
* the variable resolution. It may return a Tcl_Var value, it may signal
* to continue onward, or it may signal an error.
*/
if ((flags & TCL_GLOBAL_ONLY) != 0) {
cxtNsPtr = (Namespace *) TclGetGlobalNamespace(interp);
} else if (contextNsPtr) {
cxtNsPtr = (Namespace *) contextNsPtr;
} else {
cxtNsPtr = (Namespace *) TclGetCurrentNamespace(interp);
}
if (!(flags & TCL_AVOID_RESOLVERS)) {
result = ApplyResolvers(interp, cxtNsPtr, name, flags, &var);
if (result != TCL_CONTINUE) {
return var;
}
}
/*
* Find the namespace(s) that contain the variable.
*/
|
| ︙ | ︙ | |||
5937 5938 5939 5940 5941 5942 5943 |
* Look for the variable in the variable table of its namespace. Be sure
* to check both possible search paths: from the specified namespace
* context and from the global namespace.
*/
varPtr = NULL;
if (simpleName != name) {
| | | | | | 5970 5971 5972 5973 5974 5975 5976 5977 5978 5979 5980 5981 5982 5983 5984 5985 5986 5987 5988 5989 5990 5991 5992 5993 5994 5995 5996 5997 |
* Look for the variable in the variable table of its namespace. Be sure
* to check both possible search paths: from the specified namespace
* context and from the global namespace.
*/
varPtr = NULL;
if (simpleName != name) {
simpleNamePtr = Tcl_NewStringObj(simpleName, TCL_AUTO_LENGTH);
} else {
simpleNamePtr = namePtr;
}
for (search = 0; (search < 2) && !varPtr; search++) {
if (nsPtr[search] && simpleName) {
varPtr = VarHashFindVar(&nsPtr[search]->varTable, simpleNamePtr);
}
}
if (simpleName != name) {
Tcl_DecrRefCount(simpleNamePtr);
}
if (!varPtr && (flags & TCL_LEAVE_ERR_MSG)) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"unknown variable \"%s\"", name));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARIABLE", name, (char *)NULL);
}
return (Tcl_Var) varPtr;
}
|
| ︙ | ︙ | |||
5990 5991 5992 5993 5994 5995 5996 |
TclInfoVarsCmd(
TCL_UNUSED(void *),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
Interp *iPtr = (Interp *) interp;
| | | 6023 6024 6025 6026 6027 6028 6029 6030 6031 6032 6033 6034 6035 6036 6037 |
TclInfoVarsCmd(
TCL_UNUSED(void *),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
Interp *iPtr = (Interp *) interp;
const char *pattern, *simplePattern;
Tcl_HashSearch search;
Var *varPtr;
Namespace *nsPtr;
Namespace *currNsPtr = (Namespace *) Tcl_GetCurrentNamespace(interp);
Tcl_Obj *listPtr, *elemObjPtr, *varNamePtr;
int specificNsInPattern = 0;/* Init. to avoid compiler warning. */
Tcl_Obj *simplePatternPtr = NULL;
|
| ︙ | ︙ | |||
6024 6025 6026 6027 6028 6029 6030 | Namespace *dummy1NsPtr, *dummy2NsPtr; pattern = TclGetString(objv[1]); TclGetNamespaceForQualName(interp, pattern, NULL, /*flags*/ 0, &nsPtr, &dummy1NsPtr, &dummy2NsPtr, &simplePattern); | | | > | | | < | < | | | | 6057 6058 6059 6060 6061 6062 6063 6064 6065 6066 6067 6068 6069 6070 6071 6072 6073 6074 6075 6076 6077 6078 6079 6080 6081 6082 6083 6084 6085 6086 6087 6088 6089 6090 6091 6092 6093 6094 6095 6096 6097 6098 6099 6100 6101 6102 6103 6104 6105 6106 6107 6108 6109 6110 6111 6112 6113 6114 6115 6116 6117 6118 6119 6120 6121 6122 6123 6124 6125 6126 6127 6128 6129 6130 6131 6132 6133 6134 6135 6136 6137 6138 6139 6140 6141 6142 6143 6144 6145 6146 6147 6148 |
Namespace *dummy1NsPtr, *dummy2NsPtr;
pattern = TclGetString(objv[1]);
TclGetNamespaceForQualName(interp, pattern, NULL, /*flags*/ 0,
&nsPtr, &dummy1NsPtr, &dummy2NsPtr, &simplePattern);
if (nsPtr) { /* We successfully found the pattern's ns. */
specificNsInPattern = (strcmp(simplePattern, pattern) != 0);
if (simplePattern == pattern) {
simplePatternPtr = objv[1];
} else {
simplePatternPtr = Tcl_NewStringObj(simplePattern,
TCL_AUTO_LENGTH);
}
Tcl_IncrRefCount(simplePatternPtr);
}
} else {
Tcl_WrongNumArgs(interp, 1, objv, "?pattern?");
return TCL_ERROR;
}
/*
* If the namespace specified in the pattern wasn't found, just return.
*/
if (!nsPtr) {
return TCL_OK;
}
listPtr = Tcl_NewListObj(0, NULL);
if (!HasLocalVars(iPtr->varFramePtr) || specificNsInPattern) {
/*
* There is no frame pointer, the frame pointer was pushed only to
* activate a namespace, or we are in a procedure call frame but a
* specific namespace was specified. Create a list containing only the
* variables in the effective namespace's variable table.
*/
if (TrivialPattern(simplePattern)) {
/*
* If we can just do hash lookups, that simplifies things a lot.
*/
varPtr = VarHashFindVar(&nsPtr->varTable, simplePatternPtr);
if (varPtr) {
if (!TclIsVarUndefined(varPtr)
|| TclIsVarNamespaceVar(varPtr)) {
if (specificNsInPattern) {
TclNewObj(elemObjPtr);
Tcl_GetVariableFullName(interp, (Tcl_Var) varPtr,
elemObjPtr);
} else {
elemObjPtr = VarHashGetKey(varPtr);
}
Tcl_ListObjAppendElement(NULL, listPtr, elemObjPtr);
}
}
} else {
/*
* Have to scan the tables of variables.
*/
varPtr = VarHashFirstVar(&nsPtr->varTable, &search);
while (varPtr) {
if (!TclIsVarUndefined(varPtr)
|| TclIsVarNamespaceVar(varPtr)) {
varNamePtr = VarHashGetKey(varPtr);
if (PatternMatch(simplePattern, varNamePtr)) {
if (specificNsInPattern) {
TclNewObj(elemObjPtr);
Tcl_GetVariableFullName(interp, (Tcl_Var) varPtr,
elemObjPtr);
} else {
elemObjPtr = varNamePtr;
}
Tcl_ListObjAppendElement(NULL, listPtr, elemObjPtr);
}
}
varPtr = VarHashNextVar(&search);
}
}
} else if (iPtr->varFramePtr->procPtr) {
AppendLocals(interp, listPtr, simplePatternPtr, INCLUDE_LINKS);
}
if (simplePatternPtr) {
Tcl_DecrRefCount(simplePatternPtr);
}
Tcl_SetObjResult(interp, listPtr);
return TCL_OK;
|
| ︙ | ︙ | |||
6140 6141 6142 6143 6144 6145 6146 |
int
TclInfoGlobalsCmd(
TCL_UNUSED(void *),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
| | | 6172 6173 6174 6175 6176 6177 6178 6179 6180 6181 6182 6183 6184 6185 6186 |
int
TclInfoGlobalsCmd(
TCL_UNUSED(void *),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
const char *pattern;
Namespace *globalNsPtr = (Namespace *) Tcl_GetGlobalNamespace(interp);
Tcl_HashSearch search;
Var *varPtr;
Tcl_Obj *listPtr, *varNamePtr, *patternPtr;
if (objc == 1) {
pattern = NULL;
|
| ︙ | ︙ | |||
6171 6172 6173 6174 6175 6176 6177 |
/*
* Scan through the global :: namespace's variable table and create a list
* of all global variables that match the pattern.
*/
listPtr = Tcl_NewListObj(0, NULL);
| | | < < | > | < | < | | < | | 6203 6204 6205 6206 6207 6208 6209 6210 6211 6212 6213 6214 6215 6216 6217 6218 6219 6220 6221 6222 6223 6224 6225 6226 6227 6228 6229 6230 6231 6232 6233 6234 6235 6236 6237 6238 6239 |
/*
* Scan through the global :: namespace's variable table and create a list
* of all global variables that match the pattern.
*/
listPtr = Tcl_NewListObj(0, NULL);
if (TrivialPattern(pattern)) {
if (pattern == TclGetString(objv[1])) {
patternPtr = objv[1];
} else {
patternPtr = Tcl_NewStringObj(pattern, TCL_AUTO_LENGTH);
}
varPtr = VarHashFindVar(&globalNsPtr->varTable, patternPtr);
if (varPtr && !TclIsVarUndefined(varPtr)) {
/* Use the key, not the argument, to limit long-term allocations */
Tcl_ListObjAppendElement(NULL, listPtr, VarHashGetKey(varPtr));
}
Tcl_BounceRefCount(patternPtr);
} else {
for (varPtr = VarHashFirstVar(&globalNsPtr->varTable, &search);
varPtr != NULL;
varPtr = VarHashNextVar(&search)) {
if (TclIsVarUndefined(varPtr)) {
continue;
}
varNamePtr = VarHashGetKey(varPtr);
if (PatternMatch(pattern, varNamePtr)) {
Tcl_ListObjAppendElement(NULL, listPtr, varNamePtr);
}
}
}
Tcl_SetObjResult(interp, listPtr);
return TCL_OK;
}
|
| ︙ | ︙ | |||
6256 6257 6258 6259 6260 6261 6262 |
/*
* Return a list containing names of first the compiled locals (i.e. the
* ones stored in the call frame), then the variables in the local hash
* table (if one exists).
*/
listPtr = Tcl_NewListObj(0, NULL);
| | | 6284 6285 6286 6287 6288 6289 6290 6291 6292 6293 6294 6295 6296 6297 6298 |
/*
* Return a list containing names of first the compiled locals (i.e. the
* ones stored in the call frame), then the variables in the local hash
* table (if one exists).
*/
listPtr = Tcl_NewListObj(0, NULL);
AppendLocals(interp, listPtr, patternPtr, 0);
Tcl_SetObjResult(interp, listPtr);
return TCL_OK;
}
/*
*----------------------------------------------------------------------
*
|
| ︙ | ︙ | |||
6293 6294 6295 6296 6297 6298 6299 |
TclInfoConstsCmd(
TCL_UNUSED(void *),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
Interp *iPtr = (Interp *) interp;
| | | 6321 6322 6323 6324 6325 6326 6327 6328 6329 6330 6331 6332 6333 6334 6335 |
TclInfoConstsCmd(
TCL_UNUSED(void *),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
Interp *iPtr = (Interp *) interp;
const char *pattern, *simplePattern;
Tcl_HashSearch search;
Var *varPtr;
Namespace *nsPtr;
Namespace *globalNsPtr = (Namespace *) Tcl_GetGlobalNamespace(interp);
Namespace *currNsPtr = (Namespace *) Tcl_GetCurrentNamespace(interp);
Tcl_Obj *listPtr, *elemObjPtr, *varNamePtr;
int specificNsInPattern = 0;/* Init. to avoid compiler warning. */
|
| ︙ | ︙ | |||
6328 6329 6330 6331 6332 6333 6334 | Namespace *dummy1NsPtr, *dummy2NsPtr; pattern = TclGetString(objv[1]); TclGetNamespaceForQualName(interp, pattern, NULL, /*flags*/ 0, &nsPtr, &dummy1NsPtr, &dummy2NsPtr, &simplePattern); | | | > | | | | < | < | < | < | < | < < | | > | 6356 6357 6358 6359 6360 6361 6362 6363 6364 6365 6366 6367 6368 6369 6370 6371 6372 6373 6374 6375 6376 6377 6378 6379 6380 6381 6382 6383 6384 6385 6386 6387 6388 6389 6390 6391 6392 6393 6394 6395 6396 6397 6398 6399 6400 6401 6402 6403 6404 6405 6406 6407 6408 6409 6410 6411 6412 6413 6414 6415 6416 6417 6418 6419 6420 6421 6422 6423 6424 6425 6426 6427 6428 6429 6430 6431 6432 6433 6434 6435 6436 6437 6438 6439 6440 6441 6442 6443 6444 6445 6446 6447 6448 6449 6450 6451 6452 6453 6454 6455 6456 6457 6458 6459 6460 6461 6462 6463 6464 6465 6466 6467 6468 6469 6470 6471 6472 6473 6474 6475 6476 6477 6478 6479 6480 6481 6482 |
Namespace *dummy1NsPtr, *dummy2NsPtr;
pattern = TclGetString(objv[1]);
TclGetNamespaceForQualName(interp, pattern, NULL, /*flags*/ 0,
&nsPtr, &dummy1NsPtr, &dummy2NsPtr, &simplePattern);
if (nsPtr) { /* We successfully found the pattern's ns. */
specificNsInPattern = (strcmp(simplePattern, pattern) != 0);
if (simplePattern == pattern) {
simplePatternPtr = objv[1];
} else {
simplePatternPtr = Tcl_NewStringObj(simplePattern,
TCL_AUTO_LENGTH);
}
Tcl_IncrRefCount(simplePatternPtr);
}
} else {
Tcl_WrongNumArgs(interp, 1, objv, "?pattern?");
return TCL_ERROR;
}
/*
* If the namespace specified in the pattern wasn't found, just return.
*/
if (!nsPtr) {
return TCL_OK;
}
listPtr = Tcl_NewListObj(0, NULL);
if (!HasLocalVars(iPtr->varFramePtr) || specificNsInPattern) {
/*
* There is no frame pointer, the frame pointer was pushed only to
* activate a namespace, or we are in a procedure call frame but a
* specific namespace was specified. Create a list containing only the
* variables in the effective namespace's variable table.
*/
if (TrivialPattern(simplePattern)) {
/*
* If we can just do hash lookups, that simplifies things a lot.
*/
varPtr = VarHashFindVar(&nsPtr->varTable, simplePatternPtr);
if (varPtr && TclIsVarConstant(varPtr)) {
if (!TclIsVarUndefined(varPtr)
|| TclIsVarNamespaceVar(varPtr)) {
if (specificNsInPattern) {
TclNewObj(elemObjPtr);
Tcl_GetVariableFullName(interp, (Tcl_Var) varPtr,
elemObjPtr);
} else {
elemObjPtr = VarHashGetKey(varPtr);
}
Tcl_ListObjAppendElement(NULL, listPtr, elemObjPtr);
}
} else if ((nsPtr != globalNsPtr) && !specificNsInPattern) {
varPtr = VarHashFindVar(&globalNsPtr->varTable,
simplePatternPtr);
if (varPtr && TclIsVarConstant(varPtr)) {
if (!TclIsVarUndefined(varPtr)
|| TclIsVarNamespaceVar(varPtr)) {
Tcl_ListObjAppendElement(NULL, listPtr,
VarHashGetKey(varPtr));
}
}
}
} else {
/*
* Have to scan the tables of variables.
*/
varPtr = VarHashFirstVar(&nsPtr->varTable, &search);
while (varPtr) {
if (TclIsVarConstant(varPtr) && (!TclIsVarUndefined(varPtr)
|| TclIsVarNamespaceVar(varPtr))) {
varNamePtr = VarHashGetKey(varPtr);
if (PatternMatch(simplePattern, varNamePtr)) {
if (specificNsInPattern) {
TclNewObj(elemObjPtr);
Tcl_GetVariableFullName(interp, (Tcl_Var) varPtr,
elemObjPtr);
} else {
elemObjPtr = varNamePtr;
}
Tcl_ListObjAppendElement(NULL, listPtr, elemObjPtr);
}
}
varPtr = VarHashNextVar(&search);
}
/*
* If the effective namespace isn't the global :: namespace, and a
* specific namespace wasn't requested in the pattern (i.e., the
* pattern only specifies variable names), then add in all global
* :: variables that match the simple pattern. Of course, add in
* only those variables that aren't hidden by a variable in the
* effective namespace.
*/
if ((nsPtr != globalNsPtr) && !specificNsInPattern) {
varPtr = VarHashFirstVar(&globalNsPtr->varTable, &search);
while (varPtr) {
if (TclIsVarConstant(varPtr) && (!TclIsVarUndefined(varPtr)
|| TclIsVarNamespaceVar(varPtr))) {
varNamePtr = VarHashGetKey(varPtr);
if (PatternMatch(simplePattern, varNamePtr) &&
!VarHashFindVar(&nsPtr->varTable, varNamePtr)) {
Tcl_ListObjAppendElement(NULL, listPtr, varNamePtr);
}
}
varPtr = VarHashNextVar(&search);
}
}
}
} else if (iPtr->varFramePtr->procPtr) {
AppendLocals(interp, listPtr, simplePatternPtr,
INCLUDE_LINKS | CONSTANTS_ONLY);
}
if (simplePatternPtr) {
Tcl_DecrRefCount(simplePatternPtr);
}
Tcl_SetObjResult(interp, listPtr);
return TCL_OK;
|
| ︙ | ︙ | |||
6472 6473 6474 6475 6476 6477 6478 | * * Side effects: * None. * *---------------------------------------------------------------------- */ | | | 6495 6496 6497 6498 6499 6500 6501 6502 6503 6504 6505 6506 6507 6508 6509 |
*
* Side effects:
* None.
*
*----------------------------------------------------------------------
*/
static inline int
ContextObjectContainsConstant(
Tcl_ObjectContext context,
Tcl_Obj *varNamePtr)
{
/*
* Helper for AppendLocals to check if an object contains a variable
* that is a constant. It's too complicated without factoring this
|
| ︙ | ︙ | |||
6495 6496 6497 6498 6499 6500 6501 |
}
static void
AppendLocals(
Tcl_Interp *interp, /* Current interpreter. */
Tcl_Obj *listPtr, /* List object to append names to. */
Tcl_Obj *patternPtr, /* Pattern to match against. */
| | < < | > > | < | | | < | | | | < | | | < < | < | | 6518 6519 6520 6521 6522 6523 6524 6525 6526 6527 6528 6529 6530 6531 6532 6533 6534 6535 6536 6537 6538 6539 6540 6541 6542 6543 6544 6545 6546 6547 6548 6549 6550 6551 6552 6553 6554 6555 6556 6557 6558 6559 6560 6561 6562 6563 6564 6565 6566 6567 6568 6569 6570 6571 6572 6573 6574 6575 6576 6577 6578 6579 6580 6581 6582 6583 6584 6585 6586 6587 6588 6589 6590 6591 6592 6593 6594 6595 6596 6597 6598 6599 6600 6601 6602 6603 6604 6605 6606 6607 6608 6609 6610 6611 6612 6613 6614 |
}
static void
AppendLocals(
Tcl_Interp *interp, /* Current interpreter. */
Tcl_Obj *listPtr, /* List object to append names to. */
Tcl_Obj *patternPtr, /* Pattern to match against. */
int flags) /* What types of locals. */
{
Interp *iPtr = (Interp *) interp;
Var *varPtr;
Tcl_Size i, localVarCt;
int added;
Tcl_Obj *objNamePtr;
TclVarHashTable *localVarTablePtr;
Tcl_HashSearch search;
Tcl_HashTable addedTable;
const char *pattern = AsStr(patternPtr);
const int includeLinks = flags & INCLUDE_LINKS;
const int justConstants = flags & CONSTANTS_ONLY;
localVarCt = iPtr->varFramePtr->numCompiledLocals;
varPtr = iPtr->varFramePtr->compiledLocals;
localVarTablePtr = iPtr->varFramePtr->varTablePtr;
if (includeLinks) {
Tcl_InitObjHashTable(&addedTable);
}
if (localVarCt > 0) {
Tcl_Obj **varNamePtr = &iPtr->varFramePtr->localCachePtr->varName0;
for (i = 0; i < localVarCt; i++, varNamePtr++) {
/*
* Skip nameless (temporary) variables and undefined variables.
*/
if (*varNamePtr && !TclIsVarUndefined(varPtr)
&& (includeLinks || !TclIsVarLink(varPtr))) {
if (PatternMatch(pattern, *varNamePtr)) {
if (!justConstants || TclIsVarConstant(varPtr)) {
Tcl_ListObjAppendElement(NULL, listPtr, *varNamePtr);
}
if (includeLinks) {
Tcl_CreateHashEntry(&addedTable, *varNamePtr, &added);
}
}
}
varPtr++;
}
}
/*
* Do nothing if no local variables.
*/
if (!localVarTablePtr) {
goto objectVars;
}
/*
* Check for the simple and fast case.
*/
if (TrivialPattern(pattern)) {
varPtr = VarHashFindVar(localVarTablePtr, patternPtr);
if (varPtr && !TclIsVarUndefined(varPtr)
&& (includeLinks || !TclIsVarLink(varPtr))) {
if ((!justConstants || TclIsVarConstant(varPtr))) {
Tcl_ListObjAppendElement(NULL, listPtr, VarHashGetKey(varPtr));
}
if (includeLinks) {
Tcl_CreateHashEntry(&addedTable, VarHashGetKey(varPtr), &added);
}
}
goto objectVars;
}
/*
* Scan over and process all local variables.
*/
for (varPtr = VarHashFirstVar(localVarTablePtr, &search);
varPtr != NULL;
varPtr = VarHashNextVar(&search)) {
if (!TclIsVarUndefined(varPtr)
&& (includeLinks || !TclIsVarLink(varPtr))) {
objNamePtr = VarHashGetKey(varPtr);
if (PatternMatch(pattern, objNamePtr)) {
if (!justConstants || TclIsVarConstant(varPtr)) {
Tcl_ListObjAppendElement(NULL, listPtr, objNamePtr);
}
if (includeLinks) {
Tcl_CreateHashEntry(&addedTable, objNamePtr, &added);
}
}
}
}
|
| ︙ | ︙ | |||
6612 6613 6614 6615 6616 6617 6618 |
FOREACH(objNamePtr, oPtr->variables) {
Tcl_CreateHashEntry(&addedTable, objNamePtr, &added);
if (justConstants && !ContextObjectContainsConstant(context,
objNamePtr)) {
continue;
}
| | < | | < < | | < | | < < | | 6629 6630 6631 6632 6633 6634 6635 6636 6637 6638 6639 6640 6641 6642 6643 6644 6645 6646 6647 6648 6649 6650 6651 6652 6653 6654 6655 6656 6657 6658 6659 6660 6661 6662 6663 6664 6665 6666 6667 6668 6669 6670 6671 6672 6673 6674 6675 6676 6677 6678 6679 6680 |
FOREACH(objNamePtr, oPtr->variables) {
Tcl_CreateHashEntry(&addedTable, objNamePtr, &added);
if (justConstants && !ContextObjectContainsConstant(context,
objNamePtr)) {
continue;
}
if (added && PatternMatch(pattern, objNamePtr)) {
Tcl_ListObjAppendElement(NULL, listPtr, objNamePtr);
}
}
FOREACH_STRUCT(privatePtr, oPtr->privateVariables) {
Tcl_CreateHashEntry(&addedTable, privatePtr->variableObj,
&added);
if (justConstants && !ContextObjectContainsConstant(context,
privatePtr->fullNameObj)) {
continue;
}
if (added && PatternMatch(pattern, privatePtr->variableObj)) {
Tcl_ListObjAppendElement(NULL, listPtr,
privatePtr->variableObj);
}
}
} else {
Class *clsPtr = mPtr->declaringClassPtr;
FOREACH(objNamePtr, clsPtr->variables) {
Tcl_CreateHashEntry(&addedTable, objNamePtr, &added);
if (justConstants && !ContextObjectContainsConstant(context,
objNamePtr)) {
continue;
}
if (added && PatternMatch(pattern, objNamePtr)) {
Tcl_ListObjAppendElement(NULL, listPtr, objNamePtr);
}
}
FOREACH_STRUCT(privatePtr, clsPtr->privateVariables) {
Tcl_CreateHashEntry(&addedTable, privatePtr->variableObj,
&added);
if (justConstants && !ContextObjectContainsConstant(context,
privatePtr->fullNameObj)) {
continue;
}
if (added && PatternMatch(pattern, privatePtr->variableObj)) {
Tcl_ListObjAppendElement(NULL, listPtr,
privatePtr->variableObj);
}
}
}
}
Tcl_DeleteHashTable(&addedTable);
}
|
| ︙ | ︙ | |||
6725 6726 6727 6728 6729 6730 6731 |
}
static Tcl_HashEntry *
AllocVarEntry(
TCL_UNUSED(Tcl_HashTable *),
void *keyPtr) /* Key to store in the hash table entry. */
{
| | | | | > | | 6736 6737 6738 6739 6740 6741 6742 6743 6744 6745 6746 6747 6748 6749 6750 6751 6752 6753 6754 6755 6756 6757 6758 6759 6760 6761 6762 6763 6764 6765 6766 6767 6768 6769 6770 6771 6772 6773 6774 6775 6776 6777 6778 6779 6780 6781 6782 6783 6784 6785 6786 6787 6788 6789 6790 6791 |
}
static Tcl_HashEntry *
AllocVarEntry(
TCL_UNUSED(Tcl_HashTable *),
void *keyPtr) /* Key to store in the hash table entry. */
{
Tcl_Obj *objPtr = (Tcl_Obj *) keyPtr;
Tcl_HashEntry *hPtr;
Var *varPtr;
varPtr = (Var *) Tcl_Alloc(sizeof(VarInHash));
varPtr->flags = VAR_IN_HASHTABLE;
varPtr->value.objPtr = NULL;
VarHashRefCount(varPtr) = 1;
hPtr = &((VarInHash *) varPtr)->entry;
Tcl_SetHashValue(hPtr, varPtr);
hPtr->key.objPtr = objPtr;
Tcl_IncrRefCount(objPtr);
return hPtr;
}
static void
FreeVarEntry(
Tcl_HashEntry *hPtr)
{
Var *varPtr = VarHashGetValue(hPtr);
Tcl_Obj *objPtr = hPtr->key.objPtr;
if (TclIsVarUndefined(varPtr)
&& !TclIsVarTraced(varPtr)
&& (VarHashRefCount(varPtr) == 1)) {
Tcl_Free(varPtr);
} else {
VarHashInvalidateEntry(varPtr);
TclSetVarUndefined(varPtr);
VarHashRefCount(varPtr)--;
}
Tcl_DecrRefCount(objPtr);
}
static int
CompareVarKeys(
void *keyPtr, /* New key to compare. */
Tcl_HashEntry *hPtr) /* Existing key to compare. */
{
Tcl_Obj *objPtr1 = (Tcl_Obj *) keyPtr;
Tcl_Obj *objPtr2 = hPtr->key.objPtr;
const char *p1, *p2;
size_t l1, l2;
/*
* If the object pointers are the same then they match.
* OPT: this comparison was moved to the caller
|
| ︙ | ︙ | |||
6820 6821 6822 6823 6824 6825 6826 |
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
static const char *const options[] = {
"get", "set", "exists", "unset", NULL
};
| | > > | | | > | | | | 6832 6833 6834 6835 6836 6837 6838 6839 6840 6841 6842 6843 6844 6845 6846 6847 6848 6849 6850 6851 6852 6853 6854 6855 6856 6857 6858 6859 6860 6861 6862 6863 6864 6865 6866 6867 6868 6869 6870 6871 6872 6873 6874 6875 6876 6877 6878 6879 6880 6881 6882 6883 6884 6885 6886 6887 6888 6889 6890 6891 6892 6893 6894 6895 6896 6897 6898 6899 6900 6901 6902 6903 6904 6905 6906 6907 6908 6909 6910 6911 6912 6913 6914 6915 6916 6917 6918 6919 6920 6921 6922 6923 6924 6925 6926 6927 |
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
static const char *const options[] = {
"get", "set", "exists", "unset", NULL
};
enum arrayDefaultOptionsEnum {
OPT_GET, OPT_SET, OPT_EXISTS, OPT_UNSET
} option;
Tcl_Obj *arrayNameObj, *defaultValueObj;
Var *varPtr, *arrayPtr;
int isArray;
/*
* Parse arguments.
*/
if (objc != 3 && objc != 4) {
Tcl_WrongNumArgs(interp, 1, objv, "option arrayName ?value?");
return TCL_ERROR;
}
if (Tcl_GetIndexFromObj(interp, objv[1], options, "option",
0, &option) != TCL_OK) {
return TCL_ERROR;
}
arrayNameObj = objv[2];
if (LocateArray(interp, arrayNameObj, &varPtr, &isArray) != TCL_OK) {
return TCL_ERROR;
}
switch (option) {
case OPT_GET:
if (objc != 3) {
Tcl_WrongNumArgs(interp, 2, objv, "arrayName");
return TCL_ERROR;
}
if (!varPtr || TclIsVarUndefined(varPtr) || !isArray) {
return NotArrayError(interp, arrayNameObj);
}
defaultValueObj = TclGetArrayDefault(varPtr);
if (!defaultValueObj) {
/* Array default must exist. */
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"array has no default value", TCL_AUTO_LENGTH));
Tcl_SetErrorCode(interp, "TCL", "READ", "ARRAY", "DEFAULT",
(char *)NULL);
return TCL_ERROR;
}
Tcl_SetObjResult(interp, defaultValueObj);
return TCL_OK;
case OPT_SET:
if (objc != 4) {
Tcl_WrongNumArgs(interp, 2, objv, "arrayName value");
return TCL_ERROR;
}
/*
* Attempt to create array if needed.
*/
varPtr = TclObjLookupVarEx(interp, arrayNameObj, NULL,
/*flags*/ TCL_LEAVE_ERR_MSG, /*msg*/ "array default set",
/*createPart1*/ 1, /*createPart2*/ 1, &arrayPtr);
if (!varPtr) {
return TCL_ERROR;
}
if (arrayPtr) {
/*
* Not a valid array name.
*/
CleanupVar(varPtr, arrayPtr);
TclObjVarErrMsg(interp, arrayNameObj, NULL, "array default set",
NEEDARRAY, NOT_IN_LVT);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
TclGetString(arrayNameObj), (char *)NULL);
return TCL_ERROR;
}
if (!TclIsVarArray(varPtr) && !TclIsVarUndefined(varPtr)) {
/*
* Not an array.
*/
TclObjVarErrMsg(interp, arrayNameObj, NULL, "array default set",
NEEDARRAY, NOT_IN_LVT);
Tcl_SetErrorCode(interp, "TCL", "WRITE", "ARRAY", (char *)NULL);
return TCL_ERROR;
}
if (!TclIsVarArray(varPtr)) {
TclInitArrayVar(varPtr);
}
|
| ︙ | ︙ | |||
6944 6945 6946 6947 6948 6949 6950 |
if (varPtr && !TclIsVarUndefined(varPtr)) {
if (!isArray) {
return NotArrayError(interp, arrayNameObj);
}
SetArrayDefault(varPtr, NULL);
}
return TCL_OK;
| | | | | > | > | 6959 6960 6961 6962 6963 6964 6965 6966 6967 6968 6969 6970 6971 6972 6973 6974 6975 6976 6977 6978 6979 6980 6981 6982 6983 6984 6985 6986 6987 6988 6989 |
if (varPtr && !TclIsVarUndefined(varPtr)) {
if (!isArray) {
return NotArrayError(interp, arrayNameObj);
}
SetArrayDefault(varPtr, NULL);
}
return TCL_OK;
default:
/* Unreached */
return TCL_ERROR;
}
}
/*
* Initialize array variable.
*/
void
TclInitArrayVar(
Var *arrayPtr)
{
ArrayVarHashTable *tablePtr = (ArrayVarHashTable *)
Tcl_Alloc(sizeof(ArrayVarHashTable));
/*
* Mark the variable as an array.
*/
TclSetVarArray(arrayPtr);
|
| ︙ | ︙ | |||
7034 7035 7036 7037 7038 7039 7040 |
Tcl_Obj *defaultObj)
{
ArrayVarHashTable *tablePtr = (ArrayVarHashTable *)
arrayPtr->value.tablePtr;
/*
* Increment/decrement refcount twice to ensure that the object is shared,
| | | 7051 7052 7053 7054 7055 7056 7057 7058 7059 7060 7061 7062 7063 7064 7065 |
Tcl_Obj *defaultObj)
{
ArrayVarHashTable *tablePtr = (ArrayVarHashTable *)
arrayPtr->value.tablePtr;
/*
* Increment/decrement refcount twice to ensure that the object is shared,
* so that it doesn't get modified accidentally by the following code:
*
* array default set v 1
* lappend v(a) 2; # returns a new object {1 2}
* set v(b); # returns the original default object "1"
*/
if (tablePtr->defaultObj) {
|
| ︙ | ︙ |