diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-10-18 21:16:17 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-10-18 21:16:17 (GMT) |
| commit | a1fe345fbfa47cb85f28246a1569fce99cd93712 (patch) | |
| tree | 8f71c493b644c24cc747d7423e384310de446708 /generic/tclResult.c | |
| parent | 9fd8a3e5b180bb328c6c676605cd76c7cce7c751 (diff) | |
| download | tcl-a1fe345fbfa47cb85f28246a1569fce99cd93712.zip tcl-a1fe345fbfa47cb85f28246a1569fce99cd93712.tar.gz tcl-a1fe345fbfa47cb85f28246a1569fce99cd93712.tar.bz2 | |
* generic/tclResult.c (TclMergeReturnOptions): Make sure any -code
values get pulled out of the dictionary, even if they are integer
valued.
* generic/tclCompCmds.c (TclCompileReturnCmd): Added code to
more optimally compile [return -level 0 $x] to "push $x". [RFE 1794073]
Diffstat (limited to 'generic/tclResult.c')
| -rw-r--r-- | generic/tclResult.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/generic/tclResult.c b/generic/tclResult.c index 64be014..ed2a214 100644 --- a/generic/tclResult.c +++ b/generic/tclResult.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: tclResult.c,v 1.38 2007/09/07 15:51:26 dgp Exp $ + * RCS: @(#) $Id: tclResult.c,v 1.39 2007/10/18 21:16:18 dgp Exp $ */ #include "tclInt.h" @@ -1352,6 +1352,8 @@ TclMergeReturnOptions( "continue, or an integer", NULL); goto error; } + } + if (valuePtr != NULL) { Tcl_DictObjRemove(NULL, returnOpts, keys[KEY_CODE]); } |