summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2008-08-21 10:36:57 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2008-08-21 10:36:57 (GMT)
commit8ab97c30e3c73b79ec3b866da2879596d77cc9b7 (patch)
treef156a203d1b3f8f7d3c78285e4954a57d0507167
parentae0969dc1fc93fffcaffba7b9558c852a33d624f (diff)
downloadtcl-8ab97c30e3c73b79ec3b866da2879596d77cc9b7.zip
tcl-8ab97c30e3c73b79ec3b866da2879596d77cc9b7.tar.gz
tcl-8ab97c30e3c73b79ec3b866da2879596d77cc9b7.tar.bz2
Align variable naming and typing a bit better with tclNamesp.c.
-rw-r--r--generic/tclOOMethod.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c
index c33638d..67d67b5 100644
--- a/generic/tclOOMethod.c
+++ b/generic/tclOOMethod.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclOOMethod.c,v 1.15 2008/08/20 23:48:42 patthoyts Exp $
+ * RCS: @(#) $Id: tclOOMethod.c,v 1.16 2008/08/21 10:36:57 dkf Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -735,7 +735,7 @@ PushMethodCallFrame(
PMFrameData *fdPtr) /* Place to store information about the call
* frame. */
{
- Tcl_Namespace *nsPtr = contextPtr->oPtr->namespacePtr;
+ Namespace *nsPtr = (Namespace *) contextPtr->oPtr->namespacePtr;
register int result;
const char *namePtr;
CallFrame **framePtrPtr = &fdPtr->framePtr;
@@ -772,9 +772,10 @@ PushMethodCallFrame(
contextPtr->callPtr->chain[contextPtr->index].mPtr;
if (mPtr->declaringClassPtr != NULL) {
- nsPtr = mPtr->declaringClassPtr->thisPtr->namespacePtr;
+ nsPtr = (Namespace *)
+ mPtr->declaringClassPtr->thisPtr->namespacePtr;
} else {
- nsPtr = mPtr->declaringObjectPtr->namespacePtr;
+ nsPtr = (Namespace *) mPtr->declaringObjectPtr->namespacePtr;
}
}
@@ -784,7 +785,7 @@ PushMethodCallFrame(
fdPtr->efi.length = 2;
memset(&fdPtr->cmd, 0, sizeof(Command));
- fdPtr->cmd.nsPtr = (Namespace *) nsPtr;
+ fdPtr->cmd.nsPtr = nsPtr;
fdPtr->cmd.clientData = &fdPtr->efi;
pmPtr->procPtr->cmdPtr = &fdPtr->cmd;
@@ -799,11 +800,10 @@ PushMethodCallFrame(
ByteCode *codePtr =
pmPtr->procPtr->bodyPtr->internalRep.otherValuePtr;
- codePtr->nsPtr = (Namespace *) nsPtr;
+ codePtr->nsPtr = nsPtr;
}
result = TclProcCompileProc(interp, pmPtr->procPtr,
- pmPtr->procPtr->bodyPtr, (Namespace *) nsPtr, "body of method",
- namePtr);
+ pmPtr->procPtr->bodyPtr, nsPtr, "body of method", namePtr);
if (result != TCL_OK) {
return result;
}
@@ -813,8 +813,8 @@ PushMethodCallFrame(
* This operation may fail.
*/
- result = TclPushStackFrame(interp, (Tcl_CallFrame **) framePtrPtr, nsPtr,
- FRAME_IS_PROC|FRAME_IS_METHOD);
+ result = TclPushStackFrame(interp, (Tcl_CallFrame **) framePtrPtr,
+ (Tcl_Namespace *) nsPtr, FRAME_IS_PROC|FRAME_IS_METHOD);
if (result != TCL_OK) {
return result;
}