From 9535d1ecdc9355cff86a0335a55d50a5da242457 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Wed, 27 Mar 2019 20:05:26 +0000 Subject: Document maximum value for right argument of '**' operator. Adapt test-cases to test for exactly one more than this maximum value. Make sure that the maximum is the same for DIGIT_BIT > 28. Change macro's for mp_iseven()/mp_isodd() so they don't depend on value of DIGIT_BIT any more. --- .fossil-settings/ignore-glob | 2 ++ doc/expr.n | 3 ++- doc/mathop.n | 9 +++++---- generic/tclExecute.c | 6 +++++- generic/tclTomMath.h | 4 ++-- libtommath/astylerc | 27 +++++++++++++++++++++++++++ libtommath/tommath.h | 4 ++-- tests/expr.test | 42 +++++++++++++++++++++--------------------- 8 files changed, 66 insertions(+), 31 deletions(-) create mode 100644 libtommath/astylerc diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob index c85b488..99fd07e 100644 --- a/.fossil-settings/ignore-glob +++ b/.fossil-settings/ignore-glob @@ -24,9 +24,11 @@ libtommath/bn.ilg libtommath/bn.ind libtommath/pretty.build libtommath/tommath.src +libtommath/*.log libtommath/*.pdf libtommath/*.pl libtommath/*.sh +libtommath/doc/* libtommath/tombc/* libtommath/pre_gen/* libtommath/pics/* diff --git a/doc/expr.n b/doc/expr.n index b76b6a2..2a0af7e 100644 --- a/doc/expr.n +++ b/doc/expr.n @@ -126,7 +126,8 @@ applied only to integers. .TP 20 \fB**\fR . -Exponentiation. Valid for any numeric operands. +Exponentiation. Valid for any numeric operands. The maximum exponent value +that Tcl can handle if the first number is an integer > 1 is 268435455. .TP 20 \fB*\0\0/\0\0%\fR . diff --git a/doc/mathop.n b/doc/mathop.n index 4c16d76..84cf308 100644 --- a/doc/mathop.n +++ b/doc/mathop.n @@ -151,10 +151,11 @@ is the same as .QW "\fB** 2 [** 3 4]\fR" . Each \fInumber\fR may be any numeric value, though the second number must not be fractional if the -first is negative. If no arguments are given, the result will be one, and if -only one argument is given, the result will be that argument. The -result will have an integral value only when all arguments are -integral values. +first is negative. The maximum exponent value that Tcl can handle if the +first number is an integer > 1 is 268435455. If no arguments are given, +the result will be one, and if only one argument is given, the result will +be that argument. The result will have an integral value only when all +arguments are integral values. .SS "COMPARISON OPERATORS" .PP The behaviors of the comparison operator commands (most of which operate diff --git a/generic/tclExecute.c b/generic/tclExecute.c index ca14a55..112924a 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -9076,7 +9076,11 @@ ExecuteExtendedBinaryMathOp( overflowExpon: Tcl_TakeBignumFromObj(NULL, value2Ptr, &big2); - if (big2.used > 1) { + if ((big2.used > 1) +#if DIGIT_BIT > 28 + || ((big2.used == 1) && (big2.dp[0] >= (1<<28))) +#endif + ) { mp_clear(&big2); Tcl_SetObjResult(interp, Tcl_NewStringObj( "exponent too large", -1)); diff --git a/generic/tclTomMath.h b/generic/tclTomMath.h index fbf0d35..0541ad8 100644 --- a/generic/tclTomMath.h +++ b/generic/tclTomMath.h @@ -229,8 +229,8 @@ int mp_init_size(mp_int *a, int size); /* ---> Basic Manipulations <--- */ #define mp_iszero(a) (((a)->used == 0) ? MP_YES : MP_NO) -#define mp_iseven(a) ((((a)->used == 0) || (((a)->dp[0] & 1u) == 0u)) ? MP_YES : MP_NO) -#define mp_isodd(a) ((((a)->used > 0) && (((a)->dp[0] & 1u) == 1u)) ? MP_YES : MP_NO) +#define mp_iseven(a) (!mp_get_bit((a),0)) +#define mp_isodd(a) mp_get_bit((a),0) #define mp_isneg(a) (((a)->sign != MP_ZPOS) ? MP_YES : MP_NO) /* set to zero */ diff --git a/libtommath/astylerc b/libtommath/astylerc new file mode 100644 index 0000000..5d63f7a --- /dev/null +++ b/libtommath/astylerc @@ -0,0 +1,27 @@ +# Artistic Style, see http://astyle.sourceforge.net/ +# full documentation, see: http://astyle.sourceforge.net/astyle.html +# +# usage: +# astyle --options=astylerc *.[ch] + +## Bracket Style Options +style=kr + +## Tab Options +indent=spaces=3 + +## Bracket Modify Options + +## Indentation Options +min-conditional-indent=0 + +## Padding Options +pad-header +unpad-paren +align-pointer=name + +## Formatting Options +break-after-logical +max-code-length=120 +convert-tabs +mode=c diff --git a/libtommath/tommath.h b/libtommath/tommath.h index c240d80..00c8b35 100644 --- a/libtommath/tommath.h +++ b/libtommath/tommath.h @@ -190,8 +190,8 @@ int mp_init_size(mp_int *a, int size); /* ---> Basic Manipulations <--- */ #define mp_iszero(a) (((a)->used == 0) ? MP_YES : MP_NO) -#define mp_iseven(a) ((((a)->used == 0) || (((a)->dp[0] & 1u) == 0u)) ? MP_YES : MP_NO) -#define mp_isodd(a) ((((a)->used > 0) && (((a)->dp[0] & 1u) == 1u)) ? MP_YES : MP_NO) +#define mp_iseven(a) (!mp_get_bit((a),0)) +#define mp_isodd(a) mp_get_bit((a),0) #define mp_isneg(a) (((a)->sign != MP_ZPOS) ? MP_YES : MP_NO) /* set to zero */ diff --git a/tests/expr.test b/tests/expr.test index a265ac6..6e6a358 100644 --- a/tests/expr.test +++ b/tests/expr.test @@ -1150,7 +1150,7 @@ test expr-23.54.11 {INST_EXPON: Bug 2798543} { expr {3**9 == 3**131081} } 0 test expr-23.54.12 {INST_EXPON: Bug 2798543} -body { - expr {3**9 == 3**268435465} + expr {3**268435456} } -returnCodes error -result {exponent too large} test expr-23.54.13 {INST_EXPON: Bug 2798543} { expr {(-3)**9 == (-3)**65545} @@ -1165,7 +1165,7 @@ test expr-23.55.2 {INST_EXPON: Bug 2798543} { expr {4**9 == 4**131081} } 0 test expr-23.55.3 {INST_EXPON: Bug 2798543} -body { - expr {4**9 == 4**268435465} + expr {4**268435456} } -returnCodes error -result {exponent too large} test expr-23.55.4 {INST_EXPON: Bug 2798543} { expr {(-4)**9 == (-4)**65545} @@ -1180,7 +1180,7 @@ test expr-23.56.2 {INST_EXPON: Bug 2798543} { expr {5**9 == 5**131081} } 0 test expr-23.56.3 {INST_EXPON: Bug 2798543} -body { - expr {5**9 == 5**268435465} + expr {5**268435456} } -returnCodes error -result {exponent too large} test expr-23.56.4 {INST_EXPON: Bug 2798543} { expr {(-5)**9 == (-5)**65545} @@ -1195,7 +1195,7 @@ test expr-23.57.2 {INST_EXPON: Bug 2798543} { expr {6**9 == 6**131081} } 0 test expr-23.57.3 {INST_EXPON: Bug 2798543} -body { - expr {6**9 == 6**268435465} + expr {6**268435456} } -returnCodes error -result {exponent too large} test expr-23.57.4 {INST_EXPON: Bug 2798543} { expr {(-6)**9 == (-6)**65545} @@ -1210,7 +1210,7 @@ test expr-23.58.2 {INST_EXPON: Bug 2798543} { expr {7**9 == 7**131081} } 0 test expr-23.58.3 {INST_EXPON: Bug 2798543} -body { - expr {7**9 == 7**268435465} + expr {7**268435456} } -returnCodes error -result {exponent too large} test expr-23.58.4 {INST_EXPON: Bug 2798543} { expr {(-7)**9 == (-7)**65545} @@ -1225,7 +1225,7 @@ test expr-23.59.2 {INST_EXPON: Bug 2798543} { expr {8**9 == 8**131081} } 0 test expr-23.59.3 {INST_EXPON: Bug 2798543} -body { - expr {8**9 == 8**268435465} + expr {8**268435456} } -returnCodes error -result {exponent too large} test expr-23.59.4 {INST_EXPON: Bug 2798543} { expr {(-8)**9 == (-8)**65545} @@ -1237,7 +1237,7 @@ test expr-23.60.1 {INST_EXPON: Bug 2798543} { expr {9**9 == 9**131081} } 0 test expr-23.60.2 {INST_EXPON: Bug 2798543} -body { - expr {9**9 == 9**268435465} + expr {9**268435456} } -returnCodes error -result {exponent too large} test expr-23.60.3 {INST_EXPON: Bug 2798543} { expr {(-9)**9 == (-9)**65545} @@ -1249,7 +1249,7 @@ test expr-23.61.1 {INST_EXPON: Bug 2798543} { expr {10**9 == 10**131081} } 0 test expr-23.61.2 {INST_EXPON: Bug 2798543} -body { - expr {10**9 == 10**268435465} + expr {10**268435456} } -returnCodes error -result {exponent too large} test expr-23.61.3 {INST_EXPON: Bug 2798543} { expr {(-10)**9 == (-10)**65545} @@ -1261,7 +1261,7 @@ test expr-23.62.1 {INST_EXPON: Bug 2798543} { expr {11**9 == 11**131081} } 0 test expr-23.62.2 {INST_EXPON: Bug 2798543} -body { - expr {11**9 == 11**268435465} + expr {11**268435456} } -returnCodes error -result {exponent too large} test expr-23.62.3 {INST_EXPON: Bug 2798543} { expr {(-11)**9 == (-11)**65545} @@ -1276,7 +1276,7 @@ test expr-23.63.2 {INST_EXPON: Bug 2798543} { expr {3**20 == 3**131092} } 0 test expr-23.63.3 {INST_EXPON: Bug 2798543} -body { - expr {3**20 == 3**268435476} + expr {3**268435456} } -returnCodes error -result {exponent too large} test expr-23.63.4 {INST_EXPON: Bug 2798543} { expr {(-3)**20 == (-3)**65556} @@ -1291,7 +1291,7 @@ test expr-23.64.2 {INST_EXPON: Bug 2798543} { expr {4**17 == 4**131089} } 0 test expr-23.64.3 {INST_EXPON: Bug 2798543} -body { - expr {4**17 == 4**268435473} + expr {4**268435456} } -returnCodes error -result {exponent too large} test expr-23.64.4 {INST_EXPON: Bug 2798543} { expr {(-4)**17 == (-4)**65553} @@ -1306,7 +1306,7 @@ test expr-23.65.2 {INST_EXPON: Bug 2798543} { expr {5**17 == 5**131089} } 0 test expr-23.65.3 {INST_EXPON: Bug 2798543} -body { - expr {5**17 == 5**268435473} + expr {5**268435456} } -returnCodes error -result {exponent too large} test expr-23.65.4 {INST_EXPON: Bug 2798543} { expr {(-5)**17 == (-5)**65553} @@ -1321,7 +1321,7 @@ test expr-23.66.2 {INST_EXPON: Bug 2798543} { expr {6**17 == 6**131089} } 0 test expr-23.66.3 {INST_EXPON: Bug 2798543} -body { - expr {6**17 == 6**268435473} + expr {6**268435456} } -returnCodes error -result {exponent too large} test expr-23.66.4 {INST_EXPON: Bug 2798543} { expr {(-6)**17 == (-6)**65553} @@ -1336,7 +1336,7 @@ test expr-23.67.2 {INST_EXPON: Bug 2798543} { expr {7**17 == 7**131089} } 0 test expr-23.67.3 {INST_EXPON: Bug 2798543} -body { - expr {7**17 == 7**268435473} + expr {7**268435456} } -returnCodes error -result {exponent too large} test expr-23.67.4 {INST_EXPON: Bug 2798543} { expr {(-7)**17 == (-7)**65553} @@ -1351,7 +1351,7 @@ test expr-23.68.2 {INST_EXPON: Bug 2798543} { expr {8**17 == 8**131089} } 0 test expr-23.68.3 {INST_EXPON: Bug 2798543} -body { - expr {8**17 == 8**268435473} + expr {8**268435456} } -returnCodes error -result {exponent too large} test expr-23.68.4 {INST_EXPON: Bug 2798543} { expr {(-8)**17 == (-8)**65553} @@ -1366,7 +1366,7 @@ test expr-23.69.2 {INST_EXPON: Bug 2798543} { expr {9**17 == 9**131089} } 0 test expr-23.69.3 {INST_EXPON: Bug 2798543} -body { - expr {9**17 == 9**268435473} + expr {9**268435456} } -returnCodes error -result {exponent too large} test expr-23.69.4 {INST_EXPON: Bug 2798543} { expr {(-9)**17 == (-9)**65553} @@ -1381,7 +1381,7 @@ test expr-23.70.2 {INST_EXPON: Bug 2798543} { expr {10**17 == 10**131089} } 0 test expr-23.70.3 {INST_EXPON: Bug 2798543} -body { - expr {10**17 == 10**268435473} + expr {10**268435456} } -returnCodes error -result {exponent too large} test expr-23.70.4 {INST_EXPON: Bug 2798543} { expr {(-10)**17 == (-10)**65553} @@ -1396,7 +1396,7 @@ test expr-23.71.2 {INST_EXPON: Bug 2798543} { expr {11**17 == 11**131089} } 0 test expr-23.71.3 {INST_EXPON: Bug 2798543} -body { - expr {11**17 == 11**268435473} + expr {11**268435456} } -returnCodes error -result {exponent too large} test expr-23.71.4 {INST_EXPON: Bug 2798543} { expr {(-11)**17 == (-11)**65553} @@ -1408,7 +1408,7 @@ test expr-23.72.1 {INST_EXPON: Bug 2798543} { expr {12**17 == 12**131089} } 0 test expr-23.72.2 {INST_EXPON: Bug 2798543} -body { - expr {12**17 == 12**268435473} + expr {12**268435456} } -returnCodes error -result {exponent too large} test expr-23.72.3 {INST_EXPON: Bug 2798543} { expr {(-12)**17 == (-12)**65553} @@ -1420,7 +1420,7 @@ test expr-23.73.1 {INST_EXPON: Bug 2798543} { expr {13**17 == 13**131089} } 0 test expr-23.73.2 {INST_EXPON: Bug 2798543} -body { - expr {13**17 == 13**268435473} + expr {13**268435456} } -returnCodes error -result {exponent too large} test expr-23.73.3 {INST_EXPON: Bug 2798543} { expr {(-13)**17 == (-13)**65553} @@ -1432,7 +1432,7 @@ test expr-23.74.1 {INST_EXPON: Bug 2798543} { expr {14**17 == 14**131089} } 0 test expr-23.74.2 {INST_EXPON: Bug 2798543} -body { - expr {14**17 == 14**268435473} + expr {14**268435456} } -returnCodes error -result {exponent too large} test expr-23.74.3 {INST_EXPON: Bug 2798543} { expr {(-14)**17 == (-14)**65553} -- cgit v0.12 From 230de714e75660754b6c430308c98987aeb1c234 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Wed, 27 Mar 2019 20:13:25 +0000 Subject: Update TZ info to tzdata2019a --- library/tzdata/America/Metlakatla | 3 ++- library/tzdata/Asia/Gaza | 52 +++++++++++++++++++++------------------ library/tzdata/Asia/Hebron | 52 +++++++++++++++++++++------------------ library/tzdata/Asia/Jerusalem | 4 +++ library/tzdata/Etc/UCT | 6 ++--- library/tzdata/UCT | 6 ++--- 6 files changed, 68 insertions(+), 55 deletions(-) diff --git a/library/tzdata/America/Metlakatla b/library/tzdata/America/Metlakatla index 3636725..a0385d0 100644 --- a/library/tzdata/America/Metlakatla +++ b/library/tzdata/America/Metlakatla @@ -47,7 +47,8 @@ set TZData(:America/Metlakatla) { {1509876000 -32400 0 AKST} {1520766000 -28800 1 AKDT} {1541329200 -28800 0 PST} - {1552215600 -28800 0 AKDT} + {1547978400 -32400 0 AKST} + {1552215600 -28800 1 AKDT} {1572775200 -32400 0 AKST} {1583665200 -28800 1 AKDT} {1604224800 -32400 0 AKST} diff --git a/library/tzdata/Asia/Gaza b/library/tzdata/Asia/Gaza index 85b9f67..6d0f144 100644 --- a/library/tzdata/Asia/Gaza +++ b/library/tzdata/Asia/Gaza @@ -40,6 +40,10 @@ set TZData(:Asia/Gaza) { {150843600 7200 0 IST} {167176800 10800 1 IDT} {178664400 7200 0 IST} + {334015200 10800 1 IDT} + {337644000 7200 0 IST} + {452556000 10800 1 IDT} + {462232800 7200 0 IST} {482277600 10800 1 IDT} {495579600 7200 0 IST} {516751200 10800 1 IDT} @@ -113,7 +117,7 @@ set TZData(:Asia/Gaza) { {1509141600 7200 0 EET} {1521846000 10800 1 EEST} {1540591200 7200 0 EET} - {1553295600 10800 1 EEST} + {1553900400 10800 1 EEST} {1572040800 7200 0 EET} {1585350000 10800 1 EEST} {1604095200 7200 0 EET} @@ -123,9 +127,9 @@ set TZData(:Asia/Gaza) { {1666994400 7200 0 EET} {1679698800 10800 1 EEST} {1698444000 7200 0 EET} - {1711148400 10800 1 EEST} + {1711753200 10800 1 EEST} {1729893600 7200 0 EET} - {1742598000 10800 1 EEST} + {1743202800 10800 1 EEST} {1761343200 7200 0 EET} {1774652400 10800 1 EEST} {1793397600 7200 0 EET} @@ -135,9 +139,9 @@ set TZData(:Asia/Gaza) { {1856296800 7200 0 EET} {1869001200 10800 1 EEST} {1887746400 7200 0 EET} - {1900450800 10800 1 EEST} + {1901055600 10800 1 EEST} {1919196000 7200 0 EET} - {1931900400 10800 1 EEST} + {1932505200 10800 1 EEST} {1950645600 7200 0 EET} {1963954800 10800 1 EEST} {1982700000 7200 0 EET} @@ -147,7 +151,7 @@ set TZData(:Asia/Gaza) { {2045599200 7200 0 EET} {2058303600 10800 1 EEST} {2077048800 7200 0 EET} - {2089753200 10800 1 EEST} + {2090358000 10800 1 EEST} {2108498400 7200 0 EET} {2121807600 10800 1 EEST} {2140552800 7200 0 EET} @@ -157,9 +161,9 @@ set TZData(:Asia/Gaza) { {2203452000 7200 0 EET} {2216156400 10800 1 EEST} {2234901600 7200 0 EET} - {2247606000 10800 1 EEST} + {2248210800 10800 1 EEST} {2266351200 7200 0 EET} - {2279055600 10800 1 EEST} + {2279660400 10800 1 EEST} {2297800800 7200 0 EET} {2311110000 10800 1 EEST} {2329855200 7200 0 EET} @@ -169,7 +173,7 @@ set TZData(:Asia/Gaza) { {2392754400 7200 0 EET} {2405458800 10800 1 EEST} {2424204000 7200 0 EET} - {2436908400 10800 1 EEST} + {2437513200 10800 1 EEST} {2455653600 7200 0 EET} {2468962800 10800 1 EEST} {2487708000 7200 0 EET} @@ -179,9 +183,9 @@ set TZData(:Asia/Gaza) { {2550607200 7200 0 EET} {2563311600 10800 1 EEST} {2582056800 7200 0 EET} - {2594761200 10800 1 EEST} + {2595366000 10800 1 EEST} {2613506400 7200 0 EET} - {2626210800 10800 1 EEST} + {2626815600 10800 1 EEST} {2644956000 7200 0 EET} {2658265200 10800 1 EEST} {2677010400 7200 0 EET} @@ -191,9 +195,9 @@ set TZData(:Asia/Gaza) { {2739909600 7200 0 EET} {2752614000 10800 1 EEST} {2771359200 7200 0 EET} - {2784063600 10800 1 EEST} + {2784668400 10800 1 EEST} {2802808800 7200 0 EET} - {2815513200 10800 1 EEST} + {2816118000 10800 1 EEST} {2834258400 7200 0 EET} {2847567600 10800 1 EEST} {2866312800 7200 0 EET} @@ -203,7 +207,7 @@ set TZData(:Asia/Gaza) { {2929212000 7200 0 EET} {2941916400 10800 1 EEST} {2960661600 7200 0 EET} - {2973366000 10800 1 EEST} + {2973970800 10800 1 EEST} {2992111200 7200 0 EET} {3005420400 10800 1 EEST} {3024165600 7200 0 EET} @@ -213,9 +217,9 @@ set TZData(:Asia/Gaza) { {3087064800 7200 0 EET} {3099769200 10800 1 EEST} {3118514400 7200 0 EET} - {3131218800 10800 1 EEST} + {3131823600 10800 1 EEST} {3149964000 7200 0 EET} - {3162668400 10800 1 EEST} + {3163273200 10800 1 EEST} {3181413600 7200 0 EET} {3194722800 10800 1 EEST} {3213468000 7200 0 EET} @@ -225,7 +229,7 @@ set TZData(:Asia/Gaza) { {3276367200 7200 0 EET} {3289071600 10800 1 EEST} {3307816800 7200 0 EET} - {3320521200 10800 1 EEST} + {3321126000 10800 1 EEST} {3339266400 7200 0 EET} {3352575600 10800 1 EEST} {3371320800 7200 0 EET} @@ -235,9 +239,9 @@ set TZData(:Asia/Gaza) { {3434220000 7200 0 EET} {3446924400 10800 1 EEST} {3465669600 7200 0 EET} - {3478374000 10800 1 EEST} + {3478978800 10800 1 EEST} {3497119200 7200 0 EET} - {3509823600 10800 1 EEST} + {3510428400 10800 1 EEST} {3528568800 7200 0 EET} {3541878000 10800 1 EEST} {3560623200 7200 0 EET} @@ -247,9 +251,9 @@ set TZData(:Asia/Gaza) { {3623522400 7200 0 EET} {3636226800 10800 1 EEST} {3654972000 7200 0 EET} - {3667676400 10800 1 EEST} + {3668281200 10800 1 EEST} {3686421600 7200 0 EET} - {3699126000 10800 1 EEST} + {3699730800 10800 1 EEST} {3717871200 7200 0 EET} {3731180400 10800 1 EEST} {3749925600 7200 0 EET} @@ -259,7 +263,7 @@ set TZData(:Asia/Gaza) { {3812824800 7200 0 EET} {3825529200 10800 1 EEST} {3844274400 7200 0 EET} - {3856978800 10800 1 EEST} + {3857583600 10800 1 EEST} {3875724000 7200 0 EET} {3889033200 10800 1 EEST} {3907778400 7200 0 EET} @@ -269,9 +273,9 @@ set TZData(:Asia/Gaza) { {3970677600 7200 0 EET} {3983382000 10800 1 EEST} {4002127200 7200 0 EET} - {4014831600 10800 1 EEST} + {4015436400 10800 1 EEST} {4033576800 7200 0 EET} - {4046281200 10800 1 EEST} + {4046886000 10800 1 EEST} {4065026400 7200 0 EET} {4078335600 10800 1 EEST} {4097080800 7200 0 EET} diff --git a/library/tzdata/Asia/Hebron b/library/tzdata/Asia/Hebron index c0f5447..9249910 100644 --- a/library/tzdata/Asia/Hebron +++ b/library/tzdata/Asia/Hebron @@ -40,6 +40,10 @@ set TZData(:Asia/Hebron) { {150843600 7200 0 IST} {167176800 10800 1 IDT} {178664400 7200 0 IST} + {334015200 10800 1 IDT} + {337644000 7200 0 IST} + {452556000 10800 1 IDT} + {462232800 7200 0 IST} {482277600 10800 1 IDT} {495579600 7200 0 IST} {516751200 10800 1 IDT} @@ -112,7 +116,7 @@ set TZData(:Asia/Hebron) { {1509141600 7200 0 EET} {1521846000 10800 1 EEST} {1540591200 7200 0 EET} - {1553295600 10800 1 EEST} + {1553900400 10800 1 EEST} {1572040800 7200 0 EET} {1585350000 10800 1 EEST} {1604095200 7200 0 EET} @@ -122,9 +126,9 @@ set TZData(:Asia/Hebron) { {1666994400 7200 0 EET} {1679698800 10800 1 EEST} {1698444000 7200 0 EET} - {1711148400 10800 1 EEST} + {1711753200 10800 1 EEST} {1729893600 7200 0 EET} - {1742598000 10800 1 EEST} + {1743202800 10800 1 EEST} {1761343200 7200 0 EET} {1774652400 10800 1 EEST} {1793397600 7200 0 EET} @@ -134,9 +138,9 @@ set TZData(:Asia/Hebron) { {1856296800 7200 0 EET} {1869001200 10800 1 EEST} {1887746400 7200 0 EET} - {1900450800 10800 1 EEST} + {1901055600 10800 1 EEST} {1919196000 7200 0 EET} - {1931900400 10800 1 EEST} + {1932505200 10800 1 EEST} {1950645600 7200 0 EET} {1963954800 10800 1 EEST} {1982700000 7200 0 EET} @@ -146,7 +150,7 @@ set TZData(:Asia/Hebron) { {2045599200 7200 0 EET} {2058303600 10800 1 EEST} {2077048800 7200 0 EET} - {2089753200 10800 1 EEST} + {2090358000 10800 1 EEST} {2108498400 7200 0 EET} {2121807600 10800 1 EEST} {2140552800 7200 0 EET} @@ -156,9 +160,9 @@ set TZData(:Asia/Hebron) { {2203452000 7200 0 EET} {2216156400 10800 1 EEST} {2234901600 7200 0 EET} - {2247606000 10800 1 EEST} + {2248210800 10800 1 EEST} {2266351200 7200 0 EET} - {2279055600 10800 1 EEST} + {2279660400 10800 1 EEST} {2297800800 7200 0 EET} {2311110000 10800 1 EEST} {2329855200 7200 0 EET} @@ -168,7 +172,7 @@ set TZData(:Asia/Hebron) { {2392754400 7200 0 EET} {2405458800 10800 1 EEST} {2424204000 7200 0 EET} - {2436908400 10800 1 EEST} + {2437513200 10800 1 EEST} {2455653600 7200 0 EET} {2468962800 10800 1 EEST} {2487708000 7200 0 EET} @@ -178,9 +182,9 @@ set TZData(:Asia/Hebron) { {2550607200 7200 0 EET} {2563311600 10800 1 EEST} {2582056800 7200 0 EET} - {2594761200 10800 1 EEST} + {2595366000 10800 1 EEST} {2613506400 7200 0 EET} - {2626210800 10800 1 EEST} + {2626815600 10800 1 EEST} {2644956000 7200 0 EET} {2658265200 10800 1 EEST} {2677010400 7200 0 EET} @@ -190,9 +194,9 @@ set TZData(:Asia/Hebron) { {2739909600 7200 0 EET} {2752614000 10800 1 EEST} {2771359200 7200 0 EET} - {2784063600 10800 1 EEST} + {2784668400 10800 1 EEST} {2802808800 7200 0 EET} - {2815513200 10800 1 EEST} + {2816118000 10800 1 EEST} {2834258400 7200 0 EET} {2847567600 10800 1 EEST} {2866312800 7200 0 EET} @@ -202,7 +206,7 @@ set TZData(:Asia/Hebron) { {2929212000 7200 0 EET} {2941916400 10800 1 EEST} {2960661600 7200 0 EET} - {2973366000 10800 1 EEST} + {2973970800 10800 1 EEST} {2992111200 7200 0 EET} {3005420400 10800 1 EEST} {3024165600 7200 0 EET} @@ -212,9 +216,9 @@ set TZData(:Asia/Hebron) { {3087064800 7200 0 EET} {3099769200 10800 1 EEST} {3118514400 7200 0 EET} - {3131218800 10800 1 EEST} + {3131823600 10800 1 EEST} {3149964000 7200 0 EET} - {3162668400 10800 1 EEST} + {3163273200 10800 1 EEST} {3181413600 7200 0 EET} {3194722800 10800 1 EEST} {3213468000 7200 0 EET} @@ -224,7 +228,7 @@ set TZData(:Asia/Hebron) { {3276367200 7200 0 EET} {3289071600 10800 1 EEST} {3307816800 7200 0 EET} - {3320521200 10800 1 EEST} + {3321126000 10800 1 EEST} {3339266400 7200 0 EET} {3352575600 10800 1 EEST} {3371320800 7200 0 EET} @@ -234,9 +238,9 @@ set TZData(:Asia/Hebron) { {3434220000 7200 0 EET} {3446924400 10800 1 EEST} {3465669600 7200 0 EET} - {3478374000 10800 1 EEST} + {3478978800 10800 1 EEST} {3497119200 7200 0 EET} - {3509823600 10800 1 EEST} + {3510428400 10800 1 EEST} {3528568800 7200 0 EET} {3541878000 10800 1 EEST} {3560623200 7200 0 EET} @@ -246,9 +250,9 @@ set TZData(:Asia/Hebron) { {3623522400 7200 0 EET} {3636226800 10800 1 EEST} {3654972000 7200 0 EET} - {3667676400 10800 1 EEST} + {3668281200 10800 1 EEST} {3686421600 7200 0 EET} - {3699126000 10800 1 EEST} + {3699730800 10800 1 EEST} {3717871200 7200 0 EET} {3731180400 10800 1 EEST} {3749925600 7200 0 EET} @@ -258,7 +262,7 @@ set TZData(:Asia/Hebron) { {3812824800 7200 0 EET} {3825529200 10800 1 EEST} {3844274400 7200 0 EET} - {3856978800 10800 1 EEST} + {3857583600 10800 1 EEST} {3875724000 7200 0 EET} {3889033200 10800 1 EEST} {3907778400 7200 0 EET} @@ -268,9 +272,9 @@ set TZData(:Asia/Hebron) { {3970677600 7200 0 EET} {3983382000 10800 1 EEST} {4002127200 7200 0 EET} - {4014831600 10800 1 EEST} + {4015436400 10800 1 EEST} {4033576800 7200 0 EET} - {4046281200 10800 1 EEST} + {4046886000 10800 1 EEST} {4065026400 7200 0 EET} {4078335600 10800 1 EEST} {4097080800 7200 0 EET} diff --git a/library/tzdata/Asia/Jerusalem b/library/tzdata/Asia/Jerusalem index 2714963..e1e84f4 100644 --- a/library/tzdata/Asia/Jerusalem +++ b/library/tzdata/Asia/Jerusalem @@ -39,6 +39,10 @@ set TZData(:Asia/Jerusalem) { {150843600 7200 0 IST} {167176800 10800 1 IDT} {178664400 7200 0 IST} + {334015200 10800 1 IDT} + {337644000 7200 0 IST} + {452556000 10800 1 IDT} + {462232800 7200 0 IST} {482277600 10800 1 IDT} {495579600 7200 0 IST} {516751200 10800 1 IDT} diff --git a/library/tzdata/Etc/UCT b/library/tzdata/Etc/UCT index f7d795e..c843cdc 100644 --- a/library/tzdata/Etc/UCT +++ b/library/tzdata/Etc/UCT @@ -1,5 +1,5 @@ # created by tools/tclZIC.tcl - do not edit - -set TZData(:Etc/UCT) { - {-9223372036854775808 0 0 UCT} +if {![info exists TZData(Etc/UTC)]} { + LoadTimeZoneFile Etc/UTC } +set TZData(:Etc/UCT) $TZData(:Etc/UTC) diff --git a/library/tzdata/UCT b/library/tzdata/UCT index 8449328..acfa48e 100644 --- a/library/tzdata/UCT +++ b/library/tzdata/UCT @@ -1,5 +1,5 @@ # created by tools/tclZIC.tcl - do not edit -if {![info exists TZData(Etc/UCT)]} { - LoadTimeZoneFile Etc/UCT +if {![info exists TZData(Etc/UTC)]} { + LoadTimeZoneFile Etc/UTC } -set TZData(:UCT) $TZData(:Etc/UCT) +set TZData(:UCT) $TZData(:Etc/UTC) -- cgit v0.12