diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-12-04 14:28:05 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-12-04 14:28:05 (GMT) |
| commit | f6e907f74bbe282836b805a07969dba5bb152d6a (patch) | |
| tree | eea70cfba544f960fa7c10c4b4591446363b73ea /generic/tclTest.c | |
| parent | 5b235b69d517aa8db6f124990b7eb3bd0e37f4be (diff) | |
| parent | 4f028801329088a592139290fa378e51d1b5cbb5 (diff) | |
| download | tcl-novem_reduced_bytecodes.zip tcl-novem_reduced_bytecodes.tar.gz tcl-novem_reduced_bytecodes.tar.bz2 | |
merge main novem branchnovem_reduced_bytecodes
Diffstat (limited to 'generic/tclTest.c')
| -rw-r--r-- | generic/tclTest.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c index 07be9e9..9b958dd 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -108,13 +108,6 @@ typedef struct TclEncoding { } TclEncoding; /* - * The counter below is used to determine if the TestsaveresultFree routine - * was called for a result. - */ - -static int freeCount; - -/* * Boolean flag used by the "testsetmainloop" and "testexitmainloop" commands. */ @@ -4869,7 +4862,6 @@ TestsaveresultCmd( int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ { - Interp* iPtr = (Interp*) interp; int discard, result, index; Tcl_SavedResult state; Tcl_Obj *objPtr; @@ -4920,7 +4912,6 @@ TestsaveresultCmd( break; } - freeCount = 0; Tcl_SaveResult(interp, &state); if (((enum options) index) == RESULT_OBJECT) { @@ -4937,14 +4928,10 @@ TestsaveresultCmd( } switch ((enum options) index) { - case RESULT_DYNAMIC: { - int present = iPtr->freeProc == TestsaveresultFree; - int called = freeCount; - - Tcl_AppendElement(interp, called ? "called" : "notCalled"); - Tcl_AppendElement(interp, present ? "present" : "missing"); + case RESULT_DYNAMIC: + Tcl_AppendElement(interp, discard ? "called" : "notCalled"); + Tcl_AppendElement(interp, !discard ? "present" : "missing"); break; - } case RESULT_OBJECT: Tcl_AppendElement(interp, Tcl_GetObjResult(interp) == objPtr ? "same" : "different"); @@ -4975,7 +4962,7 @@ static void TestsaveresultFree( char *blockPtr) { - freeCount++; + /* empty... */ } /* |