mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* time.c (year_leap_p): new function.
(timegm_noleapsecond): ditto. (search_time_t): use timegm_noleapsecond instead of mktime for first guess. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6057 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr
parent
b4a2460981
commit
9bf44e389e
2 changed files with 95 additions and 8 deletions
|
|
@ -1,3 +1,10 @@
|
||||||
|
Wed Mar 31 19:06:23 2004 Tanaka Akira <akr@m17n.org>
|
||||||
|
|
||||||
|
* time.c (year_leap_p): new function.
|
||||||
|
(timegm_noleapsecond): ditto.
|
||||||
|
(search_time_t): use timegm_noleapsecond instead of
|
||||||
|
mktime for first guess.
|
||||||
|
|
||||||
Wed Mar 31 12:05:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Wed Mar 31 12:05:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* lib/delegate.rb (DelegateClass): define internal methods of the
|
* lib/delegate.rb (DelegateClass): define internal methods of the
|
||||||
|
|
@ -18,7 +25,7 @@ Wed Mar 31 11:17:16 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
Tue Mar 30 20:25:34 2004 Tanaka Akira <akr@m17n.org>
|
Tue Mar 30 20:25:34 2004 Tanaka Akira <akr@m17n.org>
|
||||||
|
|
||||||
* time.c (search_time_t): limit guess range by mktime if it is
|
* time.c (search_time_t): limit guess range by mktime if it is
|
||||||
available.
|
available. [ruby-dev:23274]
|
||||||
|
|
||||||
Tue Mar 30 18:19:00 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Tue Mar 30 18:19:00 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
|
|
||||||
94
time.c
94
time.c
|
|
@ -402,6 +402,71 @@ static VALUE time_gmtime _((VALUE));
|
||||||
static VALUE time_localtime _((VALUE));
|
static VALUE time_localtime _((VALUE));
|
||||||
static VALUE time_get_tm _((VALUE, int));
|
static VALUE time_get_tm _((VALUE, int));
|
||||||
|
|
||||||
|
static int
|
||||||
|
leap_year_p(y)
|
||||||
|
long y;
|
||||||
|
{
|
||||||
|
return ((y % 4 == 0) && (y % 100 != 0)) || (y % 400 == 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
#define DIV(n,d) ((n)<0 ? NDIV((n),(d)) : (n)/(d))
|
||||||
|
|
||||||
|
static time_t
|
||||||
|
timegm_noleapsecond(tm)
|
||||||
|
struct tm *tm;
|
||||||
|
{
|
||||||
|
static int common_year_yday_offset[] = {
|
||||||
|
-1,
|
||||||
|
-1 + 31,
|
||||||
|
-1 + 31 + 28,
|
||||||
|
-1 + 31 + 28 + 31,
|
||||||
|
-1 + 31 + 28 + 31 + 30,
|
||||||
|
-1 + 31 + 28 + 31 + 30 + 31,
|
||||||
|
-1 + 31 + 28 + 31 + 30 + 31 + 30,
|
||||||
|
-1 + 31 + 28 + 31 + 30 + 31 + 30 + 31,
|
||||||
|
-1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31,
|
||||||
|
-1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30,
|
||||||
|
-1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31,
|
||||||
|
-1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30
|
||||||
|
/* 1 2 3 4 5 6 7 8 9 10 11 */
|
||||||
|
};
|
||||||
|
static int leap_year_yday_offset[] = {
|
||||||
|
-1,
|
||||||
|
-1 + 31,
|
||||||
|
-1 + 31 + 29,
|
||||||
|
-1 + 31 + 29 + 31,
|
||||||
|
-1 + 31 + 29 + 31 + 30,
|
||||||
|
-1 + 31 + 29 + 31 + 30 + 31,
|
||||||
|
-1 + 31 + 29 + 31 + 30 + 31 + 30,
|
||||||
|
-1 + 31 + 29 + 31 + 30 + 31 + 30 + 31,
|
||||||
|
-1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31,
|
||||||
|
-1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30,
|
||||||
|
-1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31,
|
||||||
|
-1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30
|
||||||
|
/* 1 2 3 4 5 6 7 8 9 10 11 */
|
||||||
|
};
|
||||||
|
|
||||||
|
long tm_year = tm->tm_year;
|
||||||
|
int tm_yday = tm->tm_mday;
|
||||||
|
if (leap_year_p(tm_year + 1900))
|
||||||
|
tm_yday += leap_year_yday_offset[tm->tm_mon];
|
||||||
|
else
|
||||||
|
tm_yday += common_year_yday_offset[tm->tm_mon];
|
||||||
|
|
||||||
|
/*
|
||||||
|
* `Seconds Since the Epoch' in SUSv3:
|
||||||
|
* tm_sec + tm_min*60 + tm_hour*3600 + tm_yday*86400 +
|
||||||
|
* (tm_year-70)*31536000 + ((tm_year-69)/4)*86400 -
|
||||||
|
* ((tm_year-1)/100)*86400 + ((tm_year+299)/400)*86400
|
||||||
|
*/
|
||||||
|
return tm->tm_sec + tm->tm_min*60 + tm->tm_hour*3600 +
|
||||||
|
(time_t)(tm_yday +
|
||||||
|
(tm_year-70)*365 +
|
||||||
|
DIV(tm_year-69,4) -
|
||||||
|
DIV(tm_year-1,100) +
|
||||||
|
DIV(tm_year+299,400))*86400;
|
||||||
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
tmcmp(a, b)
|
tmcmp(a, b)
|
||||||
struct tm *a;
|
struct tm *a;
|
||||||
|
|
@ -444,14 +509,29 @@ search_time_t(tptr, utc_p)
|
||||||
(1UL << (8 * sizeof(time_t) - 1)) - 1 :
|
(1UL << (8 * sizeof(time_t) - 1)) - 1 :
|
||||||
~(time_t)0;
|
~(time_t)0;
|
||||||
|
|
||||||
#if defined(HAVE_MKTIME)
|
guess = timegm_noleapsecond(tptr);
|
||||||
if ((guess = mktime(tptr)) != -1) {
|
tm = (utc_p ? gmtime : localtime)(&guess);
|
||||||
if (guess_lo < guess - 24 * 60 * 60)
|
if (tm) {
|
||||||
guess_lo = guess - 24 * 60 * 60;
|
d = tmcmp(tptr, tm);
|
||||||
if (guess + 24 * 60 * 60 < guess_hi)
|
if (d == 0) return guess;
|
||||||
guess_hi = guess + 24 * 60 * 60;
|
if (d < 0) {
|
||||||
|
guess_hi = guess;
|
||||||
|
guess -= 24 * 60 * 60;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
guess_lo = guess;
|
||||||
|
guess += 24 * 60 * 60;
|
||||||
|
}
|
||||||
|
if (guess_lo < guess && guess < guess_hi &&
|
||||||
|
(tm = (utc_p ? gmtime : localtime)(&guess)) != NULL) {
|
||||||
|
d = tmcmp(tptr, tm);
|
||||||
|
if (d == 0) return guess;
|
||||||
|
if (d < 0)
|
||||||
|
guess_hi = guess;
|
||||||
|
else
|
||||||
|
guess_lo = guess;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
tm = (utc_p ? gmtime : localtime)(&guess_lo);
|
tm = (utc_p ? gmtime : localtime)(&guess_lo);
|
||||||
if (!tm) goto error;
|
if (!tm) goto error;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue