summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2008-07-17 21:57:15 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2008-07-17 21:57:15 (GMT)
commit64588075b58f9f40259956eb562cd0726693b92d (patch)
tree22cc25bd920f382d5bff713f39c12af044b46a7d /generic
parentf30d8e3cdfa9ffef067740f6c285a1dfb246c70d (diff)
downloadtcl-64588075b58f9f40259956eb562cd0726693b92d.zip
tcl-64588075b58f9f40259956eb562cd0726693b92d.tar.gz
tcl-64588075b58f9f40259956eb562cd0726693b92d.tar.bz2
stop crash in test suite!
Diffstat (limited to 'generic')
-rw-r--r--generic/tclDictObj.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c
index a2cae3a..9764c30 100644
--- a/generic/tclDictObj.c
+++ b/generic/tclDictObj.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclDictObj.c,v 1.60 2008/07/17 20:43:37 dkf Exp $
+ * RCS: @(#) $Id: tclDictObj.c,v 1.61 2008/07/17 21:57:15 dkf Exp $
*/
#include "tclInt.h"
@@ -2932,7 +2932,12 @@ DictUpdateCmd(
objPtr = Tcl_NewListObj(objc-3, objv+2);
Tcl_IncrRefCount(objPtr);
TclNR_AddCallback(interp, FinalizeDictUpdate, objv[1], objPtr, NULL,NULL);
+#if 0
+ /* This crashes when doing nested [dict update]s. */
return TclNREvalObjEx(interp, objv[objc-1], 0, iPtr->cmdFramePtr, objc-1);
+#else
+ return TclNR_EvalObj(interp, objv[objc-1], 0);
+#endif
}
static int
@@ -3110,7 +3115,12 @@ DictWithCmd(
Tcl_IncrRefCount(objv[1]);
TclNR_AddCallback(interp, FinalizeDictWith, objv[1], keysPtr, pathPtr,
NULL);
+#if 0
+ /* This crashes when doing nested [dict with]s. */
return TclNREvalObjEx(interp, objv[objc-1], 0, iPtr->cmdFramePtr, objc-1);
+#else
+ return TclNR_EvalObj(interp, objv[objc-1], 0);
+#endif
}
static int