diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-06-13 11:46:31 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-06-13 11:46:31 (GMT) |
| commit | dd9fc01a38ab12c48224f9e335f0415b9594a1b8 (patch) | |
| tree | 29194960e58b0f9bfda039a7eaaeefe7eaaf445f /generic/tclCompile.c | |
| parent | df5d89543ede18ab7c37d6dbd92992013053017c (diff) | |
| parent | 310451d63efb820df4ad0aa96ca1944b594d1c32 (diff) | |
| download | tcl-dd9fc01a38ab12c48224f9e335f0415b9594a1b8.zip tcl-dd9fc01a38ab12c48224f9e335f0415b9594a1b8.tar.gz tcl-dd9fc01a38ab12c48224f9e335f0415b9594a1b8.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclCompile.c')
| -rw-r--r-- | generic/tclCompile.c | 16 |
1 files changed, 8 insertions, 8 deletions
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; |