diff options
| author | dgp <dgp@users.sourceforge.net> | 2004-09-24 01:14:38 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2004-09-24 01:14:38 (GMT) |
| commit | d1fefb7ec79f96d245eb6d5c88159ca70251ccd2 (patch) | |
| tree | 1df679b5cc067e181ce58de48df471961b5d2fec /generic | |
| parent | 910d08025cdac3f37d7cf798cee2b634f6ebd711 (diff) | |
| download | tcl-d1fefb7ec79f96d245eb6d5c88159ca70251ccd2.zip tcl-d1fefb7ec79f96d245eb6d5c88159ca70251ccd2.tar.gz tcl-d1fefb7ec79f96d245eb6d5c88159ca70251ccd2.tar.bz2 | |
* generic/tclBasic.c: Corrections to the 2004-09-21 commit
* generic/tclExecute.c: regarding ERR_ALREADY_LOGGED. That commit
* generic/tclNamesp.c: caused Tk test send-10.7 to fail. Added
* tests/namespace.test (25.7,8): tests in the Tcl test suite
* tests/pkg.test (2.25,26): to catch this error without the
aid of Tk in the future.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclBasic.c | 3 | ||||
| -rw-r--r-- | generic/tclExecute.c | 3 | ||||
| -rw-r--r-- | generic/tclNamesp.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index aabcb27..e83da4f 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclBasic.c,v 1.115 2004/09/21 22:45:40 dgp Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.116 2004/09/24 01:14:41 dgp Exp $ */ #include "tclInt.h" @@ -3644,6 +3644,7 @@ Tcl_EvalEx(interp, script, numBytes, flags) } Tcl_LogCommandInfo(interp, script, parse.commandStart, commandLength); } + iPtr->flags &= ~ERR_ALREADY_LOGGED; for (i = 0; i < objectsUsed; i++) { Tcl_DecrRefCount(objv[i]); diff --git a/generic/tclExecute.c b/generic/tclExecute.c index a79ab92..138d25e 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclExecute.c,v 1.152 2004/09/22 15:48:22 msofer Exp $ + * RCS: @(#) $Id: tclExecute.c,v 1.153 2004/09/24 01:14:42 dgp Exp $ */ #ifdef STDC_HEADERS @@ -4829,6 +4829,7 @@ TclExecuteByteCode(interp, codePtr) CACHE_STACK_INFO(); } } + iPtr->flags &= ~ERR_ALREADY_LOGGED; /* * Clear all expansions that may have started after the last diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c index 902d5d6..abd179c 100644 --- a/generic/tclNamesp.c +++ b/generic/tclNamesp.c @@ -21,7 +21,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclNamesp.c,v 1.54 2004/09/21 22:45:42 dgp Exp $ + * RCS: @(#) $Id: tclNamesp.c,v 1.55 2004/09/24 01:14:43 dgp Exp $ */ #include "tclInt.h" @@ -515,7 +515,6 @@ Tcl_PopCallFrame(interp) } iPtr->flags |= saveErrFlag; - iPtr->flags &= ~ERR_ALREADY_LOGGED; /* * Decrement the namespace's count of active call frames. If the |