From 84894d3d9921cd7e43e0e3f398b5dc53f3e407aa Mon Sep 17 00:00:00 2001 From: dkf Date: Tue, 24 May 2011 12:23:52 +0000 Subject: Remove some useless code from mcset and mcmset: [dict set] builds dictionary levels for us. FossilOrigin-Name: 076d311d4face72de065fb184a0cf4275d34ba1a --- ChangeLog | 5 +++++ generic/tclInt.h | 7 +++++-- library/msgcat/msgcat.tcl | 14 -------------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e64b7c..83fa590 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-05-24 Donal K. Fellows + + * library/msgcat/msgcat.tcl (msgcat::mcset, msgcat::mcmset): Remove + some useless code; [dict set] builds dictionary levels for us. + 2011-05-17 Andreas Kupries * generic/tclCompile.c (TclFixupForwardJump): Tracked down and fixed diff --git a/generic/tclInt.h b/generic/tclInt.h index 8f003be..75f894f 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -4227,8 +4227,11 @@ MODULE_SCOPE void TclDbInitNewObj(Tcl_Obj *objPtr, const char *file, */ #define TclInvalidateNsCmdLookup(nsPtr) \ - if ((nsPtr)->numExportPatterns) { \ - (nsPtr)->exportLookupEpoch++; \ + if ((nsPtr)->numExportPatterns) { \ + (nsPtr)->exportLookupEpoch++; \ + } \ + if ((nsPtr)->commandPathLength) { \ + (nsPtr)->cmdRefEpoch++; \ } /* diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl index a9b4533..b39820a 100644 --- a/library/msgcat/msgcat.tcl +++ b/library/msgcat/msgcat.tcl @@ -313,13 +313,6 @@ proc msgcat::mcset {locale src {dest ""}} { set locale [string tolower $locale] - # create nested dictionaries if they do not exist - if {![dict exists $Msgs $locale]} { - dict set Msgs $locale [dict create] - } - if {![dict exists $Msgs $locale $ns]} { - dict set Msgs $locale $ns [dict create] - } dict set Msgs $locale $ns $src $dest return $dest } @@ -347,13 +340,6 @@ proc msgcat::mcmset {locale pairs } { set locale [string tolower $locale] set ns [uplevel 1 [list ::namespace current]] - # create nested dictionaries if they do not exist - if {![dict exists $Msgs $locale]} { - dict set Msgs $locale [dict create] - } - if {![dict exists $Msgs $locale $ns]} { - dict set Msgs $locale $ns [dict create] - } foreach {src dest} $pairs { dict set Msgs $locale $ns $src $dest } -- cgit v0.12