diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2008-07-27 22:28:54 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2008-07-27 22:28:54 (GMT) |
| commit | 620325b7527923ddf3727210101f009552e00d47 (patch) | |
| tree | f85e748145240dcb0979ffdb01cb3d42d2065c24 | |
| parent | 18bbede136bbdbc5867f284093730f6b5b57cff6 (diff) | |
| download | tcl-620325b7527923ddf3727210101f009552e00d47.zip tcl-620325b7527923ddf3727210101f009552e00d47.tar.gz tcl-620325b7527923ddf3727210101f009552e00d47.tar.bz2 | |
Remove unnecessary hack.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tclOOMethod.c | 10 |
2 files changed, 7 insertions, 8 deletions
@@ -1,3 +1,8 @@ +2008-07-27 Donal K. Fellows <dkf@users.sf.net> + + * generic/tclOOMethod.c (PushMethodCallFrame): Remove hack that should + have gone when this code was merged into Tcl. + 2007-07-27 Jan Nijtmans <nijtmans@users.sf.net> * doc/Object.3 CONSTified 3 functions using diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c index 8dfb834..8ce3c34 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.9 2008/07/27 22:18:23 nijtmans Exp $ + * RCS: @(#) $Id: tclOOMethod.c,v 1.10 2008/07/27 22:28:54 dkf Exp $ */ #ifdef HAVE_CONFIG_H @@ -736,7 +736,6 @@ PushMethodCallFrame( register int result; const char *namePtr; CallFrame **framePtrPtr = &fdPtr->framePtr; - static const Tcl_ObjType *byteCodeTypePtr = NULL; /* HACK! */ /* * Compute basic information on the basis of the type of method it is. @@ -786,18 +785,13 @@ PushMethodCallFrame( fdPtr->cmd.clientData = &fdPtr->efi; pmPtr->procPtr->cmdPtr = &fdPtr->cmd; - /* Should be a reference to tclByteCodeType, but that's MODULE_SCOPE */ - if (byteCodeTypePtr == NULL || - pmPtr->procPtr->bodyPtr->typePtr != byteCodeTypePtr) { + if (pmPtr->procPtr->bodyPtr->typePtr != &tclByteCodeType) { result = TclProcCompileProc(interp, pmPtr->procPtr, pmPtr->procPtr->bodyPtr, (Namespace *) nsPtr, "body of method", namePtr); if (result != TCL_OK) { return result; } - if (byteCodeTypePtr == NULL) { - byteCodeTypePtr = pmPtr->procPtr->bodyPtr->typePtr; - } } /* |