summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2008-09-10 13:17:51 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2008-09-10 13:17:51 (GMT)
commit15bee119a24685e66f1d427e207032ea02d04c64 (patch)
treed8a34d2cbc81e6bc796eda193b958269f5cab158
parente3e6b80ad37780e6da0793def7b2076461f69d83 (diff)
downloadtcl-15bee119a24685e66f1d427e207032ea02d04c64.zip
tcl-15bee119a24685e66f1d427e207032ea02d04c64.tar.gz
tcl-15bee119a24685e66f1d427e207032ea02d04c64.tar.bz2
Fix efficiency bug detected by Kieran Elby.
-rw-r--r--ChangeLog7
-rw-r--r--generic/tclListObj.c13
2 files changed, 18 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 76eff3d..0944544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-10 Donal K. Fellows <donal.k.fellows@man.ac.uk>
+
+ * generic/tclListObj.c (Tcl_ListObjGetElements): Make this list->dict
+ transformation - encountered when using [foreach] with dicts - not as
+ expensive as it was before. Spotted by Kieran Elby and reported on
+ tcl-core.
+
2008-09-07 Miguel Sofer <msofer@users.sf.net>
* doc/namespace.n: fix [Bug 2098441]
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 2bbaa22..95e3f33 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclListObj.c,v 1.49.2.1 2008/07/20 22:02:39 dkf Exp $
+ * RCS: @(#) $Id: tclListObj.c,v 1.49.2.2 2008/09/10 13:18:11 dkf Exp $
*/
#include "tclInt.h"
@@ -428,7 +428,16 @@ Tcl_ListObjGetElements(
if (listPtr->typePtr != &tclListType) {
int result, length;
- (void) TclGetStringFromObj(listPtr, &length);
+ /*
+ * Don't get the string version of a dictionary; that transformation
+ * is not lossy, but is expensive.
+ */
+
+ if (listPtr->typePtr == &tclDictType) {
+ (void) Tcl_DictObjSize(NULL, listPtr, &length);
+ } else {
+ (void) TclGetStringFromObj(listPtr, &length);
+ }
if (!length) {
*objcPtr = 0;
*objvPtr = NULL;