diff options
Diffstat (limited to 'generic/tclDictObj.c')
| -rw-r--r-- | generic/tclDictObj.c | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c index 2f1b1cd..1dc87d4 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.29 2005/04/22 15:46:54 dgp Exp $ + * RCS: @(#) $Id: tclDictObj.c,v 1.30 2005/05/05 18:37:58 dgp Exp $ */ #include "tclInt.h" @@ -1671,6 +1671,14 @@ DictKeysCmd(interp, objc, objv) pattern = TclGetString(objv[3]); } listPtr = Tcl_NewListObj(0, NULL); + if ((pattern != NULL) && TclMatchIsTrivial(pattern)) { + Tcl_Obj *valuePtr = NULL; + Tcl_DictObjGet(interp, objv[2], objv[3], &valuePtr); + if (valuePtr != NULL) { + Tcl_ListObjAppendElement(interp, listPtr, objv[3]); + } + goto searchDone; + } for (; !done ; Tcl_DictObjNext(&search, &keyPtr, NULL, &done)) { if (pattern==NULL || Tcl_StringMatch(TclGetString(keyPtr), pattern)) { /* @@ -1679,6 +1687,7 @@ DictKeysCmd(interp, objc, objv) Tcl_ListObjAppendElement(interp, listPtr, keyPtr); } } +searchDone: Tcl_SetObjResult(interp, listPtr); return TCL_OK; } @@ -2531,11 +2540,18 @@ DictFilterCmd(interp, objc, objv) } pattern = TclGetString(objv[4]); resultObj = Tcl_NewDictObj(); - while (!done) { - if (Tcl_StringMatch(TclGetString(keyObj), pattern)) { - Tcl_DictObjPut(interp, resultObj, keyObj, valueObj); + if (TclMatchIsTrivial(pattern)) { + Tcl_DictObjGet(interp, objv[2], objv[4], &valueObj); + if (valueObj != NULL) { + Tcl_DictObjPut(interp, resultObj, objv[4], valueObj); + } + } else { + while (!done) { + if (Tcl_StringMatch(TclGetString(keyObj), pattern)) { + Tcl_DictObjPut(interp, resultObj, keyObj, valueObj); + } + Tcl_DictObjNext(&search, &keyObj, &valueObj, &done); } - Tcl_DictObjNext(&search, &keyObj, &valueObj, &done); } Tcl_SetObjResult(interp, resultObj); return TCL_OK; |