summaryrefslogtreecommitdiffstats
path: root/generic/tclProc.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2016-04-07 14:54:39 (GMT)
committerdgp <dgp@users.sourceforge.net>2016-04-07 14:54:39 (GMT)
commitb6e7e4e4283f3809245d72b487eb5cc65cc6e95b (patch)
tree2093a6f7235f88705613074374e3c840ace00a67 /generic/tclProc.c
parent365f647c5fa50a235d51f440e9ecc29ecb014607 (diff)
downloadtcl-b6e7e4e4283f3809245d72b487eb5cc65cc6e95b.zip
tcl-b6e7e4e4283f3809245d72b487eb5cc65cc6e95b.tar.gz
tcl-b6e7e4e4283f3809245d72b487eb5cc65cc6e95b.tar.bz2
Tidy up the last commit.
Diffstat (limited to 'generic/tclProc.c')
-rw-r--r--generic/tclProc.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/generic/tclProc.c b/generic/tclProc.c
index 9770d26..172b860 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -69,9 +69,8 @@ const Tcl_ObjType tclProcBodyType = {
};
/*
- * The [upvar]/[uplevel] level reference type. Uses the twoPtrValue field,
- * encoding the type of level reference in ptr and the actual parsed out
- * offset in ptr2.
+ * The [upvar]/[uplevel] level reference type. Uses the longValue field
+ * to remember the integer value of a parsed #<integer> format.
*
* Uses the default behaviour throughout, and never disposes of the string
* rep; it's just a cache type.
@@ -785,7 +784,7 @@ TclGetFrame(
* Results:
* The return value is -1 if an error occurred in finding the frame (in
* this case an error message is left in the interp's result). 1 is
- * returned if objPtr was either a number or a number preceded by "#" and
+ * returned if objPtr was either an int or an int preceded by "#" and
* it specified a valid frame. 0 is returned if objPtr isn't one of the
* two things above (in this case, the lookup acts as if objPtr were
* "1"). The variable pointed to by framePtrPtr is filled in with the
@@ -807,7 +806,6 @@ TclObjGetFrame(
{
register Interp *iPtr = (Interp *) interp;
int curLevel, level, result;
- CallFrame *framePtr;
const char *name = NULL;
/*
@@ -829,7 +827,7 @@ TclObjGetFrame(
level = curLevel - level;
result = 1;
} else if (objPtr->typePtr == &levelReferenceType) {
- level = PTR2INT(objPtr->internalRep.twoPtrValue.ptr1);
+ level = (int) objPtr->internalRep.longValue;
result = 1;
} else {
name = TclGetString(objPtr);
@@ -837,7 +835,7 @@ TclObjGetFrame(
if (TCL_OK == Tcl_GetInt(NULL, name+1, &level) && level >= 0) {
TclFreeIntRep(objPtr);
objPtr->typePtr = &levelReferenceType;
- objPtr->internalRep.twoPtrValue.ptr1 = INT2PTR(level);
+ objPtr->internalRep.longValue = level;
result = 1;
} else {
result = -1;
@@ -857,6 +855,7 @@ TclObjGetFrame(
}
if (result != -1) {
if (level >= 0) {
+ CallFrame *framePtr;
for (framePtr = iPtr->varFramePtr; framePtr != NULL;
framePtr = framePtr->callerVarPtr) {
if (framePtr->level == level) {