diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2015-08-02 12:22:02 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2015-08-02 12:22:02 (GMT) |
| commit | baede06dd8e3f85ac6630f1af5d84e159871ea3f (patch) | |
| tree | baba75f9008a34f23b8781996a04a40229ec00fc /generic | |
| parent | 9bacb3fab61a4db75d9e98c04a3ea906265e8249 (diff) | |
| download | tcl-baede06dd8e3f85ac6630f1af5d84e159871ea3f.zip tcl-baede06dd8e3f85ac6630f1af5d84e159871ea3f.tar.gz tcl-baede06dd8e3f85ac6630f1af5d84e159871ea3f.tar.bz2 | |
Fix more problems with break and continue in for-step clauses.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclCompile.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/generic/tclCompile.c b/generic/tclCompile.c index 478881d..f62ec14 100644 --- a/generic/tclCompile.c +++ b/generic/tclCompile.c @@ -4083,16 +4083,6 @@ TclEmitInvoke( * calls from inside a [for] increment clause). */ - rangePtr = TclGetInnermostExceptionRange(envPtr, TCL_BREAK, &auxBreakPtr); - if (rangePtr == NULL || rangePtr->type != LOOP_EXCEPTION_RANGE) { - auxBreakPtr = NULL; - } else if (auxBreakPtr->stackDepth == envPtr->currStackDepth-wordCount - && auxBreakPtr->expandTarget == envPtr->expandCount-expandCount) { - auxBreakPtr = NULL; - } else { - breakRange = auxBreakPtr - envPtr->exceptAuxArrayPtr; - } - rangePtr = TclGetInnermostExceptionRange(envPtr, TCL_CONTINUE, &auxContinuePtr); if (rangePtr == NULL || rangePtr->type != LOOP_EXCEPTION_RANGE) { @@ -4104,6 +4094,17 @@ TclEmitInvoke( continueRange = auxContinuePtr - envPtr->exceptAuxArrayPtr; } + rangePtr = TclGetInnermostExceptionRange(envPtr, TCL_BREAK, &auxBreakPtr); + if (rangePtr == NULL || rangePtr->type != LOOP_EXCEPTION_RANGE) { + auxBreakPtr = NULL; + } else if (auxContinuePtr == NULL + && auxBreakPtr->stackDepth == envPtr->currStackDepth-wordCount + && auxBreakPtr->expandTarget == envPtr->expandCount-expandCount) { + auxBreakPtr = NULL; + } else { + breakRange = auxBreakPtr - envPtr->exceptAuxArrayPtr; + } + if (auxBreakPtr != NULL || auxContinuePtr != NULL) { loopRange = TclCreateExceptRange(LOOP_EXCEPTION_RANGE, envPtr); ExceptionRangeStarts(envPtr, loopRange); |