diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-05-10 16:53:20 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-05-10 16:53:20 (GMT) |
| commit | 2c218563b3055471287255c3c1108c2d5caca64d (patch) | |
| tree | ca08cad331465fa9a24303ae48454b369453f22c /generic/tclCompile.c | |
| parent | 0d83fc1704c2c77276583d12c60a0c95dcf5c285 (diff) | |
| parent | 5789574f89985a9478d9ac5786cf143cc29451c2 (diff) | |
| download | tcl-2c218563b3055471287255c3c1108c2d5caca64d.zip tcl-2c218563b3055471287255c3c1108c2d5caca64d.tar.gz tcl-2c218563b3055471287255c3c1108c2d5caca64d.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclCompile.c')
| -rw-r--r-- | generic/tclCompile.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/generic/tclCompile.c b/generic/tclCompile.c index 8c2d703..469309d 100644 --- a/generic/tclCompile.c +++ b/generic/tclCompile.c @@ -720,13 +720,14 @@ static const Tcl_ObjType substCodeType = { NULL, /* updateStringProc */ NULL, /* setFromAnyProc */ }; +#define SubstFlags(objPtr) (objPtr)->internalRep.twoPtrValue.ptr2 /* * Helper macros. */ #define TclIncrUInt4AtPtr(ptr, delta) \ - TclStoreInt4AtPtr(TclGetUInt4AtPtr(ptr)+(delta), (ptr)); + TclStoreInt4AtPtr(TclGetUInt4AtPtr(ptr)+(delta), (ptr)) /* *---------------------------------------------------------------------- @@ -1305,7 +1306,7 @@ CompileSubstObj( if (codePtr != NULL) { Namespace *nsPtr = iPtr->varFramePtr->nsPtr; - if (flags != PTR2INT(objPtr->internalRep.twoPtrValue.ptr2) + if (flags != PTR2INT(SubstFlags(objPtr)) || ((Interp *) *codePtr->interpHandle != iPtr) || (codePtr->compileEpoch != iPtr->compileEpoch) || (codePtr->nsPtr != nsPtr) @@ -1330,7 +1331,7 @@ CompileSubstObj( codePtr = TclInitByteCodeObj(objPtr, &substCodeType, &compEnv); TclFreeCompileEnv(&compEnv); - objPtr->internalRep.twoPtrValue.ptr2 = INT2PTR(flags); + SubstFlags(objPtr) = INT2PTR(flags); if (iPtr->varFramePtr->localCachePtr) { codePtr->localCachePtr = iPtr->varFramePtr->localCachePtr; codePtr->localCachePtr->refCount++; |