diff options
| -rw-r--r-- | generic/tclAssembly.c | 12 | ||||
| -rw-r--r-- | generic/tclCompile.c | 2 | ||||
| -rw-r--r-- | generic/tclCompile.h | 2 | ||||
| -rw-r--r-- | generic/tclDisassemble.c | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c index 609958b..91abd9f 100644 --- a/generic/tclAssembly.c +++ b/generic/tclAssembly.c @@ -1940,7 +1940,7 @@ MoveExceptionRangesToBasicBlock( envPtr->exceptArrayPtr + savedExceptArrayNext, exceptionCount * sizeof(ExceptionRange)); for (i = 0; i < exceptionCount; ++i) { - curr_bb->foreignExceptions[i].nestingLevel1 -= envPtr->exceptDepth; + curr_bb->foreignExceptions[i].nestingLevel -= envPtr->exceptDepth; } envPtr->exceptArrayNext = savedExceptArrayNext; } @@ -4125,9 +4125,9 @@ StackFreshCatches( catchIndices[catchDepth] = TclCreateExceptRange(CATCH_EXCEPTION_RANGE, envPtr); range = envPtr->exceptArrayPtr + catchIndices[catchDepth]; - range->nestingLevel1 = envPtr->exceptDepth + catchDepth; + range->nestingLevel = envPtr->exceptDepth + catchDepth; envPtr->maxExceptDepth= - TclMax(range->nestingLevel1 + 1, envPtr->maxExceptDepth); + TclMax(range->nestingLevel + 1, envPtr->maxExceptDepth); range->codeOffset = bbPtr->startOffset; entryPtr = Tcl_FindHashEntry(&assemEnvPtr->labelHash, @@ -4187,11 +4187,11 @@ RestoreEmbeddedExceptionRanges( for (i = 0; i < bbPtr->foreignExceptionCount; ++i) { range = bbPtr->foreignExceptions + i; rangeIndex = TclCreateExceptRange(range->type, envPtr); - range->nestingLevel1 += envPtr->exceptDepth + bbPtr->catchDepth; + range->nestingLevel += envPtr->exceptDepth + bbPtr->catchDepth; memcpy(envPtr->exceptArrayPtr + rangeIndex, range, sizeof(ExceptionRange)); - if ((int)range->nestingLevel1 >= (int)envPtr->maxExceptDepth) { - envPtr->maxExceptDepth = range->nestingLevel1 + 1; + if ((int)range->nestingLevel >= (int)envPtr->maxExceptDepth) { + envPtr->maxExceptDepth = range->nestingLevel + 1; } } diff --git a/generic/tclCompile.c b/generic/tclCompile.c index 2209445..b0bf37c 100644 --- a/generic/tclCompile.c +++ b/generic/tclCompile.c @@ -3410,7 +3410,7 @@ TclCreateExceptRange( rangePtr = &envPtr->exceptArrayPtr[index]; rangePtr->type = type; - rangePtr->nestingLevel1 = envPtr->exceptDepth; + rangePtr->nestingLevel = envPtr->exceptDepth; rangePtr->codeOffset = TCL_INDEX_NONE; rangePtr->numCodeBytes = TCL_INDEX_NONE; rangePtr->breakOffset = TCL_INDEX_NONE; diff --git a/generic/tclCompile.h b/generic/tclCompile.h index 16d84bf..1b967cc 100644 --- a/generic/tclCompile.h +++ b/generic/tclCompile.h @@ -89,7 +89,7 @@ typedef enum { typedef struct { ExceptionRangeType type; /* The kind of ExceptionRange. */ - size_t nestingLevel1; /* Static depth of the exception range. Used + size_t nestingLevel; /* Static depth of the exception range. Used * to find the most deeply-nested range * surrounding a PC at runtime. */ size_t codeOffset; /* Offset of the first instruction byte of the diff --git a/generic/tclDisassemble.c b/generic/tclDisassemble.c index 572ac94..6fdc488 100644 --- a/generic/tclDisassemble.c +++ b/generic/tclDisassemble.c @@ -359,7 +359,7 @@ DisassembleByteCodeObj( Tcl_AppendPrintfToObj(bufferObj, " %d: level %" TCL_Z_MODIFIER "u, %s, pc %" TCL_Z_MODIFIER "u-%" TCL_Z_MODIFIER "u, ", - i, rangePtr->nestingLevel1, + i, rangePtr->nestingLevel, (rangePtr->type==LOOP_EXCEPTION_RANGE ? "loop" : "catch"), rangePtr->codeOffset, (rangePtr->codeOffset + rangePtr->numCodeBytes - 1)); @@ -1145,14 +1145,14 @@ DisassembleByteCodeAsDicts( case LOOP_EXCEPTION_RANGE: Tcl_ListObjAppendElement(NULL, exn, Tcl_ObjPrintf( "type %s level %" TCL_Z_MODIFIER "u from %" TCL_Z_MODIFIER "u to %" TCL_Z_MODIFIER "u break %" TCL_Z_MODIFIER "u continue %" TCL_Z_MODIFIER "u", - "loop", rangePtr->nestingLevel1, rangePtr->codeOffset, + "loop", rangePtr->nestingLevel, rangePtr->codeOffset, rangePtr->codeOffset + rangePtr->numCodeBytes - 1, rangePtr->breakOffset, rangePtr->continueOffset)); break; case CATCH_EXCEPTION_RANGE: Tcl_ListObjAppendElement(NULL, exn, Tcl_ObjPrintf( "type %s level %" TCL_Z_MODIFIER "u from %" TCL_Z_MODIFIER "u to %" TCL_Z_MODIFIER "u catch %" TCL_Z_MODIFIER "u", - "catch", rangePtr->nestingLevel1, rangePtr->codeOffset, + "catch", rangePtr->nestingLevel, rangePtr->codeOffset, rangePtr->codeOffset + rangePtr->numCodeBytes - 1, rangePtr->catchOffset)); break; |