summaryrefslogtreecommitdiffstats
path: root/tools/tclZIC.tcl
diff options
context:
space:
mode:
authorhobbs <hobbs>2006-11-03 00:34:51 (GMT)
committerhobbs <hobbs>2006-11-03 00:34:51 (GMT)
commitc399e676c8dbdec3ce1fe4b694d7c269f9b1f675 (patch)
tree13086bc5f8998596d202f1bdeaa9df4ed46bc3cd /tools/tclZIC.tcl
parentee75480f2f9483654c8f665acd984569f3234ca8 (diff)
downloadtcl-c399e676c8dbdec3ce1fe4b694d7c269f9b1f675.zip
tcl-c399e676c8dbdec3ce1fe4b694d7c269f9b1f675.tar.gz
tcl-c399e676c8dbdec3ce1fe4b694d7c269f9b1f675.tar.bz2
* doc/ParseCmd.3, doc/Tcl.n, doc/eval.n, doc/exec.n:
* doc/fconfigure.n, doc/interp.n, doc/unknown.n: * library/auto.tcl, library/init.tcl, library/package.tcl: * library/safe.tcl, library/tm.tcl, library/msgcat/msgcat.tcl: * tests/all.tcl, tests/basic.test, tests/cmdInfo.test: * tests/compile.test, tests/encoding.test, tests/execute.test: * tests/fCmd.test, tests/http.test, tests/init.test: * tests/interp.test, tests/io.test, tests/ioUtil.test: * tests/iogt.test, tests/namespace-old.test, tests/namespace.test: * tests/parse.test, tests/pkg.test, tests/pkgMkIndex.test: * tests/proc.test, tests/reg.test, tests/trace.test: * tests/upvar.test, tests/winConsole.test, tests/winFCmd.test: * tools/tclZIC.tcl: * generic/tclParse.c (Tcl_ParseCommand): Replace {expand} with {*} officially (TIP #293). Leave -DALLOW_EXPAND=0|1 option to keep {expand} syntax for transition users. [Bug 1589629]
Diffstat (limited to 'tools/tclZIC.tcl')
-rwxr-xr-xtools/tclZIC.tcl12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/tclZIC.tcl b/tools/tclZIC.tcl
index 5fd861f..07ecd5e 100755
--- a/tools/tclZIC.tcl
+++ b/tools/tclZIC.tcl
@@ -29,7 +29,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: tclZIC.tcl,v 1.8 2005/12/05 20:40:42 kennykb Exp $
+# RCS: @(#) $Id: tclZIC.tcl,v 1.9 2006/11/03 00:34:53 hobbs Exp $
#
#----------------------------------------------------------------------
@@ -168,7 +168,7 @@ proc loadZIC {fileName} {
# Detect continuations of a zone and flag the list appropriately
lappend words ""
}
- lappend words {expand}[regexp -all -inline {\S+} $line]
+ lappend words {*}[regexp -all -inline {\S+} $line]
# Switch on the directive
@@ -914,7 +914,7 @@ proc applyRules {ruleSet year startSecs stdGMTOffset DSTOffset nextGMTOffset
set untilBaseSecs [expr {
wide(86400) * wide($untilJCD) - 210866803200 }]
set untilSecs [convertTimeOfDay $untilBaseSecs $stdGMTOffset \
- $DSTOffset {expand}$untilTimeOfDay]
+ $DSTOffset {*}$untilTimeOfDay]
}
set origStartSecs $startSecs
@@ -979,7 +979,7 @@ proc applyRules {ruleSet year startSecs stdGMTOffset DSTOffset nextGMTOffset
if {$until ne ""} {
set untilSecs [convertTimeOfDay $untilBaseSecs \
- $stdGMTOffset $DSTOffset {expand}$untilTimeOfDay]
+ $stdGMTOffset $DSTOffset {*}$untilTimeOfDay]
}
}
@@ -1081,7 +1081,7 @@ proc findEarliestRule {remainingRules year stdGMTOffset DSTOffset} {
set dayIn [eval $daySpecOn]
set secs [expr {wide(86400) * wide($dayIn) - 210866803200}]
set secs [convertTimeOfDay $secs \
- $stdGMTOffset $DSTOffset {expand}$timeAt]
+ $stdGMTOffset $DSTOffset {*}$timeAt]
if {$secs < $earliest} {
set earliest $secs
set earliestIdx $i
@@ -1207,7 +1207,7 @@ proc processTimeZone {zoneName zoneData} {
set startDay [eval $dayRule]
set secs [expr {wide(86400) * wide($startDay) -210866803200}]
set secs [convertTimeOfDay $secs \
- $stdGMTOffset $DSTOffset {expand}$timeOfDay]
+ $stdGMTOffset $DSTOffset {*}$timeOfDay]
}
lappend dstRule \
$year $secs $stdGMTOffset $DSTOffset $nextGMTOffset \