summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tclAssembly.c4
-rw-r--r--generic/tclCompExpr.c8
-rw-r--r--generic/tclCompile.c4
-rw-r--r--generic/tclDisassemble.c2
-rw-r--r--generic/tclEncoding.c16
-rw-r--r--generic/tclExecute.c8
-rw-r--r--generic/tclIO.c18
-rw-r--r--generic/tclInt.h3
-rw-r--r--generic/tclListObj.c59
-rw-r--r--generic/tclNamesp.c6
-rw-r--r--generic/tclObj.c10
-rw-r--r--generic/tclPathObj.c2
-rw-r--r--generic/tclResult.c2
-rw-r--r--generic/tclStrToD.c4
-rw-r--r--generic/tclStringObj.c2
-rw-r--r--generic/tclUtil.c2
-rw-r--r--tests/cmdIL.test2
-rw-r--r--tests/format.test4
-rw-r--r--tests/io.test2
-rw-r--r--tests/lset.test2
-rw-r--r--tests/var.test2
21 files changed, 86 insertions, 76 deletions
diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c
index 7ecc1d5..bf86b90 100644
--- a/generic/tclAssembly.c
+++ b/generic/tclAssembly.c
@@ -4279,7 +4279,7 @@ AddBasicBlockRangeToErrorInfo(
* DupAssembleCodeInternalRep --
*
* Part of the Tcl object type implementation for Tcl assembly language
- * bytecode. We do not copy the bytecode intrep. Instead, we return
+ * bytecode. We do not copy the bytecode internalrep. Instead, we return
* without setting copyPtr->typePtr, so the copy is a plain string copy
* of the assembly source, and if it is to be used as a compiled
* expression, it will need to be reprocessed.
@@ -4288,7 +4288,7 @@ AddBasicBlockRangeToErrorInfo(
* usual (only?) time Tcl_DuplicateObj() will be called is when the copy
* is about to be modified, which would invalidate any copied bytecode
* anyway. The only reason it might make sense to copy the bytecode is if
- * we had some modifying routines that operated directly on the intrep,
+ * we had some modifying routines that operated directly on the internalrep,
* as we do for lists and dicts.
*
* Results:
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index 1ffe099..52b62fc 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -2438,7 +2438,7 @@ CompileExprTree(
* However, the design of the "global" and "local"
* LiteralTable does not permit the value of lePtr->objPtr
* to change. So rather than replace lePtr->objPtr, we do
- * surgery to transfer our desired intrep into it.
+ * surgery to transfer our desired internalrep into it.
*/
objPtr->typePtr = literal->typePtr;
@@ -2451,9 +2451,9 @@ CompileExprTree(
* When optimize==0, we know the expression is a one-off and
* there's nothing to be gained from sharing literals when
* they won't live long, and the copies we have already have
- * an appropriate intrep. In this case, skip literal
+ * an appropriate internalrep. In this case, skip literal
* registration that would enable sharing, and use the routine
- * that preserves intreps.
+ * that preserves internalreps.
*/
TclEmitPush(TclAddLiteralObj(envPtr, literal, NULL), envPtr);
@@ -2488,7 +2488,7 @@ CompileExprTree(
if ((tableValue->typePtr == NULL) &&
(objPtr->typePtr != NULL)) {
/*
- * Same intrep surgery as for OT_LITERAL.
+ * Same internalrep surgery as for OT_LITERAL.
*/
tableValue->typePtr = objPtr->typePtr;
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 6761c09..eb2e16b 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -2829,7 +2829,7 @@ TclInitByteCodeObj(
if (objPtr == fetched) {
/*
- * Prevent circular reference where the bytecode intrep of
+ * Prevent circular reference where the bytecode internalrep of
* a value contains a literal which is that same value.
* If this is allowed to happen, refcount decrements may not
* reach zero, and memory may leak. Bugs 467523, 3357771
@@ -2837,7 +2837,7 @@ TclInitByteCodeObj(
* NOTE: [Bugs 3392070, 3389764] We make a copy based completely
* on the string value, and do not call Tcl_DuplicateObj() so we
* can be sure we do not have any lingering cycles hiding in
- * the intrep.
+ * the internalrep.
*/
int numBytes;
const char *bytes = Tcl_GetStringFromObj(objPtr, &numBytes);
diff --git a/generic/tclDisassemble.c b/generic/tclDisassemble.c
index 8236d20..8b137d4 100644
--- a/generic/tclDisassemble.c
+++ b/generic/tclDisassemble.c
@@ -755,7 +755,7 @@ TclGetInnerContext(
int len;
/*
- * Reset while keeping the list intrep as much as possible.
+ * Reset while keeping the list internalrep as much as possible.
*/
Tcl_ListObjLength(interp, result, &len);
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 686eeb5..8fff493 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -196,13 +196,13 @@ static unsigned short emptyPage[256];
*/
static Tcl_EncodingConvertProc BinaryProc;
-static Tcl_DupInternalRepProc DupEncodingIntRep;
+static Tcl_DupInternalRepProc DupEncodingInternalRep;
static Tcl_EncodingFreeProc EscapeFreeProc;
static Tcl_EncodingConvertProc EscapeFromUtfProc;
static Tcl_EncodingConvertProc EscapeToUtfProc;
static void FillEncodingFileMap(void);
static void FreeEncoding(Tcl_Encoding encoding);
-static Tcl_FreeInternalRepProc FreeEncodingIntRep;
+static Tcl_FreeInternalRepProc FreeEncodingInternalRep;
static Encoding * GetTableEncoding(EscapeEncodingData *dataPtr,
int state);
static Tcl_Encoding LoadEncodingFile(Tcl_Interp *interp,
@@ -262,12 +262,12 @@ static int Iso88591ToUtfProc(ClientData clientData,
/*
* A Tcl_ObjType for holding a cached Tcl_Encoding in the twoPtrValue.ptr1 field
- * of the intrep. This should help the lifetime of encodings be more useful.
+ * of the internalrep. This should help the lifetime of encodings be more useful.
* See concerns raised in [Bug 1077262].
*/
static const Tcl_ObjType encodingType = {
- "encoding", FreeEncodingIntRep, DupEncodingIntRep, NULL, NULL
+ "encoding", FreeEncodingInternalRep, DupEncodingInternalRep, NULL, NULL
};
/*
@@ -314,7 +314,7 @@ Tcl_GetEncodingFromObj(
/*
*----------------------------------------------------------------------
*
- * FreeEncodingIntRep --
+ * FreeEncodingInternalRep --
*
* The Tcl_FreeInternalRepProc for the "encoding" Tcl_ObjType.
*
@@ -322,7 +322,7 @@ Tcl_GetEncodingFromObj(
*/
static void
-FreeEncodingIntRep(
+FreeEncodingInternalRep(
Tcl_Obj *objPtr)
{
Tcl_FreeEncoding((Tcl_Encoding)objPtr->internalRep.twoPtrValue.ptr1);
@@ -332,7 +332,7 @@ FreeEncodingIntRep(
/*
*----------------------------------------------------------------------
*
- * DupEncodingIntRep --
+ * DupEncodingInternalRep --
*
* The Tcl_DupInternalRepProc for the "encoding" Tcl_ObjType.
*
@@ -340,7 +340,7 @@ FreeEncodingIntRep(
*/
static void
-DupEncodingIntRep(
+DupEncodingInternalRep(
Tcl_Obj *srcPtr,
Tcl_Obj *dupPtr)
{
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index d675e44..8963472 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -1598,7 +1598,7 @@ CompileExprObj(
* DupExprCodeInternalRep --
*
* Part of the Tcl object type implementation for Tcl expression
- * bytecode. We do not copy the bytecode intrep. Instead, we return
+ * bytecode. We do not copy the bytecode internalrep. Instead, we return
* without setting copyPtr->typePtr, so the copy is a plain string copy
* of the expression value, and if it is to be used as a compiled
* expression, it will just need a recompile.
@@ -1607,7 +1607,7 @@ CompileExprObj(
* usual (only?) time Tcl_DuplicateObj() will be called is when the copy
* is about to be modified, which would invalidate any copied bytecode
* anyway. The only reason it might make sense to copy the bytecode is if
- * we had some modifying routines that operated directly on the intrep,
+ * we had some modifying routines that operated directly on the internalrep,
* like we do for lists and dicts.
*
* Results:
@@ -6778,7 +6778,7 @@ TEBCresume(
if (Tcl_IsShared(valuePtr)) {
/*
* Here we do some surgery within the Tcl_Obj internals. We want
- * to copy the intrep, but not the string, so we temporarily hide
+ * to copy the internalrep, but not the string, so we temporarily hide
* the string so we do not copy it.
*/
@@ -7605,7 +7605,7 @@ TEBCresume(
/*
* dictPtr is no longer on the stack, and we're not
- * moving it into the intrep of an iterator. We need
+ * moving it into the internalrep of an iterator. We need
* to drop the refcount [Tcl Bug 9b352768e6].
*/
diff --git a/generic/tclIO.c b/generic/tclIO.c
index f916211..43b7ce3 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -324,13 +324,13 @@ typedef struct ResolvedChanName {
int refCount; /* Share this struct among many Tcl_Obj. */
} ResolvedChanName;
-static void DupChannelIntRep(Tcl_Obj *objPtr, Tcl_Obj *copyPtr);
-static void FreeChannelIntRep(Tcl_Obj *objPtr);
+static void DupChannelInternalRep(Tcl_Obj *objPtr, Tcl_Obj *copyPtr);
+static void FreeChannelInternalRep(Tcl_Obj *objPtr);
static const Tcl_ObjType chanObjType = {
"channel", /* name for this type */
- FreeChannelIntRep, /* freeIntRepProc */
- DupChannelIntRep, /* dupIntRepProc */
+ FreeChannelInternalRep, /* freeIntRepProc */
+ DupChannelInternalRep, /* dupIntRepProc */
NULL, /* updateStringProc */
NULL /* setFromAnyProc */
};
@@ -1526,7 +1526,7 @@ TclGetChannelFromObj(
if (chan == NULL) {
if (resPtr) {
- FreeChannelIntRep(objPtr);
+ FreeChannelInternalRep(objPtr);
}
return TCL_ERROR;
}
@@ -11212,7 +11212,7 @@ Tcl_ChannelTruncateProc(
/*
*----------------------------------------------------------------------
*
- * DupChannelIntRep --
+ * DupChannelInternalRep --
*
* Initialize the internal representation of a new Tcl_Obj to a copy of
* the internal representation of an existing string object.
@@ -11228,7 +11228,7 @@ Tcl_ChannelTruncateProc(
*/
static void
-DupChannelIntRep(
+DupChannelInternalRep(
Tcl_Obj *srcPtr, /* Object with internal rep to copy. Must have
* an internal rep of type "Channel". */
Tcl_Obj *copyPtr) /* Object with internal rep to set. Must not
@@ -11244,7 +11244,7 @@ DupChannelIntRep(
/*
*----------------------------------------------------------------------
*
- * FreeChannelIntRep --
+ * FreeChannelInternalRep --
*
* Release statePtr storage.
*
@@ -11258,7 +11258,7 @@ DupChannelIntRep(
*/
static void
-FreeChannelIntRep(
+FreeChannelInternalRep(
Tcl_Obj *objPtr) /* Object with internal rep to free. */
{
ResolvedChanName *resPtr = objPtr->internalRep.twoPtrValue.ptr1;
diff --git a/generic/tclInt.h b/generic/tclInt.h
index dc6b83f..949672b 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2391,6 +2391,7 @@ typedef struct List {
#define ListRepPtr(listPtr) \
((List *) (listPtr)->internalRep.twoPtrValue.ptr1)
+/* Not used any more */
#define ListSetIntRep(objPtr, listRepPtr) \
(objPtr)->internalRep.twoPtrValue.ptr1 = (void *)(listRepPtr), \
(objPtr)->internalRep.twoPtrValue.ptr2 = NULL, \
@@ -3147,7 +3148,7 @@ MODULE_SCOPE int TclScanElement(const char *string, int length,
char *flagPtr);
MODULE_SCOPE void TclSetBgErrorHandler(Tcl_Interp *interp,
Tcl_Obj *cmdPrefix);
-MODULE_SCOPE void TclSetBignumIntRep(Tcl_Obj *objPtr,
+MODULE_SCOPE void TclSetBignumInternalRep(Tcl_Obj *objPtr,
mp_int *bignumValue);
MODULE_SCOPE int TclSetBooleanFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
MODULE_SCOPE void TclSetCmdNameObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 11726d5..9bc4e47 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -19,7 +19,7 @@
static List * AttemptNewList(Tcl_Interp *interp, int objc,
Tcl_Obj *const objv[]);
-static List * NewListIntRep(int objc, Tcl_Obj *const objv[], int p);
+static List * NewListInternalRep(int objc, Tcl_Obj *const objv[], int p);
static void DupListInternalRep(Tcl_Obj *srcPtr, Tcl_Obj *copyPtr);
static void FreeListInternalRep(Tcl_Obj *listPtr);
static int SetListFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
@@ -46,6 +46,15 @@ const Tcl_ObjType tclListType = {
SetListFromAny /* setFromAnyProc */
};
+/* Macros to manipulate the List internal rep */
+
+#define ListSetInternalRep(objPtr, listRepPtr) \
+ (objPtr)->internalRep.twoPtrValue.ptr1 = (void *)(listRepPtr), \
+ (objPtr)->internalRep.twoPtrValue.ptr2 = NULL, \
+ (listRepPtr)->refCount++, \
+ (objPtr)->typePtr = &tclListType
+
+
#ifndef TCL_MIN_ELEMENT_GROWTH
#define TCL_MIN_ELEMENT_GROWTH TCL_MIN_GROWTH/sizeof(Tcl_Obj *)
#endif
@@ -53,7 +62,7 @@ const Tcl_ObjType tclListType = {
/*
*----------------------------------------------------------------------
*
- * NewListIntRep --
+ * NewListInternalRep --
*
* Creates a 'List' structure with space for 'objc' elements. 'objc' must
* be > 0. If 'objv' is not NULL, The list is initialized with first
@@ -76,7 +85,7 @@ const Tcl_ObjType tclListType = {
*/
static List *
-NewListIntRep(
+NewListInternalRep(
int objc,
Tcl_Obj *const objv[],
int p)
@@ -84,7 +93,7 @@ NewListIntRep(
List *listRepPtr;
if (objc <= 0) {
- Tcl_Panic("NewListIntRep: expects postive element count");
+ Tcl_Panic("NewListInternalRep: expects postive element count");
}
/*
@@ -102,7 +111,7 @@ NewListIntRep(
return NULL;
}
- listRepPtr = attemptckalloc(LIST_SIZE(objc));
+ listRepPtr = (List *)attemptckalloc(LIST_SIZE(objc));
if (listRepPtr == NULL) {
if (p) {
Tcl_Panic("list creation failed: unable to alloc %u bytes",
@@ -136,7 +145,7 @@ NewListIntRep(
*
* AttemptNewList --
*
- * Like NewListIntRep, but additionally sets an error message on failure.
+ * Like NewListInternalRep, but additionally sets an error message on failure.
*
*----------------------------------------------------------------------
*/
@@ -147,7 +156,7 @@ AttemptNewList(
int objc,
Tcl_Obj *const objv[])
{
- List *listRepPtr = NewListIntRep(objc, objv, 0);
+ List *listRepPtr = NewListInternalRep(objc, objv, 0);
if (interp != NULL && listRepPtr == NULL) {
if (objc > LIST_MAX) {
@@ -218,14 +227,14 @@ Tcl_NewListObj(
* Create the internal rep.
*/
- listRepPtr = NewListIntRep(objc, objv, 1);
+ listRepPtr = NewListInternalRep(objc, objv, 1);
/*
* Now create the object.
*/
TclInvalidateStringRep(listPtr);
- ListSetIntRep(listPtr, listRepPtr);
+ ListSetInternalRep(listPtr, listRepPtr);
return listPtr;
}
#endif /* if TCL_MEM_DEBUG */
@@ -269,14 +278,14 @@ Tcl_DbNewListObj(
* Create the internal rep.
*/
- listRepPtr = NewListIntRep(objc, objv, 1);
+ listRepPtr = NewListInternalRep(objc, objv, 1);
/*
* Now create the object.
*/
TclInvalidateStringRep(listPtr);
- ListSetIntRep(listPtr, listRepPtr);
+ ListSetInternalRep(listPtr, listRepPtr);
return listPtr;
}
@@ -333,8 +342,8 @@ Tcl_SetListObj(
*/
if (objc > 0) {
- listRepPtr = NewListIntRep(objc, objv, 1);
- ListSetIntRep(objPtr, listRepPtr);
+ listRepPtr = NewListInternalRep(objc, objv, 1);
+ ListSetInternalRep(objPtr, listRepPtr);
} else {
objPtr->bytes = tclEmptyStringRep;
objPtr->length = 0;
@@ -580,7 +589,7 @@ Tcl_ListObjAppendElement(
if (needGrow && !isShared) {
/*
- * Need to grow + unshared intrep => try to realloc
+ * Need to grow + unshared internalrep => try to realloc
*/
attempt = 2 * numRequired;
@@ -608,8 +617,8 @@ Tcl_ListObjAppendElement(
Tcl_Obj **dst, **src = &listRepPtr->elements;
/*
- * Either we have a shared intrep and we must copy to write, or we
- * need to grow and realloc attempts failed. Attempt intrep copy.
+ * Either we have a shared internalrep and we must copy to write, or we
+ * need to grow and realloc attempts failed. Attempt internalrep copy.
*/
attempt = 2 * numRequired;
@@ -640,7 +649,7 @@ Tcl_ListObjAppendElement(
if (isShared) {
/*
- * The original intrep must remain undisturbed. Copy into the new
+ * The original internalrep must remain undisturbed. Copy into the new
* one and bump refcounts
*/
while (numElems--) {
@@ -650,7 +659,7 @@ Tcl_ListObjAppendElement(
listRepPtr->refCount--;
} else {
/*
- * Old intrep to be freed, re-use refCounts.
+ * Old internalrep to be freed, re-use refCounts.
*/
memcpy(dst, src, numElems * sizeof(Tcl_Obj *));
@@ -1085,7 +1094,7 @@ Tcl_ListObjReplace(
*
* Implemented entirely as a wrapper around 'TclLindexFlat'. Reconfigures
* the argument format into required form while taking care to manage
- * shimmering so as to tend to keep the most useful intreps
+ * shimmering so as to tend to keep the most useful internalreps
* and/or avoid the most expensive conversions.
*
* Value
@@ -1469,8 +1478,8 @@ TclLsetFlat(
/*
* Replace the original elemPtr[index] in parentList with a copy
* we know to be unshared. This call will also deal with the
- * situation where parentList shares its intrep with other
- * Tcl_Obj's. Dealing with the shared intrep case can cause
+ * situation where parentList shares its internalrep with other
+ * Tcl_Obj's. Dealing with the shared internalrep case can cause
* subListPtr to become shared again, so detect that case and make
* and store another copy.
*/
@@ -1495,7 +1504,7 @@ TclLsetFlat(
* variable. Later on, when we set valuePtr in its proper place,
* then all containing lists will have their values changed, and
* will need their string reps spoiled. We maintain a list of all
- * those Tcl_Obj's (via a little intrep surgery) so we can spoil
+ * those Tcl_Obj's (via a little internalrep surgery) so we can spoil
* them at that time.
*/
@@ -1524,7 +1533,7 @@ TclLsetFlat(
}
/*
- * Clear away our intrep surgery mess.
+ * Clear away our internalrep surgery mess.
*/
chainPtr = objPtr->internalRep.twoPtrValue.ptr2;
@@ -1768,7 +1777,7 @@ DupListInternalRep(
{
List *listRepPtr = ListRepPtr(srcPtr);
- ListSetIntRep(copyPtr, listRepPtr);
+ ListSetInternalRep(copyPtr, listRepPtr);
}
/*
@@ -1905,7 +1914,7 @@ SetListFromAny(
*/
TclFreeIntRep(objPtr);
- ListSetIntRep(objPtr, listRepPtr);
+ ListSetInternalRep(objPtr, listRepPtr);
return TCL_OK;
}
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 9541828..bea0043 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -4800,7 +4800,7 @@ SetNsNameFromAny(
if ((nsPtr == NULL) || (nsPtr->flags & NS_DYING)) {
/*
- * Our failed lookup proves any previously cached nsName intrep is no
+ * Our failed lookup proves any previously cached nsName internalrep is no
* longer valid. Get rid of it so we no longer waste memory storing
* it, nor time determining its invalidity again and again.
*/
@@ -5001,7 +5001,7 @@ TclLogCommandInfo(
Tcl_ListObjLength(interp, iPtr->errorStack, &len);
/*
- * Reset while keeping the list intrep as much as possible.
+ * Reset while keeping the list internalrep as much as possible.
*/
Tcl_ListObjReplace(interp, iPtr->errorStack, 0, len, 0, NULL);
@@ -5086,7 +5086,7 @@ TclErrorStackResetIf(
Tcl_ListObjLength(interp, iPtr->errorStack, &len);
/*
- * Reset while keeping the list intrep as much as possible.
+ * Reset while keeping the list internalrep as much as possible.
*/
Tcl_ListObjReplace(interp, iPtr->errorStack, 0, len, 0, NULL);
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 2ec5eb8..0950dcd 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -1875,7 +1875,7 @@ Tcl_SetBooleanObj(
* result unless "interp" is NULL.
*
* Side effects:
- * The intrep of *objPtr may be changed.
+ * The internalrep of *objPtr may be changed.
*
*----------------------------------------------------------------------
*/
@@ -1898,7 +1898,7 @@ Tcl_GetBooleanFromObj(
if (objPtr->typePtr == &tclDoubleType) {
/*
* Caution: Don't be tempted to check directly for the "double"
- * Tcl_ObjType and then compare the intrep to 0.0. This isn't
+ * Tcl_ObjType and then compare the internalrep to 0.0. This isn't
* reliable because a "double" Tcl_ObjType can hold the NaN value.
* Use the API Tcl_GetDoubleFromObj, which does the checking and
* sets the proper error message for us.
@@ -3584,13 +3584,13 @@ Tcl_SetBignumObj(
#endif
TclInvalidateStringRep(objPtr);
TclFreeIntRep(objPtr);
- TclSetBignumIntRep(objPtr, bignumValue);
+ TclSetBignumInternalRep(objPtr, bignumValue);
}
/*
*----------------------------------------------------------------------
*
- * TclSetBignumIntRep --
+ * TclSetBignumInternalRep --
*
* Install a bignum into the internal representation of an object.
*
@@ -3606,7 +3606,7 @@ Tcl_SetBignumObj(
*/
void
-TclSetBignumIntRep(
+TclSetBignumInternalRep(
Tcl_Obj *objPtr,
mp_int *bignumValue)
{
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index a41d9fd..d919c40 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -1396,7 +1396,7 @@ AppendPath(
* that use some character other than "/" as a path separator. I know
* of no evidence that such a foolish thing exists. This solution was
* chosen so that "JoinPath" operations that pass through either path
- * intrep produce the same results; that is, bugward compatibility. If
+ * internalrep produce the same results; that is, bugward compatibility. If
* we need to fix that bug here, it needs fixing in TclJoinPath() too.
*/
bytes = Tcl_GetStringFromObj(tail, &numBytes);
diff --git a/generic/tclResult.c b/generic/tclResult.c
index 07d0e83..b1cf9ee 100644
--- a/generic/tclResult.c
+++ b/generic/tclResult.c
@@ -1322,7 +1322,7 @@ TclProcessReturn(
Tcl_ListObjLength(interp, iPtr->errorStack, &len);
/*
- * Reset while keeping the list intrep as much as possible.
+ * Reset while keeping the list internalrep as much as possible.
*/
Tcl_ListObjReplace(interp, iPtr->errorStack, 0, len, valueObjc,
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index 2e66864..35848f7 100644
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -1285,7 +1285,7 @@ TclParseNumber(
if (signum) {
(void)mp_neg(&octalSignificandBig, &octalSignificandBig);
}
- TclSetBignumIntRep(objPtr, &octalSignificandBig);
+ TclSetBignumInternalRep(objPtr, &octalSignificandBig);
}
break;
@@ -1332,7 +1332,7 @@ TclParseNumber(
if (signum) {
(void)mp_neg(&significandBig, &significandBig);
}
- TclSetBignumIntRep(objPtr, &significandBig);
+ TclSetBignumInternalRep(objPtr, &significandBig);
}
break;
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 0e1acf0..22e025c 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -3241,7 +3241,7 @@ SetStringFromAny(
TclFreeIntRep(objPtr);
/*
- * Create a basic String intrep that just points to the UTF-8 string
+ * Create a basic String internalrep that just points to the UTF-8 string
* already in place at objPtr->bytes.
*/
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 9a0203e..858163e 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -4231,7 +4231,7 @@ TclSetProcessGlobalValue(
/*
* Fill the local thread copy directly with the Tcl_Obj value to avoid
- * loss of the intrep. Increment newValue refCount early to handle case
+ * loss of the internalrep. Increment newValue refCount early to handle case
* where we set a PGV to itself.
*/
diff --git a/tests/cmdIL.test b/tests/cmdIL.test
index 06171e4..e16bfcf 100644
--- a/tests/cmdIL.test
+++ b/tests/cmdIL.test
@@ -760,7 +760,7 @@ test cmdIL-7.6 {lreverse command - unshared object [Bug 1672585]} {
test cmdIL-7.7 {lreverse command - empty object [Bug 1876793]} {
lreverse [list]
} {}
-test cmdIL-7.8 {lreverse command - shared intrep [Bug 1675044]} -setup {
+test cmdIL-7.8 {lreverse command - shared internalrep [Bug 1675044]} -setup {
teststringobj set 1 {1 2 3}
testobj convert 1 list
testobj duplicate 1 2
diff --git a/tests/format.test b/tests/format.test
index 20006ef..43100bc 100644
--- a/tests/format.test
+++ b/tests/format.test
@@ -605,12 +605,12 @@ test format-19.4.2 {Bug d498578df4: width overflow should cause limit exceeded}
} -returnCodes error -result "max size for a Tcl value exceeded"
# Note that this test may fail in future versions
-test format-20.1 {Bug 2932421: plain %s caused intrep change of args} -body {
+test format-20.1 {Bug 2932421: plain %s caused internalrep change of args} -body {
set x [dict create a b c d]
format %s $x
# After this, obj in $x should be a dict
# We are testing to make sure it has not been shimmered to a
- # different intrep when that is not necessary.
+ # different internalrep when that is not necessary.
# Whether or not there is a string rep - we should not care!
tcl::unsupported::representation $x
} -match glob -result {value is a dict *}
diff --git a/tests/io.test b/tests/io.test
index a86527b..5d800a7 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -8624,7 +8624,7 @@ test io-73.1 {channel Tcl_Obj SetChannelFromAny} {} {
} {1}
test io-73.2 {channel Tcl_Obj SetChannelFromAny, bug 2407783} -setup {
- # Invalidate intrep of 'channel' Tcl_Obj when transiting between interpreters.
+ # Invalidate internalrep of 'channel' Tcl_Obj when transiting between interpreters.
set f [open [info script] r]
} -body {
interp create foo
diff --git a/tests/lset.test b/tests/lset.test
index a130fe9..0ce1c6d 100644
--- a/tests/lset.test
+++ b/tests/lset.test
@@ -412,7 +412,7 @@ test lset-14.2 {lset, not compiled, flat args, is string rep preserved?} testeva
} "{ { 1 2 } { 3 4 } } { 3 4 }"
testConstraint testobj [llength [info commands testobj]]
-test lset-15.1 {lset: shared intrep [Bug 1677512]} -setup {
+test lset-15.1 {lset: shared internalrep [Bug 1677512]} -setup {
teststringobj set 1 {{1 2} 3}
testobj convert 1 list
testobj duplicate 1 2
diff --git a/tests/var.test b/tests/var.test
index 8bb55a2..968337b 100644
--- a/tests/var.test
+++ b/tests/var.test
@@ -1041,7 +1041,7 @@ test var-22.0 {leak in array element unset: Bug a3309d01db} -setup {
rename getbytes {}
rename doit {}
} -result 0
-test var-22.1 {leak in localVarName intrep: Bug 80304238ac} -setup {
+test var-22.1 {leak in localVarName internalrep: Bug 80304238ac} -setup {
proc getbytes {} {
lindex [split [memory info] \n] 3 3
}