summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.fossil-settings/ignore-glob4
-rw-r--r--generic/tclBasic.c2
-rw-r--r--generic/tclCompile.c16
-rw-r--r--generic/tclCompile.h2
-rw-r--r--generic/tclEnsemble.c8
5 files changed, 18 insertions, 14 deletions
diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index 651d616..d14bd9c 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -54,9 +54,11 @@ unix/dltest/*.o
unix/dltest/*.sl
unix/dltest/*.so
unix/tcl.pc
+unix/tclUuid.h
unix/tclIndex
unix/Tcl-Info.plist
unix/Tclsh-Info.plist
+unix/*.zip
unix/pkgs/*
win/Debug*
win/Release*
@@ -64,5 +66,7 @@ win/*.manifest
win/pkgs/*
win/coffbase.txt
win/tcl.hpj
+win/tclUuid.h
win/nmakehlp.out
win/nmhlp-out.txt
+win/*.zip \ No newline at end of file
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 422445c..1d4b686 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -5197,7 +5197,7 @@ TclEvalEx(
wordStart = tokenPtr->start;
lines[objectsUsed] = TclWordKnownAtCompileTime(tokenPtr, NULL)
- ? wordLine : -1;
+ ? wordLine : TCL_INDEX_NONE;
if (eeFramePtr->type == TCL_LOCATION_SOURCE) {
iPtr->evalFlags |= TCL_EVAL_FILE;
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 77181ed..56b6857 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -1597,7 +1597,7 @@ TclInitCompileEnv(
envPtr->clNext = NULL;
envPtr->auxDataArrayPtr = envPtr->staticAuxDataArraySpace;
- envPtr->auxDataArrayNext1 = 0;
+ envPtr->auxDataArrayNext = 0;
envPtr->auxDataArrayEnd = COMPILEENV_INIT_AUX_DATA_SIZE;
envPtr->mallocedAuxDataArray = 0;
}
@@ -1651,7 +1651,7 @@ TclFreeCompileEnv(
TclVerifyGlobalLiteralTable(envPtr->iPtr);
#endif /*TCL_COMPILE_DEBUG*/
- for (i = 0; i < envPtr->auxDataArrayNext1; i++) {
+ for (i = 0; i < envPtr->auxDataArrayNext; i++) {
if (auxDataPtr->type->freeProc != NULL) {
auxDataPtr->type->freeProc(auxDataPtr->clientData);
}
@@ -2820,7 +2820,7 @@ TclInitByteCode(
codeBytes = envPtr->codeNext - envPtr->codeStart;
objArrayBytes = envPtr->literalArrayNext * sizeof(Tcl_Obj *);
exceptArrayBytes = envPtr->exceptArrayNext * sizeof(ExceptionRange);
- auxDataArrayBytes = envPtr->auxDataArrayNext1 * sizeof(AuxData);
+ auxDataArrayBytes = envPtr->auxDataArrayNext * sizeof(AuxData);
cmdLocBytes = GetCmdLocEncodingSize(envPtr);
/*
@@ -2861,7 +2861,7 @@ TclInitByteCode(
codePtr->numCodeBytes = codeBytes;
codePtr->numLitObjects = numLitObjects;
codePtr->numExceptRanges = envPtr->exceptArrayNext;
- codePtr->numAuxDataItems = envPtr->auxDataArrayNext1;
+ codePtr->numAuxDataItems = envPtr->auxDataArrayNext;
codePtr->numCmdLocBytes = cmdLocBytes;
codePtr->maxExceptDepth = envPtr->maxExceptDepth;
codePtr->maxStackDepth = envPtr->maxStackDepth;
@@ -3330,7 +3330,7 @@ EnterCmdWordData(
/* See Ticket 4b61afd660 */
wwlines[wordIdx] =
((wordIdx == 0) || TclWordKnownAtCompileTime(tokenPtr, NULL))
- ? wordLine : -1;
+ ? wordLine : TCL_INDEX_NONE;
ePtr->line[wordIdx] = wordLine;
ePtr->next[wordIdx] = wordNext;
last = tokenPtr->start;
@@ -3734,7 +3734,7 @@ TclCreateAuxData(
AuxData *auxDataPtr;
/* Points to the new AuxData structure */
- index = envPtr->auxDataArrayNext1;
+ index = envPtr->auxDataArrayNext;
if (index >= envPtr->auxDataArrayEnd) {
/*
* Expand the AuxData array. The currently allocated entries are
@@ -3742,7 +3742,7 @@ TclCreateAuxData(
* [inclusive].
*/
- size_t currBytes = envPtr->auxDataArrayNext1 * sizeof(AuxData);
+ size_t currBytes = envPtr->auxDataArrayNext * sizeof(AuxData);
size_t newElems = 2*envPtr->auxDataArrayEnd;
size_t newBytes = newElems * sizeof(AuxData);
@@ -3763,7 +3763,7 @@ TclCreateAuxData(
}
envPtr->auxDataArrayEnd = newElems;
}
- envPtr->auxDataArrayNext1++;
+ envPtr->auxDataArrayNext++;
auxDataPtr = &envPtr->auxDataArrayPtr[index];
auxDataPtr->clientData = clientData;
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index f9e6b17..08823ee 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -355,7 +355,7 @@ typedef struct CompileEnv {
* auxDataArrayPtr points in heap else 0. */
#endif
AuxData *auxDataArrayPtr; /* Points to auxiliary data array start. */
- size_t auxDataArrayNext1; /* Next free compile aux data array index.
+ size_t auxDataArrayNext; /* Next free compile aux data array index.
* auxDataArrayNext is the number of aux data
* items and (auxDataArrayNext-1) is index of
* current aux data array entry. */
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 15c2933..2220896 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -3256,7 +3256,7 @@ TclAttemptCompileProc(
Tcl_Token *saveTokenPtr = parsePtr->tokenPtr;
size_t savedStackDepth = envPtr->currStackDepth;
unsigned savedCodeNext = envPtr->codeNext - envPtr->codeStart;
- size_t savedAuxDataArrayNext = envPtr->auxDataArrayNext1;
+ size_t savedAuxDataArrayNext = envPtr->auxDataArrayNext;
size_t savedExceptArrayNext = envPtr->exceptArrayNext;
#ifdef TCL_COMPILE_DEBUG
size_t savedExceptDepth = envPtr->exceptDepth;
@@ -3332,12 +3332,12 @@ TclAttemptCompileProc(
}
envPtr->exceptArrayNext = savedExceptArrayNext;
- if (savedAuxDataArrayNext != envPtr->auxDataArrayNext1) {
+ if (savedAuxDataArrayNext != envPtr->auxDataArrayNext) {
AuxData *auxDataPtr = envPtr->auxDataArrayPtr;
AuxData *auxDataEnd = auxDataPtr;
auxDataPtr += savedAuxDataArrayNext;
- auxDataEnd += envPtr->auxDataArrayNext1;
+ auxDataEnd += envPtr->auxDataArrayNext;
while (auxDataPtr < auxDataEnd) {
if (auxDataPtr->type->freeProc != NULL) {
@@ -3345,7 +3345,7 @@ TclAttemptCompileProc(
}
auxDataPtr++;
}
- envPtr->auxDataArrayNext1 = savedAuxDataArrayNext;
+ envPtr->auxDataArrayNext = savedAuxDataArrayNext;
}
envPtr->currStackDepth = savedStackDepth;
envPtr->codeNext = envPtr->codeStart + savedCodeNext;
generated by cgit v0.12 at 2025-12-04 07:33:58 (GMT)