diff options
| author | stanton <stanton> | 1998-09-30 20:46:21 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1998-09-30 20:46:21 (GMT) |
| commit | f7c09d63b8f64ab841356624dad6d101bd898e82 (patch) | |
| tree | 9a21845a1c40f416523c6d819911b12f31d5ad6d /generic/tclBasic.c | |
| parent | 94b67f615e361c95e27693c44d54634642ecd81f (diff) | |
| download | tcl-f7c09d63b8f64ab841356624dad6d101bd898e82.zip tcl-f7c09d63b8f64ab841356624dad6d101bd898e82.tar.gz tcl-f7c09d63b8f64ab841356624dad6d101bd898e82.tar.bz2 | |
more cleanup of 8.0.3 merges into 8.1
Diffstat (limited to 'generic/tclBasic.c')
| -rw-r--r-- | generic/tclBasic.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 719203d..e8fa7ad 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclBasic.c,v 1.1.2.2 1998/09/24 23:58:40 stanton Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.1.2.3 1998/09/30 20:46:21 stanton Exp $ */ #include "tclInt.h" @@ -903,7 +903,6 @@ DeleteInterpProc(interp) Tcl_HashEntry *hPtr; Tcl_HashSearch search; Tcl_HashTable *hTablePtr; - AssocData *dPtr; ResolverScheme *resPtr, *nextResPtr; int i; @@ -2629,12 +2628,12 @@ Tcl_EvalObj(interp, objPtr, flags) if (objPtr->typePtr == &tclByteCodeType) { codePtr = (ByteCode *) objPtr->internalRep.otherValuePtr; - if ((codePtr->iPtr != iPtr) + if (((Interp *) *codePtr->interpHandle != iPtr) || (codePtr->compileEpoch != iPtr->compileEpoch) || (codePtr->nsPtr != namespacePtr) || (codePtr->nsEpoch != namespacePtr->resolverEpoch)) { if (codePtr->flags & TCL_BYTECODE_PRECOMPILED) { - if (codePtr->iPtr != iPtr) { + if ((Interp *) *codePtr->interpHandle != iPtr) { panic("Tcl_EvalObj: compiled script jumped interps"); } codePtr->compileEpoch = iPtr->compileEpoch; @@ -3638,7 +3637,7 @@ Tcl_ExprObj(interp, objPtr, resultPtrPtr) if (((Interp *) *codePtr->interpHandle != iPtr) || (codePtr->compileEpoch != iPtr->compileEpoch)) { if (codePtr->flags & TCL_BYTECODE_PRECOMPILED) { - if (codePtr->iPtr != iPtr) { + if ((Interp *) *codePtr->interpHandle != iPtr) { panic("Tcl_ExprObj: compiled expression jumped interps"); } codePtr->compileEpoch = iPtr->compileEpoch; |