diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-31 10:31:55 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-31 10:31:55 (GMT) |
| commit | 2f3e5e010b0f103d9c1afbe009a9ca9aa648766e (patch) | |
| tree | 93d16010bea954703aad736080cb17ea3af82b51 /generic/tclExecute.c | |
| parent | f50bf4d17a2021e535f47e5253e24bd3dc1269b5 (diff) | |
| parent | 31f3f5ff6333217316c5da442a0194085211dfe1 (diff) | |
| download | tcl-2f3e5e010b0f103d9c1afbe009a9ca9aa648766e.zip tcl-2f3e5e010b0f103d9c1afbe009a9ca9aa648766e.tar.gz tcl-2f3e5e010b0f103d9c1afbe009a9ca9aa648766e.tar.bz2 | |
merge core-8-5-branch
Diffstat (limited to 'generic/tclExecute.c')
| -rw-r--r-- | generic/tclExecute.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index c2cef2a..be2e3ca 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -1494,7 +1494,7 @@ CompileExprObj( if (objPtr->typePtr == &exprCodeType) { Namespace *namespacePtr = iPtr->varFramePtr->nsPtr; - codePtr = objPtr->internalRep.otherValuePtr; + codePtr = objPtr->internalRep.twoPtrValue.ptr1; if (((Interp *) *codePtr->interpHandle != iPtr) || (codePtr->compileEpoch != iPtr->compileEpoch) || (codePtr->nsPtr != namespacePtr) @@ -1534,7 +1534,7 @@ CompileExprObj( TclInitByteCodeObj(objPtr, &compEnv); objPtr->typePtr = &exprCodeType; TclFreeCompileEnv(&compEnv); - codePtr = objPtr->internalRep.otherValuePtr; + codePtr = objPtr->internalRep.twoPtrValue.ptr1; if (iPtr->varFramePtr->localCachePtr) { codePtr->localCachePtr = iPtr->varFramePtr->localCachePtr; codePtr->localCachePtr->refCount++; @@ -1606,10 +1606,9 @@ static void FreeExprCodeInternalRep( Tcl_Obj *objPtr) { - ByteCode *codePtr = objPtr->internalRep.otherValuePtr; + ByteCode *codePtr = objPtr->internalRep.twoPtrValue.ptr1; objPtr->typePtr = NULL; - objPtr->internalRep.otherValuePtr = NULL; codePtr->refCount--; if (codePtr->refCount <= 0) { TclCleanupByteCode(codePtr); @@ -1667,7 +1666,7 @@ TclCompileObj( * here. */ - codePtr = objPtr->internalRep.otherValuePtr; + codePtr = objPtr->internalRep.twoPtrValue.ptr1; if (((Interp *) *codePtr->interpHandle != iPtr) || (codePtr->compileEpoch != iPtr->compileEpoch) || (codePtr->nsPtr != namespacePtr) @@ -1795,7 +1794,7 @@ TclCompileObj( iPtr->invokeWord = word; TclSetByteCodeFromAny(interp, objPtr, NULL, NULL); iPtr->invokeCmdFramePtr = NULL; - codePtr = objPtr->internalRep.otherValuePtr; + codePtr = objPtr->internalRep.twoPtrValue.ptr1; if (iPtr->varFramePtr->localCachePtr) { codePtr->localCachePtr = iPtr->varFramePtr->localCachePtr; codePtr->localCachePtr->refCount++; |