summaryrefslogtreecommitdiffstats
path: root/generic/tclDictObj.c
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2009-01-28 16:28:32 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2009-01-28 16:28:32 (GMT)
commit8b6830d61d7629ebf10cec3f12fe6c0c97ef8ea2 (patch)
tree0ae587f1ed02d2ccb8915f643985df3364320b61 /generic/tclDictObj.c
parent960bd1422f5ba24fa513f9738934538ab3140c73 (diff)
downloadtcl-8b6830d61d7629ebf10cec3f12fe6c0c97ef8ea2.zip
tcl-8b6830d61d7629ebf10cec3f12fe6c0c97ef8ea2.tar.gz
tcl-8b6830d61d7629ebf10cec3f12fe6c0c97ef8ea2.tar.bz2
Apply resolution for [Bug 2529157]. Fix another location in tclBasic.c where
only the objProc case was handled and not the nreProc case.
Diffstat (limited to 'generic/tclDictObj.c')
-rw-r--r--generic/tclDictObj.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c
index 5c4295e..c800441 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.75 2009/01/09 11:21:45 dkf Exp $
+ * RCS: @(#) $Id: tclDictObj.c,v 1.76 2009/01/28 16:28:32 dkf Exp $
*/
#include "tclInt.h"
@@ -33,8 +33,6 @@ static int DictExistsCmd(ClientData dummy, Tcl_Interp *interp,
int objc, Tcl_Obj *const *objv);
static int DictFilterCmd(ClientData dummy, Tcl_Interp *interp,
int objc, Tcl_Obj *const *objv);
-static int DictForCmd(ClientData dummy, Tcl_Interp *interp,
- int objc, Tcl_Obj *const *objv);
static int DictGetCmd(ClientData dummy, Tcl_Interp *interp,
int objc, Tcl_Obj *const *objv);
static int DictIncrCmd(ClientData dummy, Tcl_Interp *interp,
@@ -93,7 +91,7 @@ static const EnsembleImplMap implementationMap[] = {
{"create", DictCreateCmd },
{"exists", DictExistsCmd },
{"filter", DictFilterCmd },
- {"for", DictForCmd, TclCompileDictForCmd, DictForNRCmd },
+ {"for", NULL, TclCompileDictForCmd, DictForNRCmd },
{"get", DictGetCmd, TclCompileDictGetCmd },
{"incr", DictIncrCmd, TclCompileDictIncrCmd },
{"info", DictInfoCmd },
@@ -2368,7 +2366,7 @@ DictAppendCmd(
/*
*----------------------------------------------------------------------
*
- * DictForCmd --
+ * DictForNRCmd --
*
* This function implements the "dict for" Tcl command. See the user
* documentation for details on what it does, and TIP#111 for the formal
@@ -2384,16 +2382,6 @@ DictAppendCmd(
*/
static int
-DictForCmd(
- ClientData dummy,
- Tcl_Interp *interp,
- int objc,
- Tcl_Obj *const *objv)
-{
- return Tcl_NRCallObjProc(interp, DictForNRCmd, dummy, objc, objv);
-}
-
-static int
DictForNRCmd(
ClientData dummy,
Tcl_Interp *interp,