From 3d2eb7c4818183d69717b64ea85adb9c9d45b7e6 Mon Sep 17 00:00:00 2001 From: Watson Date: Sat, 16 Jun 2012 19:38:57 +0900 Subject: [PATCH] update MacRuby's older Time class with CRuby 1.9.2 --- include/ruby/ruby.h | 1 + rakelib/builder/options.rb | 2 +- strftime.c | 1249 +++++++++++ time.c | 4299 ++++++++++++++++++++++++++++-------- timev.h | 21 + 5 files changed, 4642 insertions(+), 930 deletions(-) create mode 100644 strftime.c create mode 100644 timev.h diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index d202bc4ec..55679d590 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -384,6 +384,7 @@ void rb_set_errinfo(VALUE); SIGNED_VALUE rb_num2long(VALUE); VALUE rb_num2ulong(VALUE); #define NUM2LONG(x) (FIXNUM_P(x)?FIX2LONG(x):rb_num2long((VALUE)x)) +#define NUM2TIMET(v) NUM2LONG(v) #define NUM2ULONG(x) rb_num2ulong((VALUE)x) #if SIZEOF_INT < SIZEOF_LONG long rb_num2int(VALUE); diff --git a/rakelib/builder/options.rb b/rakelib/builder/options.rb index 182432aea..92f72bcc5 100644 --- a/rakelib/builder/options.rb +++ b/rakelib/builder/options.rb @@ -131,7 +131,7 @@ def self.option(name, default) OBJS = %w{ array bignum class compar complex enum enumerator error eval file load proc gc hash env inits io math numeric object pack parse prec dir process - random range rational re ruby signal sprintf st string struct time + random range rational re ruby signal sprintf st string struct time strftime util variable version thread id objc bs ucnv encoding main dln dmyext marshal gcd vm_eval gc-stub bridgesupport compiler dispatcher vm symbol debugger interpreter MacRuby MacRubyDebuggerConnector NSArray NSDictionary NSString diff --git a/strftime.c b/strftime.c new file mode 100644 index 000000000..6b255f223 --- /dev/null +++ b/strftime.c @@ -0,0 +1,1249 @@ +/* -*- c-file-style: "linux" -*- */ + +/* + * strftime.c + * + * Public-domain implementation of ANSI C library routine. + * + * It's written in old-style C for maximal portability. + * However, since I'm used to prototypes, I've included them too. + * + * If you want stuff in the System V ascftime routine, add the SYSV_EXT define. + * For extensions from SunOS, add SUNOS_EXT. + * For stuff needed to implement the P1003.2 date command, add POSIX2_DATE. + * For VMS dates, add VMS_EXT. + * For a an RFC822 time format, add MAILHEADER_EXT. + * For ISO week years, add ISO_DATE_EXT. + * For complete POSIX semantics, add POSIX_SEMANTICS. + * + * The code for %c, %x, and %X now follows the 1003.2 specification for + * the POSIX locale. + * This version ignores LOCALE information. + * It also doesn't worry about multi-byte characters. + * So there. + * + * This file is also shipped with GAWK (GNU Awk), gawk specific bits of + * code are included if GAWK is defined. + * + * Arnold Robbins + * January, February, March, 1991 + * Updated March, April 1992 + * Updated April, 1993 + * Updated February, 1994 + * Updated May, 1994 + * Updated January, 1995 + * Updated September, 1995 + * Updated January, 1996 + * + * Fixes from ado@elsie.nci.nih.gov + * February 1991, May 1992 + * Fixes from Tor Lillqvist tml@tik.vtt.fi + * May, 1993 + * Further fixes from ado@elsie.nci.nih.gov + * February 1994 + * %z code from chip@chinacat.unicom.com + * Applied September 1995 + * %V code fixed (again) and %G, %g added, + * January 1996 + */ + +#include "ruby/ruby.h" +#include "timev.h" + +#ifndef GAWK +#include +#include +#include +#include +#include +#include +#endif +#if defined(TM_IN_SYS_TIME) || !defined(GAWK) +#include +#if HAVE_SYS_TIME_H +#include +#endif +#endif +#include + +#define PRI_TIMET_PREFIX "l" + +/* defaults: season to taste */ +#define SYSV_EXT 1 /* stuff in System V ascftime routine */ +#define SUNOS_EXT 1 /* stuff in SunOS strftime routine */ +#define POSIX2_DATE 1 /* stuff in Posix 1003.2 date command */ +#define VMS_EXT 1 /* include %v for VMS date format */ +#define MAILHEADER_EXT 1 /* add %z for HHMM format */ +#define ISO_DATE_EXT 1 /* %G and %g for year of ISO week */ +#ifndef GAWK +#define POSIX_SEMANTICS 1 /* call tzset() if TZ changes */ +#endif + +#if defined(ISO_DATE_EXT) +#if ! defined(POSIX2_DATE) +#define POSIX2_DATE 1 +#endif +#endif + +#if defined(POSIX2_DATE) +#if ! defined(SYSV_EXT) +#define SYSV_EXT 1 +#endif +#if ! defined(SUNOS_EXT) +#define SUNOS_EXT 1 +#endif +#endif + +#if defined(POSIX2_DATE) +#define adddecl(stuff) stuff +#else +#define adddecl(stuff) +#endif + +#undef strchr /* avoid AIX weirdness */ + +#if !defined __STDC__ && !defined _WIN32 +#define const /**/ +static int weeknumber(); +adddecl(static int iso8601wknum();) +static int weeknumber_v(); +adddecl(static int iso8601wknum_v();) +#else +static int weeknumber(const struct tm *timeptr, int firstweekday); +adddecl(static int iso8601wknum(const struct tm *timeptr);) +static int weeknumber_v(const struct vtm *vtm, int firstweekday); +adddecl(static int iso8601wknum_v(const struct vtm *vtm);) +#endif + +#ifdef STDC_HEADERS +#include +#include +#else +extern void *malloc(); +extern void *realloc(); +extern char *getenv(); +extern char *strchr(); +#endif + +#define range(low, item, hi) max(low, min(item, hi)) + +#if defined __WIN32__ || defined _WIN32 +#define DLL_IMPORT __declspec(dllimport) +#endif +#ifndef DLL_IMPORT +#define DLL_IMPORT +#endif +#if !defined(OS2) && defined(HAVE_TZNAME) +extern DLL_IMPORT char *tzname[2]; +#ifdef HAVE_DAYLIGHT +extern DLL_IMPORT int daylight; +#endif +#ifdef HAVE_VAR_TIMEZONE +extern DLL_IMPORT TYPEOF_VAR_TIMEZONE timezone; +#endif +#ifdef HAVE_VAR_ALTZONE +extern DLL_IMPORT TYPEOF_VAR_ALTZONE altzone; +#endif +#endif + +#undef min /* just in case */ + +/* min --- return minimum of two numbers */ + +#ifndef __STDC__ +static inline int +min(a, b) +int a, b; +#else +static inline int +min(int a, int b) +#endif +{ + return (a < b ? a : b); +} + +#undef max /* also, just in case */ + +/* max --- return maximum of two numbers */ + +#ifndef __STDC__ +static inline int +max(a, b) +int a, b; +#else +static inline int +max(int a, int b) +#endif +{ + return (a > b ? a : b); +} + +#ifdef NO_STRING_LITERAL_CONCATENATION +#error No string literal concatenation +#endif + +#define add(x,y) (rb_funcall((x), '+', 1, (y))) +#define sub(x,y) (rb_funcall((x), '-', 1, (y))) +#define mul(x,y) (rb_funcall((x), '*', 1, (y))) +#define quo(x,y) (rb_funcall((x), rb_intern("quo"), 1, (y))) +#define div(x,y) (rb_funcall((x), rb_intern("div"), 1, (y))) +#define mod(x,y) (rb_funcall((x), '%', 1, (y))) + +/* strftime --- produce formatted time */ + +static size_t +rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, const struct vtm *vtm, VALUE timev, struct timespec *ts, int gmt) +{ + char *endp = s + maxsize; + char *start = s; + const char *sp, *tp; + auto char tbuf[100]; + long off; + ptrdiff_t i; + int w; + long y; + static short first = 1; +#ifdef POSIX_SEMANTICS + static char *savetz = NULL; + static size_t savetzlen = 0; + char *tz; +#endif /* POSIX_SEMANTICS */ +#ifndef HAVE_TM_ZONE +#ifndef HAVE_TM_NAME +#if ((defined(MAILHEADER_EXT) && !HAVE_VAR_TIMEZONE && HAVE_GETTIMEOFDAY) || \ + (!HAVE_TZNAME && HAVE_TIMEZONE)) + struct timeval tv; + struct timezone zone; +#endif +#endif /* HAVE_TM_NAME */ +#endif /* HAVE_TM_ZONE */ + int precision, flags; + char padding; + enum {LEFT, CHCASE, LOWER, UPPER, LOCALE_O, LOCALE_E}; +#define BIT_OF(n) (1U<<(n)) + + /* various tables, useful in North America */ + static const char days_l[][10] = { + "Sunday", "Monday", "Tuesday", "Wednesday", + "Thursday", "Friday", "Saturday", + }; + static const char months_l[][10] = { + "January", "February", "March", "April", + "May", "June", "July", "August", "September", + "October", "November", "December", + }; + static const char ampm[][3] = { "AM", "PM", }; + + if (s == NULL || format == NULL || vtm == NULL || maxsize == 0) + return 0; + + /* quick check if we even need to bother */ + if (strchr(format, '%') == NULL && strlen(format) + 1 >= maxsize) { + err: + errno = ERANGE; + return 0; + } + +#ifndef POSIX_SEMANTICS + if (first) { + tzset(); + first = 0; + } +#else /* POSIX_SEMANTICS */ + tz = getenv("TZ"); + if (first) { + if (tz != NULL) { + size_t tzlen = strlen(tz); + + savetz = (char *) malloc(tzlen + 1); + if (savetz != NULL) { + savetzlen = tzlen + 1; + memcpy(savetz, tz, savetzlen); + } + } + tzset(); + first = 0; + } + /* if we have a saved TZ, and it is different, recapture and reset */ + if (tz && savetz && (tz[0] != savetz[0] || strcmp(tz, savetz) != 0)) { + size_t i = strlen(tz) + 1; + if (i > savetzlen) { + savetz = (char *) realloc(savetz, i); + if (savetz) { + savetzlen = i; + memcpy(savetz, tz, i); + } + } else + memcpy(savetz, tz, i); + tzset(); + } +#endif /* POSIX_SEMANTICS */ + + for (; *format && s < endp - 1; format++) { +#define FLAG_FOUND() do { \ + if (precision > 0 || flags & (BIT_OF(LOCALE_E)|BIT_OF(LOCALE_O))) \ + goto unknown; \ + } while (0) +#define NEEDS(n) do if (s + (n) >= endp - 1) goto err; while (0) +#define FILL_PADDING(i) do { \ + if (!(flags & BIT_OF(LEFT)) && precision > i) { \ + NEEDS(precision); \ + memset(s, padding ? padding : ' ', precision - i); \ + s += precision - i; \ + } \ + else { \ + NEEDS(i); \ + } \ +} while (0); +#define FMT(def_pad, def_prec, fmt, val) \ + do { \ + int l; \ + if (precision <= 0) precision = (def_prec); \ + if (flags & BIT_OF(LEFT)) precision = 1; \ + l = snprintf(s, endp - s, \ + ((padding == '0' || (!padding && def_pad == '0')) ? "%0*"fmt : "%*"fmt), \ + precision, val); \ + if (l < 0) goto err; \ + s += l; \ + } while (0) +#define STRFTIME(fmt) \ + do { \ + i = rb_strftime_with_timespec(s, endp - s, fmt, vtm, timev, ts, gmt); \ + if (!i) return 0; \ + if (precision > i) {\ + NEEDS(precision); \ + memmove(s + precision - i, s, i);\ + memset(s, padding ? padding : ' ', precision - i); \ + s += precision; \ + }\ + else s += i; \ + } while (0) +#define FMTV(def_pad, def_prec, fmt, val) \ + do { \ + VALUE tmp = (val); \ + if (FIXNUM_P(tmp)) { \ + FMT((def_pad), (def_prec), "l"fmt, FIX2LONG(tmp)); \ + } \ + else { \ + VALUE args[2], result; \ + size_t l; \ + if (precision <= 0) precision = (def_prec); \ + if (flags & BIT_OF(LEFT)) precision = 1; \ + args[0] = INT2FIX(precision); \ + args[1] = val; \ + if (padding == '0' || (!padding && def_pad == '0')) \ + result = rb_str_format(2, args, rb_str_new2("%0*"fmt)); \ + else \ + result = rb_str_format(2, args, rb_str_new2("%*"fmt)); \ + l = strlcpy(s, StringValueCStr(result), endp-s); \ + if ((size_t)(endp-s) <= l) \ + goto err; \ + s += l; \ + } \ + } while (0) + + if (*format != '%') { + *s++ = *format; + continue; + } + tp = tbuf; + sp = format; + precision = -1; + flags = 0; + padding = 0; + again: + switch (*++format) { + case '\0': + format--; + goto unknown; + + case '%': + FILL_PADDING(1); + *s++ = '%'; + continue; + + case 'a': /* abbreviated weekday name */ + if (flags & BIT_OF(CHCASE)) { + flags &= ~(BIT_OF(LOWER)|BIT_OF(CHCASE)); + flags |= BIT_OF(UPPER); + } + if (vtm->wday < 0 || vtm->wday > 6) + i = 1, tp = "?"; + else + i = 3, tp = days_l[vtm->wday]; + break; + + case 'A': /* full weekday name */ + if (flags & BIT_OF(CHCASE)) { + flags &= ~(BIT_OF(LOWER)|BIT_OF(CHCASE)); + flags |= BIT_OF(UPPER); + } + if (vtm->wday < 0 || vtm->wday > 6) + i = 1, tp = "?"; + else + i = strlen(tp = days_l[vtm->wday]); + break; + +#ifdef SYSV_EXT + case 'h': /* abbreviated month name */ +#endif + case 'b': /* abbreviated month name */ + if (flags & BIT_OF(CHCASE)) { + flags &= ~(BIT_OF(LOWER)|BIT_OF(CHCASE)); + flags |= BIT_OF(UPPER); + } + if (vtm->mon < 1 || vtm->mon > 12) + i = 1, tp = "?"; + else + i = 3, tp = months_l[vtm->mon-1]; + break; + + case 'B': /* full month name */ + if (flags & BIT_OF(CHCASE)) { + flags &= ~(BIT_OF(LOWER)|BIT_OF(CHCASE)); + flags |= BIT_OF(UPPER); + } + if (vtm->mon < 1 || vtm->mon > 12) + i = 1, tp = "?"; + else + i = strlen(tp = months_l[vtm->mon-1]); + break; + + case 'c': /* appropriate date and time representation */ + STRFTIME("%a %b %e %H:%M:%S %Y"); + continue; + + case 'd': /* day of the month, 01 - 31 */ + i = range(1, vtm->mday, 31); + FMT('0', 2, "d", (int)i); + continue; + + case 'H': /* hour, 24-hour clock, 00 - 23 */ + i = range(0, vtm->hour, 23); + FMT('0', 2, "d", (int)i); + continue; + + case 'I': /* hour, 12-hour clock, 01 - 12 */ + i = range(0, vtm->hour, 23); + if (i == 0) + i = 12; + else if (i > 12) + i -= 12; + FMT('0', 2, "d", (int)i); + continue; + + case 'j': /* day of the year, 001 - 366 */ + FMT('0', 3, "d", vtm->yday); + continue; + + case 'm': /* month, 01 - 12 */ + i = range(1, vtm->mon, 12); + FMT('0', 2, "d", (int)i); + continue; + + case 'M': /* minute, 00 - 59 */ + i = range(0, vtm->min, 59); + FMT('0', 2, "d", (int)i); + continue; + + case 'p': /* AM or PM based on 12-hour clock */ + case 'P': /* am or pm based on 12-hour clock */ + if ((*format == 'p' && (flags & BIT_OF(CHCASE))) || + (*format == 'P' && !(flags & (BIT_OF(CHCASE)|BIT_OF(UPPER))))) { + flags &= ~(BIT_OF(UPPER)|BIT_OF(CHCASE)); + flags |= BIT_OF(LOWER); + } + i = range(0, vtm->hour, 23); + if (i < 12) + tp = ampm[0]; + else + tp = ampm[1]; + i = 2; + break; + + case 's': + if (ts) { + time_t sec = ts->tv_sec; + if (~(time_t)0 <= 0) + FMT('0', 1, PRI_TIMET_PREFIX"d", sec); + else + FMT('0', 1, PRI_TIMET_PREFIX"u", sec); + } + else { + VALUE sec = div(timev, INT2FIX(1)); + FMTV('0', 1, "d", sec); + } + continue; + + case 'S': /* second, 00 - 60 */ + i = range(0, vtm->sec, 60); + FMT('0', 2, "d", (int)i); + continue; + + case 'U': /* week of year, Sunday is first day of week */ + FMT('0', 2, "d", weeknumber_v(vtm, 0)); + continue; + + case 'w': /* weekday, Sunday == 0, 0 - 6 */ + i = range(0, vtm->wday, 6); + FMT('0', 1, "d", (int)i); + continue; + + case 'W': /* week of year, Monday is first day of week */ + FMT('0', 2, "d", weeknumber_v(vtm, 1)); + continue; + + case 'x': /* appropriate date representation */ + STRFTIME("%m/%d/%y"); + continue; + + case 'X': /* appropriate time representation */ + STRFTIME("%H:%M:%S"); + continue; + + case 'y': /* year without a century, 00 - 99 */ + i = NUM2INT(mod(vtm->year, INT2FIX(100))); + FMT('0', 2, "d", (int)i); + continue; + + case 'Y': /* year with century */ + if (FIXNUM_P(vtm->year)) { + long y = FIX2LONG(vtm->year); + FMT('0', 0 <= y ? 4 : 5, "ld", y); + } + else { + FMTV('0', 4, "d", vtm->year); + } + continue; + +#ifdef MAILHEADER_EXT + /* + * From: Chip Rosenthal + * Date: Sun, 19 Mar 1995 00:33:29 -0600 (CST) + * + * Warning: the %z [code] is implemented by inspecting the + * timezone name conditional compile settings, and + * inferring a method to get timezone offsets. I've tried + * this code on a couple of machines, but I don't doubt + * there is some system out there that won't like it. + * Maybe the easiest thing to do would be to bracket this + * with an #ifdef that can turn it off. The %z feature + * would be an admittedly obscure one that most folks can + * live without, but it would be a great help to those of + * us that muck around with various message processors. + */ + case 'z': /* time zone offset east of GMT e.g. -0600 */ + if (precision < 4) precision = 4; + NEEDS(precision + 1); + if (gmt) { + off = 0; + } + else { + off = NUM2LONG(rb_funcall(quo(vtm->utc_offset, INT2FIX(60)), rb_intern("round"), 0)); +#if 0 +#ifdef HAVE_TM_NAME + /* + * Systems with tm_name probably have tm_tzadj as + * secs west of GMT. Convert to mins east of GMT. + */ + off = -timeptr->tm_tzadj / 60; +#else /* !HAVE_TM_NAME */ +#ifdef HAVE_TM_ZONE + /* + * Systems with tm_zone probably have tm_gmtoff as + * secs east of GMT. Convert to mins east of GMT. + */ + off = timeptr->tm_gmtoff / 60; +#else /* !HAVE_TM_ZONE */ +#if HAVE_VAR_TIMEZONE +#if HAVE_VAR_ALTZONE + off = -(daylight ? timezone : altzone) / 60; +#else + off = -timezone / 60; +#endif +#else /* !HAVE_VAR_TIMEZONE */ +#ifdef HAVE_GETTIMEOFDAY + gettimeofday(&tv, &zone); + off = -zone.tz_minuteswest; +#else + /* no timezone info, then calc by myself */ + { + struct tm utc; + time_t now; + time(&now); + utc = *gmtime(&now); + off = (long)((now - mktime(&utc)) / 60); + } +#endif +#endif /* !HAVE_VAR_TIMEZONE */ +#endif /* !HAVE_TM_ZONE */ +#endif /* !HAVE_TM_NAME */ +#endif /* 0 */ + } + if (off < 0) { + off = -off; + *s++ = '-'; + } else { + *s++ = '+'; + } + off = off/60*100 + off%60; + i = snprintf(s, endp - s, (padding == ' ' ? "%*ld" : "%.*ld"), + precision - (precision > 4), off); + if (i < 0) goto err; + s += i; + continue; +#endif /* MAILHEADER_EXT */ + + case 'Z': /* time zone name or abbreviation */ + if (flags & BIT_OF(CHCASE)) { + flags &= ~(BIT_OF(UPPER)|BIT_OF(CHCASE)); + flags |= BIT_OF(LOWER); + } + if (gmt) { + i = 3; + tp = "UTC"; + break; + } +#if 0 +#ifdef HAVE_TZNAME + i = (daylight && timeptr->tm_isdst > 0); /* 0 or 1 */ + tp = tzname[i]; +#else +#ifdef HAVE_TM_ZONE + tp = timeptr->tm_zone; +#else +#ifdef HAVE_TM_NAME + tp = timeptr->tm_name; +#else +#ifdef HAVE_TIMEZONE + gettimeofday(& tv, & zone); +#ifdef TIMEZONE_VOID + tp = timezone(); +#else + tp = timezone(zone.tz_minuteswest, timeptr->tm_isdst > 0); +#endif /* TIMEZONE_VOID */ +#endif /* HAVE_TIMEZONE */ +#endif /* HAVE_TM_NAME */ +#endif /* HAVE_TM_ZONE */ +#endif /* HAVE_TZNAME */ +#endif /* 0 */ + if (vtm->zone == NULL) + tp = ""; + else + tp = vtm->zone; + i = strlen(tp); + break; + +#ifdef SYSV_EXT + case 'n': /* same as \n */ + FILL_PADDING(1); + *s++ = '\n'; + continue; + + case 't': /* same as \t */ + FILL_PADDING(1); + *s++ = '\t'; + continue; + + case 'D': /* date as %m/%d/%y */ + STRFTIME("%m/%d/%y"); + continue; + + case 'e': /* day of month, blank padded */ + FMT(' ', 2, "d", range(1, vtm->mday, 31)); + continue; + + case 'r': /* time as %I:%M:%S %p */ + STRFTIME("%I:%M:%S %p"); + continue; + + case 'R': /* time as %H:%M */ + STRFTIME("%H:%M"); + continue; + + case 'T': /* time as %H:%M:%S */ + STRFTIME("%H:%M:%S"); + continue; +#endif + +#ifdef SUNOS_EXT + case 'k': /* hour, 24-hour clock, blank pad */ + i = range(0, vtm->hour, 23); + FMT(' ', 2, "d", (int)i); + continue; + + case 'l': /* hour, 12-hour clock, 1 - 12, blank pad */ + i = range(0, vtm->hour, 23); + if (i == 0) + i = 12; + else if (i > 12) + i -= 12; + FMT(' ', 2, "d", (int)i); + continue; +#endif + + +#ifdef VMS_EXT + case 'v': /* date as dd-bbb-YYYY */ + STRFTIME("%e-%^b-%4Y"); + continue; +#endif + + +#ifdef POSIX2_DATE + case 'C': + FMTV('0', 2, "d", div(vtm->year, INT2FIX(100))); + continue; + + case 'E': + /* POSIX locale extensions, ignored for now */ + flags |= BIT_OF(LOCALE_E); + goto again; + case 'O': + /* POSIX locale extensions, ignored for now */ + flags |= BIT_OF(LOCALE_O); + goto again; + + case 'V': /* week of year according ISO 8601 */ + FMT('0', 2, "d", iso8601wknum_v(vtm)); + continue; + + case 'u': + /* ISO 8601: Weekday as a decimal number [1 (Monday) - 7] */ + FMT('0', 1, "d", vtm->wday == 0 ? 7 : vtm->wday); + continue; +#endif /* POSIX2_DATE */ + +#ifdef ISO_DATE_EXT + case 'G': + case 'g': + /* + * Year of ISO week. + * + * If it's December but the ISO week number is one, + * that week is in next year. + * If it's January but the ISO week number is 52 or + * 53, that week is in last year. + * Otherwise, it's this year. + */ + { + VALUE yv = vtm->year; + w = iso8601wknum_v(vtm); + if (vtm->mon == 12 && w == 1) + yv = add(yv, INT2FIX(1)); + else if (vtm->mon == 1 && w >= 52) + yv = sub(yv, INT2FIX(1)); + + if (*format == 'G') { + FMTV('0', 1, "d", yv); + } + else { + yv = mod(yv, INT2FIX(100)); + y = FIX2LONG(yv); + FMT('0', 2, "ld", y); + } + continue; + } + +#endif /* ISO_DATE_EXT */ + + + case 'L': + w = 3; + goto subsec; + + case 'N': + /* + * fractional second digits. default is 9 digits + * (nanosecond). + * + * %3N millisecond (3 digits) + * %6N microsecond (6 digits) + * %9N nanosecond (9 digits) + */ + w = 9; + subsec: + if (precision <= 0) { + precision = w; + } + NEEDS(precision); + + if (ts) { + long subsec = ts->tv_nsec; + if (9 < precision) { + snprintf(s, endp - s, "%09ld", subsec); + memset(s+9, '0', precision-9); + s += precision; + } + else { + int i; + for (i = 0; i < 9-precision; i++) + subsec /= 10; + snprintf(s, endp - s, "%0*ld", precision, subsec); + s += precision; + } + } + else { + VALUE subsec = mod(timev, INT2FIX(1)); + int ww; + long n; + + ww = precision; + while (9 <= ww) { + subsec = mul(subsec, INT2FIX(1000000000)); + ww -= 9; + } + n = 1; + for (; 0 < ww; ww--) + n *= 10; + if (n != 1) + subsec = mul(subsec, INT2FIX(n)); + subsec = div(subsec, INT2FIX(1)); + + if (FIXNUM_P(subsec)) { + int l; + l = snprintf(s, endp - s, "%0*ld", precision, FIX2LONG(subsec)); + s += precision; + } + else { + VALUE args[2], result; + size_t l; + args[0] = INT2FIX(precision); + args[1] = subsec; + result = rb_str_format(2, args, rb_str_new2("%0*d")); + l = strlcpy(s, StringValueCStr(result), endp-s); + s += precision; + } + } + continue; + + case 'F': /* Equivalent to %Y-%m-%d */ + STRFTIME("%Y-%m-%d"); + continue; + + case '-': + FLAG_FOUND(); + flags |= BIT_OF(LEFT); + padding = precision = 0; + goto again; + + case '^': + FLAG_FOUND(); + flags |= BIT_OF(UPPER); + goto again; + + case '#': + FLAG_FOUND(); + flags |= BIT_OF(CHCASE); + goto again; + + case '_': + FLAG_FOUND(); + padding = ' '; + goto again; + + case '0': + padding = '0'; + case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': + { + char *e; + precision = (int)strtoul(format, &e, 10); + format = e - 1; + goto again; + } + + default: + unknown: + i = format - sp + 1; + tp = sp; + precision = -1; + flags = 0; + padding = 0; + break; + } + if (i) { + FILL_PADDING(i); + memcpy(s, tp, i); + switch (flags & (BIT_OF(UPPER)|BIT_OF(LOWER))) { + case BIT_OF(UPPER): + do { + if (ISLOWER(*s)) *s = TOUPPER(*s); + } while (s++, --i); + break; + case BIT_OF(LOWER): + do { + if (ISUPPER(*s)) *s = TOLOWER(*s); + } while (s++, --i); + break; + default: + s += i; + break; + } + } + } + if (s >= endp) { + goto err; + } + if (*format == '\0') { + *s = '\0'; + return (s - start); + } else + return 0; +} + +size_t +rb_strftime(char *s, size_t maxsize, const char *format, const struct vtm *vtm, VALUE timev, int gmt) +{ + return rb_strftime_with_timespec(s, maxsize, format, vtm, timev, NULL, gmt); +} + +size_t +rb_strftime_timespec(char *s, size_t maxsize, const char *format, const struct vtm *vtm, struct timespec *ts, int gmt) +{ + return rb_strftime_with_timespec(s, maxsize, format, vtm, Qnil, ts, gmt); +} + +/* isleap --- is a year a leap year? */ + +#ifndef __STDC__ +static int +isleap(year) +long year; +#else +static int +isleap(long year) +#endif +{ + return ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0); +} + + +static void +vtm2tm_noyear(const struct vtm *vtm, struct tm *result) +{ + struct tm tm; + + /* for isleap() in iso8601wknum. +100 is -1900 (mod 400). */ + tm.tm_year = FIX2INT(mod(vtm->year, INT2FIX(400))) + 100; + + tm.tm_mon = vtm->mon-1; + tm.tm_mday = vtm->mday; + tm.tm_hour = vtm->hour; + tm.tm_min = vtm->min; + tm.tm_sec = vtm->sec; + tm.tm_wday = vtm->wday; + tm.tm_yday = vtm->yday-1; + tm.tm_isdst = vtm->isdst; +#if defined(HAVE_STRUCT_TM_TM_GMTOFF) + tm.tm_gmtoff = NUM2LONG(vtm->utc_offset); +#endif +#if defined(HAVE_TM_ZONE) + tm.tm_zone = (char *)vtm->zone; +#endif + *result = tm; +} + +#ifdef POSIX2_DATE +/* iso8601wknum --- compute week number according to ISO 8601 */ + +#ifndef __STDC__ +static int +iso8601wknum(timeptr) +const struct tm *timeptr; +#else +static int +iso8601wknum(const struct tm *timeptr) +#endif +{ + /* + * From 1003.2: + * If the week (Monday to Sunday) containing January 1 + * has four or more days in the new year, then it is week 1; + * otherwise it is the highest numbered week of the previous + * year (52 or 53), and the next week is week 1. + * + * ADR: This means if Jan 1 was Monday through Thursday, + * it was week 1, otherwise week 52 or 53. + * + * XPG4 erroneously included POSIX.2 rationale text in the + * main body of the standard. Thus it requires week 53. + */ + + int weeknum, jan1day; + + /* get week number, Monday as first day of the week */ + weeknum = weeknumber(timeptr, 1); + + /* + * With thanks and tip of the hatlo to tml@tik.vtt.fi + * + * What day of the week does January 1 fall on? + * We know that + * (timeptr->tm_yday - jan1.tm_yday) MOD 7 == + * (timeptr->tm_wday - jan1.tm_wday) MOD 7 + * and that + * jan1.tm_yday == 0 + * and that + * timeptr->tm_wday MOD 7 == timeptr->tm_wday + * from which it follows that. . . + */ + jan1day = timeptr->tm_wday - (timeptr->tm_yday % 7); + if (jan1day < 0) + jan1day += 7; + + /* + * If Jan 1 was a Monday through Thursday, it was in + * week 1. Otherwise it was last year's highest week, which is + * this year's week 0. + * + * What does that mean? + * If Jan 1 was Monday, the week number is exactly right, it can + * never be 0. + * If it was Tuesday through Thursday, the weeknumber is one + * less than it should be, so we add one. + * Otherwise, Friday, Saturday or Sunday, the week number is + * OK, but if it is 0, it needs to be 52 or 53. + */ + switch (jan1day) { + case 1: /* Monday */ + break; + case 2: /* Tuesday */ + case 3: /* Wednesday */ + case 4: /* Thursday */ + weeknum++; + break; + case 5: /* Friday */ + case 6: /* Saturday */ + case 0: /* Sunday */ + if (weeknum == 0) { +#ifdef USE_BROKEN_XPG4 + /* XPG4 (as of March 1994) says 53 unconditionally */ + weeknum = 53; +#else + /* get week number of last week of last year */ + struct tm dec31ly; /* 12/31 last year */ + dec31ly = *timeptr; + dec31ly.tm_year--; + dec31ly.tm_mon = 11; + dec31ly.tm_mday = 31; + dec31ly.tm_wday = (jan1day == 0) ? 6 : jan1day - 1; + dec31ly.tm_yday = 364 + isleap(dec31ly.tm_year + 1900L); + weeknum = iso8601wknum(& dec31ly); +#endif + } + break; + } + + if (timeptr->tm_mon == 11) { + /* + * The last week of the year + * can be in week 1 of next year. + * Sigh. + * + * This can only happen if + * M T W + * 29 30 31 + * 30 31 + * 31 + */ + int wday, mday; + + wday = timeptr->tm_wday; + mday = timeptr->tm_mday; + if ( (wday == 1 && (mday >= 29 && mday <= 31)) + || (wday == 2 && (mday == 30 || mday == 31)) + || (wday == 3 && mday == 31)) + weeknum = 1; + } + + return weeknum; +} + +static int +iso8601wknum_v(const struct vtm *vtm) +{ + struct tm tm; + vtm2tm_noyear(vtm, &tm); + return iso8601wknum(&tm); +} + +#endif + +/* weeknumber --- figure how many weeks into the year */ + +/* With thanks and tip of the hatlo to ado@elsie.nci.nih.gov */ + +#ifndef __STDC__ +static int +weeknumber(timeptr, firstweekday) +const struct tm *timeptr; +int firstweekday; +#else +static int +weeknumber(const struct tm *timeptr, int firstweekday) +#endif +{ + int wday = timeptr->tm_wday; + int ret; + + if (firstweekday == 1) { + if (wday == 0) /* sunday */ + wday = 6; + else + wday--; + } + ret = ((timeptr->tm_yday + 7 - wday) / 7); + if (ret < 0) + ret = 0; + return ret; +} + +static int +weeknumber_v(const struct vtm *vtm, int firstweekday) +{ + struct tm tm; + vtm2tm_noyear(vtm, &tm); + return weeknumber(&tm, firstweekday); +} + +#if 0 +/* ADR --- I'm loathe to mess with ado's code ... */ + +Date: Wed, 24 Apr 91 20:54:08 MDT +From: Michal Jaegermann +To: arnold@audiofax.com + +Hi Arnold, +in a process of fixing of strftime() in libraries on Atari ST I grabbed +some pieces of code from your own strftime. When doing that it came +to mind that your weeknumber() function compiles a little bit nicer +in the following form: +/* + * firstweekday is 0 if starting in Sunday, non-zero if in Monday + */ +{ + return (timeptr->tm_yday - timeptr->tm_wday + + (firstweekday ? (timeptr->tm_wday ? 8 : 1) : 7)) / 7; +} +How nicer it depends on a compiler, of course, but always a tiny bit. + + Cheers, + Michal + ntomczak@vm.ucs.ualberta.ca +#endif + +#ifdef TEST_STRFTIME + +/* + * NAME: + * tst + * + * SYNOPSIS: + * tst + * + * DESCRIPTION: + * "tst" is a test driver for the function "strftime". + * + * OPTIONS: + * None. + * + * AUTHOR: + * Karl Vogel + * Control Data Systems, Inc. + * vogelke@c-17igp.wpafb.af.mil + * + * BUGS: + * None noticed yet. + * + * COMPILE: + * cc -o tst -DTEST_STRFTIME strftime.c + */ + +/* ADR: I reformatted this to my liking, and deleted some unneeded code. */ + +#ifndef NULL +#include +#endif +#include +#include + +#define MAXTIME 132 + +/* + * Array of time formats. + */ + +static char *array[] = +{ + "(%%A) full weekday name, var length (Sunday..Saturday) %A", + "(%%B) full month name, var length (January..December) %B", + "(%%C) Century %C", + "(%%D) date (%%m/%%d/%%y) %D", + "(%%E) Locale extensions (ignored) %E", + "(%%H) hour (24-hour clock, 00..23) %H", + "(%%I) hour (12-hour clock, 01..12) %I", + "(%%M) minute (00..59) %M", + "(%%O) Locale extensions (ignored) %O", + "(%%R) time, 24-hour (%%H:%%M) %R", + "(%%S) second (00..60) %S", + "(%%T) time, 24-hour (%%H:%%M:%%S) %T", + "(%%U) week of year, Sunday as first day of week (00..53) %U", + "(%%V) week of year according to ISO 8601 %V", + "(%%W) week of year, Monday as first day of week (00..53) %W", + "(%%X) appropriate locale time representation (%H:%M:%S) %X", + "(%%Y) year with century (1970...) %Y", + "(%%Z) timezone (EDT), or blank if timezone not determinable %Z", + "(%%a) locale's abbreviated weekday name (Sun..Sat) %a", + "(%%b) locale's abbreviated month name (Jan..Dec) %b", + "(%%c) full date (Sat Nov 4 12:02:33 1989)%n%t%t%t %c", + "(%%d) day of the month (01..31) %d", + "(%%e) day of the month, blank-padded ( 1..31) %e", + "(%%h) should be same as (%%b) %h", + "(%%j) day of the year (001..366) %j", + "(%%k) hour, 24-hour clock, blank pad ( 0..23) %k", + "(%%l) hour, 12-hour clock, blank pad ( 1..12) %l", + "(%%m) month (01..12) %m", + "(%%p) locale's AM or PM based on 12-hour clock %p", + "(%%r) time, 12-hour (same as %%I:%%M:%%S %%p) %r", + "(%%u) ISO 8601: Weekday as decimal number [1 (Monday) - 7] %u", + "(%%v) VMS date (dd-bbb-YYYY) %v", + "(%%w) day of week (0..6, Sunday == 0) %w", + "(%%x) appropriate locale date representation %x", + "(%%y) last two digits of year (00..99) %y", + "(%%z) timezone offset east of GMT as HHMM (e.g. -0500) %z", + (char *) NULL +}; + +/* main routine. */ + +int +main(argc, argv) +int argc; +char **argv; +{ + long time(); + + char *next; + char string[MAXTIME]; + + int k; + int length; + + struct tm *tm; + + long clock; + + /* Call the function. */ + + clock = time((long *) 0); + tm = localtime(&clock); + + for (k = 0; next = array[k]; k++) { + length = strftime(string, MAXTIME, next, tm); + printf("%s\n", string); + } + + exit(0); +} +#endif /* TEST_STRFTIME */ diff --git a/time.c b/time.c index 86f028f07..2ed97e023 100644 --- a/time.c +++ b/time.c @@ -8,33 +8,1861 @@ * Copyright (C) 1993-2007 Yukihiro Matsumoto */ +#include "macruby_internal.h" +#include "ruby/node.h" +#include "vm.h" +#include "objc.h" +#include "encoding.h" +#include "class.h" #include #include #include +#include "ruby/encoding.h" + +#ifdef HAVE_UNISTD_H #include +#endif + +#include #include -#include "macruby_internal.h" -#include "ruby/encoding.h" -#include "encoding.h" -#include "objc.h" -#include "class.h" +#include "timev.h" + +static SEL sel_to_r, sel_divmod; +static ID id_divmod, id_mul, id_submicro, id_nano_num, id_nano_den, id_offset; +static ID id_eq, id_ne, id_quo, id_div, id_cmp, id_lshift; + +#define NDIV(x,y) (-(-((x)+1)/(y))-1) +#define NMOD(x,y) ((y)-(-((x)+1)%(y))-1) +#define DIV(n,d) ((n)<0 ? NDIV((n),(d)) : (n)/(d)) +#define MOD(n,d) ((n)<0 ? NMOD((n),(d)) : (n)%(d)) + +static int +eq(VALUE x, VALUE y) +{ + if (FIXNUM_P(x) && FIXNUM_P(y)) { + return x == y; + } + return RTEST(rb_funcall(x, id_eq, 1, y)); +} + +static int +cmp(VALUE x, VALUE y) +{ + if (FIXNUM_P(x) && FIXNUM_P(y)) { + if ((long)x < (long)y) + return -1; + if ((long)x > (long)y) + return 1; + return 0; + } + return rb_cmpint(rb_funcall(x, id_cmp, 1, y), x, y); +} + +#define ne(x,y) (!eq((x),(y))) +#define lt(x,y) (cmp((x),(y)) < 0) +#define gt(x,y) (cmp((x),(y)) > 0) +#define le(x,y) (cmp((x),(y)) <= 0) +#define ge(x,y) (cmp((x),(y)) >= 0) + +static VALUE +add(VALUE x, VALUE y) +{ + if (FIXNUM_P(x) && FIXNUM_P(y)) { + long l = FIX2LONG(x) + FIX2LONG(y); + if (FIXABLE(l)) return LONG2FIX(l); + return LONG2NUM(l); + } + if (TYPE(x) == T_BIGNUM) return rb_big_plus(x, y); + return rb_funcall(x, '+', 1, y); +} + +static VALUE +sub(VALUE x, VALUE y) +{ + if (FIXNUM_P(x) && FIXNUM_P(y)) { + long l = FIX2LONG(x) - FIX2LONG(y); + if (FIXABLE(l)) return LONG2FIX(l); + return LONG2NUM(l); + } + if (TYPE(x) == T_BIGNUM) return rb_big_minus(x, y); + return rb_funcall(x, '-', 1, y); +} + +#if !(HAVE_LONG_LONG && SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG) +static int +long_mul(long x, long y, long *z) +{ + unsigned long a, b, c; + int s; + if (x == 0 || y == 0) { + *z = 0; + return 1; + } + if (x < 0) { + s = -1; + a = (unsigned long)-x; + } + else { + s = 1; + a = (unsigned long)x; + } + if (y < 0) { + s = -s; + b = (unsigned long)-y; + } + else { + b = (unsigned long)y; + } + if (a <= ULONG_MAX / b) { + c = a * b; + if (s < 0) { + if (c <= (unsigned long)LONG_MAX + 1) { + *z = -(long)c; + return 1; + } + } + else { + if (c <= (unsigned long)LONG_MAX) { + *z = (long)c; + return 1; + } + } + } + return 0; +} +#endif + +static VALUE +mul(VALUE x, VALUE y) +{ + if (FIXNUM_P(x) && FIXNUM_P(y)) { +#if HAVE_LONG_LONG && SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG + LONG_LONG ll = (LONG_LONG)FIX2LONG(x) * FIX2LONG(y); + if (FIXABLE(ll)) + return LONG2FIX(ll); + return LL2NUM(ll); +#else + long z; + if (long_mul(FIX2LONG(x), FIX2LONG(y), &z)) + return LONG2NUM(z); +#endif + } + if (TYPE(x) == T_BIGNUM) + return rb_big_mul(x, y); + return rb_funcall(x, '*', 1, y); +} + +#define div(x,y) (rb_funcall((x), id_div, 1, (y))) + +static VALUE +mod(VALUE x, VALUE y) +{ + switch (TYPE(x)) { + case T_BIGNUM: return rb_big_modulo(x, y); + default: return rb_funcall(x, '%', 1, y); + } +} + +#define neg(x) (sub(INT2FIX(0), (x))) +#define lshift(x,y) (rb_funcall((x), id_lshift, 1, (y))) + +static VALUE +quo(VALUE x, VALUE y) +{ + VALUE ret; + if (FIXNUM_P(x) && FIXNUM_P(y)) { + long a, b, c; + a = FIX2LONG(x); + b = FIX2LONG(y); + if (b == 0) rb_num_zerodiv(); + c = a / b; + if (c * b == a) { + return LONG2NUM(c); + } + } + ret = rb_funcall(x, id_quo, 1, y); + if (TYPE(ret) == T_RATIONAL && + RRATIONAL(ret)->den == INT2FIX(1)) { + ret = RRATIONAL(ret)->num; + } + return ret; +} + +#define mulquo(x,y,z) (((y) == (z)) ? (x) : quo(mul((x),(y)),(z))) + +static void +divmodv(VALUE n, VALUE d, VALUE *q, VALUE *r) +{ + VALUE tmp, ary; + tmp = rb_funcall(n, id_divmod, 1, d); + ary = rb_check_array_type(tmp); + if (NIL_P(ary)) { + rb_raise(rb_eTypeError, "unexpected divmod result: into %s", + rb_obj_classname(tmp)); + } + *q = rb_ary_entry(ary, 0); + *r = rb_ary_entry(ary, 1); +} + +#if SIZEOF_LONG == 8 +# define INT64toNUM(x) LONG2NUM(x) +# define UINT64toNUM(x) ULONG2NUM(x) +#elif defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG == 8 +# define INT64toNUM(x) LL2NUM(x) +# define UINT64toNUM(x) ULL2NUM(x) +#endif + +#if defined(HAVE_UINT64_T) && SIZEOF_LONG*2 <= SIZEOF_UINT64_T + typedef uint64_t uwideint_t; + typedef int64_t wideint_t; + typedef uint64_t WIDEVALUE; + typedef int64_t SIGNED_WIDEVALUE; +# define WIDEVALUE_IS_WIDER 1 +# define UWIDEINT_MAX UINT64_MAX +# define WIDEINT_MAX INT64_MAX +# define WIDEINT_MIN INT64_MIN +# define FIXWINT_P(tv) ((tv) & 1) +# define FIXWVtoINT64(tv) RSHIFT((SIGNED_WIDEVALUE)(tv), 1) +# define INT64toFIXWV(wi) ((WIDEVALUE)((SIGNED_WIDEVALUE)(wi) << 1 | FIXNUM_FLAG)) +# define FIXWV_MAX (((int64_t)1 << 62) - 1) +# define FIXWV_MIN (-((int64_t)1 << 62)) +# define FIXWVABLE(wi) (POSFIXWVABLE(wi) && NEGFIXWVABLE(wi)) +# define WINT2FIXWV(i) WIDEVAL_WRAP(INT64toFIXWV(i)) +# define FIXWV2WINT(w) FIXWVtoINT64(WIDEVAL_GET(w)) +#else + typedef unsigned long uwideint_t; + typedef long wideint_t; + typedef VALUE WIDEVALUE; + typedef SIGNED_VALUE SIGNED_WIDEVALUE; +# define WIDEVALUE_IS_WIDER 0 +# define UWIDEINT_MAX ULONG_MAX +# define WIDEINT_MAX LONG_MAX +# define WIDEINT_MIN LONG_MIN +# define FIXWINT_P(v) FIXNUM_P(v) +# define FIXWV_MAX FIXNUM_MAX +# define FIXWV_MIN FIXNUM_MIN +# define FIXWVABLE(i) FIXABLE(i) +# define WINT2FIXWV(i) WIDEVAL_WRAP(LONG2FIX(i)) +# define FIXWV2WINT(w) FIX2LONG(WIDEVAL_GET(w)) +#endif + +#define POSFIXWVABLE(wi) ((wi) < FIXWV_MAX+1) +#define NEGFIXWVABLE(wi) ((wi) >= FIXWV_MIN) +#define FIXWV_P(w) FIXWINT_P(WIDEVAL_GET(w)) + +/* #define STRUCT_WIDEVAL */ +#ifdef STRUCT_WIDEVAL + /* for type checking */ + typedef struct { + WIDEVALUE value; + } wideval_t; + static inline wideval_t WIDEVAL_WRAP(WIDEVALUE v) { wideval_t w = { v }; return w; } +# define WIDEVAL_GET(w) ((w).value) +#else + typedef WIDEVALUE wideval_t; +# define WIDEVAL_WRAP(v) (v) +# define WIDEVAL_GET(w) (w) +#endif + +#if WIDEVALUE_IS_WIDER + static inline wideval_t + wint2wv(wideint_t wi) + { + if (FIXWVABLE(wi)) + return WINT2FIXWV(wi); + else + return WIDEVAL_WRAP(INT64toNUM(wi)); + } +# define WINT2WV(wi) wint2wv(wi) +#else +# define WINT2WV(wi) WIDEVAL_WRAP(LONG2NUM(wi)) +#endif + +static inline VALUE +w2v(wideval_t w) +{ +#if WIDEVALUE_IS_WIDER + if (FIXWV_P(w)) + return INT64toNUM(FIXWV2WINT(w)); + return (VALUE)WIDEVAL_GET(w); +#else + return WIDEVAL_GET(w); +#endif +} + +#if WIDEVALUE_IS_WIDER +static int +bdigit_find_maxbit(BDIGIT d) +{ + int res = 0; + if (d & ~(BDIGIT)0xffff) { + d >>= 16; + res += 16; + } + if (d & ~(BDIGIT)0xff) { + d >>= 8; + res += 8; + } + if (d & ~(BDIGIT)0xf) { + d >>= 4; + res += 4; + } + if (d & ~(BDIGIT)0x3) { + d >>= 2; + res += 2; + } + if (d & ~(BDIGIT)0x1) { + d >>= 1; + res += 1; + } + return res; +} + +static VALUE +rb_big_abs_find_maxbit(VALUE big) +{ + BDIGIT *ds = RBIGNUM_DIGITS(big); + BDIGIT d; + long len = RBIGNUM_LEN(big); + VALUE res; + while (0 < len && ds[len-1] == 0) + len--; + if (len == 0) + return Qnil; + res = mul(LONG2NUM(len-1), INT2FIX(SIZEOF_BDIGITS * CHAR_BIT)); + d = ds[len-1]; + res = add(res, LONG2FIX(bdigit_find_maxbit(d))); + return res; +} + +static VALUE +rb_big_abs_find_minbit(VALUE big) +{ + BDIGIT *ds = RBIGNUM_DIGITS(big); + BDIGIT d; + long len = RBIGNUM_LEN(big); + long i; + VALUE res; + for (i = 0; i < len; i++) + if (ds[i]) + break; + if (i == len) + return Qnil; + res = mul(LONG2NUM(i), INT2FIX(SIZEOF_BDIGITS * CHAR_BIT)); + d = ds[i]; + res = add(res, LONG2FIX(bdigit_find_maxbit(d & (~d-1)))); + return res; +} + +static wideval_t +v2w_bignum(VALUE v) +{ + long len = RBIGNUM_LEN(v); + BDIGIT *ds; + wideval_t w; + VALUE maxbit; + ds = RBIGNUM_DIGITS(v); + w = WIDEVAL_WRAP(v); + maxbit = rb_big_abs_find_maxbit(v); + if (NIL_P(maxbit)) + return WINT2FIXWV(0); + if (lt(maxbit, INT2FIX(sizeof(wideint_t) * CHAR_BIT - 2)) || + (eq(maxbit, INT2FIX(sizeof(wideint_t) * CHAR_BIT - 2)) && + RBIGNUM_NEGATIVE_P(v) && + eq(rb_big_abs_find_minbit(v), INT2FIX(sizeof(wideint_t) * CHAR_BIT - 2)))) { + wideint_t i; + i = 0; + while (len) + i = (i << sizeof(BDIGIT)*CHAR_BIT) | ds[--len]; + if (RBIGNUM_NEGATIVE_P(v)) { + i = -i; + } + w = WINT2FIXWV(i); + } + return w; +} +#endif + +static inline wideval_t +v2w(VALUE v) +{ +#if WIDEVALUE_IS_WIDER + if (FIXNUM_P(v)) { + return WIDEVAL_WRAP((WIDEVALUE)(SIGNED_WIDEVALUE)(long)v); + } + else if (TYPE(v) == T_BIGNUM && + RBIGNUM_LEN(v) * sizeof(BDIGIT) <= sizeof(WIDEVALUE)) { + return v2w_bignum(v); + } +#endif + return WIDEVAL_WRAP(v); +} + +static int +weq(wideval_t wx, wideval_t wy) +{ +#if WIDEVALUE_IS_WIDER + if (FIXWV_P(wx) && FIXWV_P(wy)) { + return WIDEVAL_GET(wx) == WIDEVAL_GET(wy); + } + return RTEST(rb_funcall(w2v(wx), id_eq, 1, w2v(wy))); +#else + return eq(WIDEVAL_GET(wx), WIDEVAL_GET(wy)); +#endif +} + +static int +wcmp(wideval_t wx, wideval_t wy) +{ + VALUE x, y; +#if WIDEVALUE_IS_WIDER + if (FIXWV_P(wx) && FIXWV_P(wy)) { + wideint_t a, b; + a = FIXWV2WINT(wx); + b = FIXWV2WINT(wy); + if (a < b) + return -1; + if (a > b) + return 1; + return 0; + } +#endif + x = w2v(wx); + y = w2v(wy); + return rb_cmpint(rb_funcall(x, id_cmp, 1, y), x, y); +} + +#define wne(x,y) (!weq((x),(y))) +#define wlt(x,y) (wcmp((x),(y)) < 0) +#define wgt(x,y) (wcmp((x),(y)) > 0) +#define wle(x,y) (wcmp((x),(y)) <= 0) +#define wge(x,y) (wcmp((x),(y)) >= 0) + +static wideval_t +wadd(wideval_t wx, wideval_t wy) +{ + VALUE x; +#if WIDEVALUE_IS_WIDER + if (FIXWV_P(wx) && FIXWV_P(wy)) { + wideint_t r = FIXWV2WINT(wx) + FIXWV2WINT(wy); + return WINT2WV(r); + } + else +#endif + x = w2v(wx); + if (TYPE(x) == T_BIGNUM) return v2w(rb_big_plus(x, w2v(wy))); + return v2w(rb_funcall(x, '+', 1, w2v(wy))); +} + +static wideval_t +wsub(wideval_t wx, wideval_t wy) +{ + VALUE x; +#if WIDEVALUE_IS_WIDER + if (FIXWV_P(wx) && FIXWV_P(wy)) { + wideint_t r = FIXWV2WINT(wx) - FIXWV2WINT(wy); + return WINT2WV(r); + } + else +#endif + x = w2v(wx); + if (TYPE(x) == T_BIGNUM) return v2w(rb_big_minus(x, w2v(wy))); + return v2w(rb_funcall(x, '-', 1, w2v(wy))); +} + +static int +wi_mul(wideint_t x, wideint_t y, wideint_t *z) +{ + uwideint_t a, b, c; + int s; + if (x == 0 || y == 0) { + *z = 0; + return 1; + } + if (x < 0) { + s = -1; + a = (uwideint_t)-x; + } + else { + s = 1; + a = (uwideint_t)x; + } + if (y < 0) { + s = -s; + b = (uwideint_t)-y; + } + else { + b = (uwideint_t)y; + } + if (a <= UWIDEINT_MAX / b) { + c = a * b; + if (s < 0) { + if (c <= (uwideint_t)WIDEINT_MAX + 1) { + *z = -(wideint_t)c; + return 1; + } + } + else { + if (c <= (uwideint_t)WIDEINT_MAX) { + *z = (wideint_t)c; + return 1; + } + } + } + return 0; +} + +static wideval_t +wmul(wideval_t wx, wideval_t wy) +{ + VALUE x, z; +#if WIDEVALUE_IS_WIDER + if (FIXWV_P(wx) && FIXWV_P(wy)) { + wideint_t z; + if (wi_mul(FIXWV2WINT(wx), FIXWV2WINT(wy), &z)) + return WINT2WV(z); + } +#endif + x = w2v(wx); + if (TYPE(x) == T_BIGNUM) return v2w(rb_big_mul(x, w2v(wy))); + z = rb_funcall(x, '*', 1, w2v(wy)); + if (TYPE(z) == T_RATIONAL && RRATIONAL(z)->den == INT2FIX(1)) { + z = RRATIONAL(z)->num; + } + return v2w(z); +} + +static wideval_t +wquo(wideval_t wx, wideval_t wy) +{ + VALUE x, y, ret; +#if WIDEVALUE_IS_WIDER + if (FIXWV_P(wx) && FIXWV_P(wy)) { + wideint_t a, b, c; + a = FIXWV2WINT(wx); + b = FIXWV2WINT(wy); + if (b == 0) rb_num_zerodiv(); + c = a / b; + if (c * b == a) { + return WINT2WV(c); + } + } +#endif + x = w2v(wx); + y = w2v(wy); + ret = rb_funcall(x, id_quo, 1, y); + if (TYPE(ret) == T_RATIONAL && + RRATIONAL(ret)->den == INT2FIX(1)) { + ret = RRATIONAL(ret)->num; + } + return v2w(ret); +} + +#define wmulquo(x,y,z) ((WIDEVAL_GET(y) == WIDEVAL_GET(z)) ? (x) : wquo(wmul((x),(y)),(z))) +#define wmulquoll(x,y,z) (((y) == (z)) ? (x) : wquo(wmul((x),WINT2WV(y)),WINT2WV(z))) + +static void +wdivmod(wideval_t wn, wideval_t wd, wideval_t *wq, wideval_t *wr) +{ + VALUE tmp, ary; +#if WIDEVALUE_IS_WIDER + if (FIXWV_P(wn) && FIXWV_P(wd)) { + wideint_t n, d, q, r; + d = FIXWV2WINT(wd); + if (d == 0) rb_num_zerodiv(); + if (d == 1) { + *wq = wn; + *wr = WINT2FIXWV(0); + return; + } + if (d == -1) { + wideint_t xneg = -FIXWV2WINT(wn); + *wq = WINT2WV(xneg); + *wr = WINT2FIXWV(0); + return; + } + n = FIXWV2WINT(wn); + if (n == 0) { + *wq = WINT2FIXWV(0); + *wr = WINT2FIXWV(0); + return; + } + if (d < 0) { + if (n < 0) { + q = ((-n) / (-d)); + r = ((-n) % (-d)); + if (r != 0) { + q -= 1; + r += d; + } + } + else { /* 0 < n */ + q = -(n / (-d)); + r = -(n % (-d)); + } + } + else { /* 0 < d */ + if (n < 0) { + q = -((-n) / d); + r = -((-n) % d); + if (r != 0) { + q -= 1; + r += d; + } + } + else { /* 0 < n */ + q = n / d; + r = n % d; + } + } + *wq = WINT2FIXWV(q); + *wr = WINT2FIXWV(r); + return; + } +#endif + tmp = rb_funcall(w2v(wn), id_divmod, 1, w2v(wd)); + ary = rb_check_array_type(tmp); + if (NIL_P(ary)) { + rb_raise(rb_eTypeError, "unexpected divmod result: into %s", + rb_obj_classname(tmp)); + } + *wq = v2w(rb_ary_entry(ary, 0)); + *wr = v2w(rb_ary_entry(ary, 1)); +} + +static void +wmuldivmod(wideval_t wx, wideval_t wy, wideval_t wz, wideval_t *wq, wideval_t *wr) +{ + if (WIDEVAL_GET(wy) == WIDEVAL_GET(wz)) { + *wq = wx; + *wr = WINT2FIXWV(0); + return; + } + wdivmod(wmul(wx,wy), wz, wq, wr); +} + +static wideval_t +wdiv(wideval_t wx, wideval_t wy) +{ + wideval_t q, r; + wdivmod(wx, wy, &q, &r); + return q; +} + +static wideval_t +wmod(wideval_t wx, wideval_t wy) +{ + wideval_t q, r; + wdivmod(wx, wy, &q, &r); + return r; +} + +static VALUE +num_exact(VALUE v) +{ + VALUE tmp; + int t; + + t = TYPE(v); + switch (t) { + case T_FIXNUM: + case T_BIGNUM: + return v; + + case T_RATIONAL: + break; + + case T_STRING: + case T_NIL: + goto typeerror; + + default: + tmp = Qundef; + if (rb_vm_respond_to(v, sel_to_r, true)) { + tmp = rb_vm_call(v, sel_to_r, 0, NULL); + } + if (tmp != Qundef) { + if (rb_respond_to(v, rb_intern("to_str"))) goto typeerror; + v = tmp; + break; + } + if (!NIL_P(tmp = rb_check_to_integer(v, "to_int"))) { + v = tmp; + break; + } + goto typeerror; + } + + t = TYPE(v); + switch (t) { + case T_FIXNUM: + case T_BIGNUM: + return v; + + case T_RATIONAL: + if (RRATIONAL(v)->den == INT2FIX(1)) + v = RRATIONAL(v)->num; + break; + + default: + typeerror: + rb_raise(rb_eTypeError, "can't convert %s into an exact number", + NIL_P(v) ? "nil" : rb_obj_classname(v)); + } + return v; +} + +/* time_t */ + +#ifndef TYPEOF_TIMEVAL_TV_SEC +# define TYPEOF_TIMEVAL_TV_SEC time_t +#endif +#ifndef TYPEOF_TIMEVAL_TV_USEC +# if INT_MAX >= 1000000 +# define TYPEOF_TIMEVAL_TV_USEC int +# else +# define TYPEOF_TIMEVAL_TV_USEC long +# endif +#endif + +#if SIZEOF_TIME_T == SIZEOF_LONG +typedef unsigned long unsigned_time_t; +#elif SIZEOF_TIME_T == SIZEOF_INT +typedef unsigned int unsigned_time_t; +#elif SIZEOF_TIME_T == SIZEOF_LONG_LONG +typedef unsigned LONG_LONG unsigned_time_t; +#else +# error cannot find integer type which size is same as time_t. +#endif + +#define TIMET_MAX (~(time_t)0 <= 0 ? (time_t)((~(unsigned_time_t)0) >> 1) : (time_t)(~(unsigned_time_t)0)) +#define TIMET_MIN (~(time_t)0 <= 0 ? (time_t)(((unsigned_time_t)1) << (sizeof(time_t) * CHAR_BIT - 1)) : (time_t)0) + +static wideval_t +rb_time_magnify(wideval_t w) +{ + if (FIXWV_P(w)) { + wideint_t z; + if (wi_mul(FIXWV2WINT(w), TIME_SCALE, &z)) + return WINT2WV(z); + } + return wmul(w, WINT2FIXWV(TIME_SCALE)); +} + +static wideval_t +rb_time_unmagnify(wideval_t w) +{ +#if WIDEVALUE_IS_WIDER + if (FIXWV_P(w)) { + wideint_t a, b, c; + a = FIXWV2WINT(w); + b = TIME_SCALE; + c = a / b; + if (c * b == a) { + return WINT2FIXWV(c); + } + } +#endif + return wquo(w, WINT2FIXWV(TIME_SCALE)); +} + +static VALUE +rb_time_unmagnify_to_float(wideval_t w) +{ + VALUE v; +#if WIDEVALUE_IS_WIDER + if (FIXWV_P(w)) { + wideint_t a, b, c; + a = FIXWV2WINT(w); + b = TIME_SCALE; + c = a / b; + if (c * b == a) { + return DBL2NUM((double)c); + } + v = DBL2NUM((double)FIXWV2WINT(w)); + return quo(v, DBL2NUM(TIME_SCALE)); + } +#endif + v = w2v(w); + return quo(v, DBL2NUM(TIME_SCALE)); +} + +static void +split_second(wideval_t timew, wideval_t *timew_p, VALUE *subsecx_p) +{ + wideval_t q, r; + wdivmod(timew, WINT2FIXWV(TIME_SCALE), &q, &r); + *timew_p = q; + *subsecx_p = w2v(r); +} + +static wideval_t +timet2wv(time_t t) +{ +#if WIDEVALUE_IS_WIDER + if (TIMET_MIN == 0) { + uwideint_t wi = (uwideint_t)t; + if (wi <= FIXWV_MAX) { + return WINT2FIXWV(wi); + } + } + else { + wideint_t wi = (wideint_t)t; + if (FIXWV_MIN <= wi && wi <= FIXWV_MAX) { + return WINT2FIXWV(wi); + } + } +#endif + return v2w(TIMET2NUM(t)); +} +#define TIMET2WV(t) timet2wv(t) + +static time_t +wv2timet(wideval_t w) +{ +#if WIDEVALUE_IS_WIDER + if (FIXWV_P(w)) { + wideint_t wi = FIXWV2WINT(w); + if (TIMET_MIN == 0) { + if (wi < 0) + rb_raise(rb_eRangeError, "negative value to convert into `time_t'"); + if (TIMET_MAX < (uwideint_t)wi) + rb_raise(rb_eRangeError, "too big to convert into `time_t'"); + } + else { + if (wi < TIMET_MIN || TIMET_MAX < wi) + rb_raise(rb_eRangeError, "too big to convert into `time_t'"); + } + return (time_t)wi; + } +#endif + return NUM2TIMET(w2v(w)); +} +#define WV2TIMET(t) wv2timet(t) + +VALUE rb_cNSDate; +VALUE rb_cTime; +static VALUE time_utc_offset _((VALUE, SEL)); + +static int obj2int(VALUE obj); +static VALUE obj2vint(VALUE obj); +static int month_arg(VALUE arg); +static void validate_utc_offset(VALUE utc_offset); +static void validate_vtm(struct vtm *vtm); + +static VALUE time_gmtime(VALUE, SEL); +static VALUE time_localtime(VALUE); +static VALUE time_fixoff(VALUE); + +static time_t timegm_noleapsecond(struct tm *tm); +static int tmcmp(struct tm *a, struct tm *b); +static int vtmcmp(struct vtm *a, struct vtm *b); +static const char *find_time_t(struct tm *tptr, int utc_p, time_t *tp); + +static struct vtm *localtimew(wideval_t timew, struct vtm *result); + +static int leap_year_p(long y); +#define leap_year_v_p(y) leap_year_p(NUM2LONG(mod((y), INT2FIX(400)))) + +#ifdef HAVE_GMTIME_R +#define rb_gmtime_r(t, tm) gmtime_r((t), (tm)) +#define rb_localtime_r(t, tm) localtime_r((t), (tm)) +#else +static inline struct tm * +rb_gmtime_r(const time_t *tp, struct tm *result) +{ + struct tm *t = gmtime(tp); + if (t) *result = *t; + return t; +} + +static inline struct tm * +rb_localtime_r(const time_t *tp, struct tm *result) +{ + struct tm *t = localtime(tp); + if (t) *result = *t; + return t; +} +#endif + +static struct tm * +rb_localtime_r2(const time_t *t, struct tm *result) +{ +#if defined __APPLE__ && defined __LP64__ + if (*t != (time_t)(int)*t) return NULL; +#endif + result = rb_localtime_r(t, result); +#if defined(HAVE_MKTIME) && defined(LOCALTIME_OVERFLOW_PROBLEM) + if (result) { + int gmtoff1 = 0; + int gmtoff2 = 0; + struct tm tmp = *result; + time_t t2; +# if defined(HAVE_STRUCT_TM_TM_GMTOFF) + gmtoff1 = result->tm_gmtoff; +# endif + t2 = mktime(&tmp); +# if defined(HAVE_STRUCT_TM_TM_GMTOFF) + gmtoff2 = tmp.tm_gmtoff; +# endif + if (*t + gmtoff1 != t2 + gmtoff2) + result = NULL; + } +#endif + return result; +} +#define LOCALTIME(tm, result) (tzset(),rb_localtime_r2((tm), &(result))) + +#if !defined(HAVE_STRUCT_TM_TM_GMTOFF) +static struct tm * +rb_gmtime_r2(const time_t *t, struct tm *result) +{ + result = rb_gmtime_r(t, result); +#if defined(HAVE_TIMEGM) && defined(LOCALTIME_OVERFLOW_PROBLEM) + if (result) { + struct tm tmp = *result; + time_t t2 = timegm(&tmp); + if (*t != t2) + result = NULL; + } +#endif + return result; +} +# define GMTIME(tm, result) rb_gmtime_r2((tm), &(result)) +#endif + +static const 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 const 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 */ +}; + +static const int common_year_days_in_month[] = { + 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 +}; +static const int leap_year_days_in_month[] = { + 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 +}; + +static int +calc_tm_yday(long tm_year, int tm_mon, int tm_mday) +{ + int tm_year_mod400; + int tm_yday = tm_mday; + + tm_year_mod400 = MOD(tm_year, 400); + + if (leap_year_p(tm_year_mod400 + 1900)) + tm_yday += leap_year_yday_offset[tm_mon]; + else + tm_yday += common_year_yday_offset[tm_mon]; + + return tm_yday; +} + +static wideval_t +timegmw_noleapsecond(struct vtm *vtm) +{ + VALUE year1900; + VALUE q400, r400; + int year_mod400; + int yday; + long days_in400; + VALUE vdays, ret; + wideval_t wret; + + year1900 = sub(vtm->year, INT2FIX(1900)); + + divmodv(year1900, INT2FIX(400), &q400, &r400); + year_mod400 = NUM2INT(r400); + + yday = calc_tm_yday(year_mod400, vtm->mon-1, vtm->mday); + + /* + * `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 + */ + ret = LONG2NUM(vtm->sec + + vtm->min*60 + + vtm->hour*3600); + days_in400 = yday + - 70*365 + + DIV(year_mod400 - 69, 4) + - DIV(year_mod400 - 1, 100) + + (year_mod400 + 299) / 400; + vdays = LONG2NUM(days_in400); + vdays = add(vdays, mul(q400, INT2FIX(97))); + vdays = add(vdays, mul(year1900, INT2FIX(365))); + wret = wadd(rb_time_magnify(v2w(ret)), wmul(rb_time_magnify(v2w(vdays)), WINT2FIXWV(86400))); + wret = wadd(wret, v2w(vtm->subsecx)); + + return wret; +} + +static st_table *zone_table; + +static const char * +zone_str(const char *s) +{ + st_data_t k, v; + + if (!zone_table) { + zone_table = st_init_strtable(); + GC_RETAIN(zone_table); + } + + k = (st_data_t)s; + if (st_lookup(zone_table, k, &v)) { + return (const char *)v; + } + s = strdup(s); + k = (st_data_t)s; + st_add_direct(zone_table, k, k); + + return s; +} + +static void +gmtimew_noleapsecond(wideval_t timew, struct vtm *vtm) +{ + VALUE v; + int i, n, x, y; + const int *yday_offset; + int wday; + VALUE timev; + wideval_t timew2, w, w2; + + vtm->isdst = 0; + + split_second(timew, &timew2, &vtm->subsecx); + + wdivmod(timew2, WINT2FIXWV(86400), &w2, &w); + timev = w2v(w2); + v = w2v(w); + + wday = NUM2INT(mod(timev, INT2FIX(7))); + vtm->wday = (wday + 4) % 7; + + n = NUM2INT(v); + vtm->sec = n % 60; n = n / 60; + vtm->min = n % 60; n = n / 60; + vtm->hour = n; + + /* 97 leap days in the 400 year cycle */ + divmodv(timev, INT2FIX(400*365 + 97), &timev, &v); + vtm->year = mul(timev, INT2FIX(400)); + + /* n is the days in the 400 year cycle. + * the start of the cycle is 1970-01-01. */ + + n = NUM2INT(v); + y = 1970; + + /* 30 years including 7 leap days (1972, 1976, ... 1996), + * 31 days in January 2000 and + * 29 days in February 2000 + * from 1970-01-01 to 2000-02-29 */ + if (30*365+7+31+29-1 <= n) { + /* 2000-02-29 or after */ + if (n < 31*365+8) { + /* 2000-02-29 to 2000-12-31 */ + y += 30; + n -= 30*365+7; + goto found; + } + else { + /* 2001-01-01 or after */ + n -= 1; + } + } + + x = n / (365*100 + 24); + n = n % (365*100 + 24); + y += x * 100; + if (30*365+7+31+29-1 <= n) { + if (n < 31*365+7) { + y += 30; + n -= 30*365+7; + goto found; + } + else + n += 1; + } + + x = n / (365*4 + 1); + n = n % (365*4 + 1); + y += x * 4; + if (365*2+31+29-1 <= n) { + if (n < 365*2+366) { + y += 2; + n -= 365*2; + goto found; + } + else + n -= 1; + } + + x = n / 365; + n = n % 365; + y += x; + + found: + vtm->yday = n+1; + vtm->year = add(vtm->year, INT2NUM(y)); + + if (leap_year_p(y)) + yday_offset = leap_year_yday_offset; + else + yday_offset = common_year_yday_offset; + + for (i = 0; i < 12; i++) { + if (yday_offset[i] < n) { + vtm->mon = i+1; + vtm->mday = n - yday_offset[i]; + } + else + break; + } + + vtm->utc_offset = INT2FIX(0); + vtm->zone = "UTC"; +} + +static struct tm * +gmtime_with_leapsecond(const time_t *timep, struct tm *result) +{ +#if defined(HAVE_STRUCT_TM_TM_GMTOFF) + /* 4.4BSD counts leap seconds only with localtime, not with gmtime. */ + struct tm *t; + int sign; + int gmtoff_sec, gmtoff_min, gmtoff_hour, gmtoff_day; + long gmtoff; + t = LOCALTIME(timep, *result); + if (t == NULL) + return NULL; + + /* subtract gmtoff */ + if (t->tm_gmtoff < 0) { + sign = 1; + gmtoff = -t->tm_gmtoff; + } + else { + sign = -1; + gmtoff = t->tm_gmtoff; + } + gmtoff_sec = (int)(gmtoff % 60); + gmtoff = gmtoff / 60; + gmtoff_min = (int)(gmtoff % 60); + gmtoff = gmtoff / 60; + gmtoff_hour = (int)gmtoff; /* <= 12 */ + + gmtoff_sec *= sign; + gmtoff_min *= sign; + gmtoff_hour *= sign; + + gmtoff_day = 0; + + if (gmtoff_sec) { + /* If gmtoff_sec == 0, don't change result->tm_sec. + * It may be 60 which is a leap second. */ + result->tm_sec += gmtoff_sec; + if (result->tm_sec < 0) { + result->tm_sec += 60; + gmtoff_min -= 1; + } + if (60 <= result->tm_sec) { + result->tm_sec -= 60; + gmtoff_min += 1; + } + } + if (gmtoff_min) { + result->tm_min += gmtoff_min; + if (result->tm_min < 0) { + result->tm_min += 60; + gmtoff_hour -= 1; + } + if (60 <= result->tm_min) { + result->tm_min -= 60; + gmtoff_hour += 1; + } + } + if (gmtoff_hour) { + result->tm_hour += gmtoff_hour; + if (result->tm_hour < 0) { + result->tm_hour += 24; + gmtoff_day = -1; + } + if (24 <= result->tm_hour) { + result->tm_hour -= 24; + gmtoff_day = 1; + } + } + + if (gmtoff_day) { + if (gmtoff_day < 0) { + if (result->tm_yday == 0) { + result->tm_mday = 31; + result->tm_mon = 11; /* December */ + result->tm_year--; + result->tm_yday = leap_year_p(result->tm_year + 1900) ? 365 : 364; + } + else if (result->tm_mday == 1) { + const int *days_in_month = leap_year_p(result->tm_year + 1900) ? + leap_year_days_in_month : + common_year_days_in_month; + result->tm_mon--; + result->tm_mday = days_in_month[result->tm_mon]; + result->tm_yday--; + } + else { + result->tm_mday--; + result->tm_yday--; + } + result->tm_wday = (result->tm_wday + 6) % 7; + } + else { + int leap = leap_year_p(result->tm_year + 1900); + if (result->tm_yday == (leap ? 365 : 364)) { + result->tm_year++; + result->tm_mon = 0; /* January */ + result->tm_mday = 1; + result->tm_yday = 0; + } + else if (result->tm_mday == (leap ? leap_year_days_in_month : + common_year_days_in_month)[result->tm_mon]) { + result->tm_mon++; + result->tm_mday = 1; + result->tm_yday++; + } + else { + result->tm_mday++; + result->tm_yday++; + } + result->tm_wday = (result->tm_wday + 1) % 7; + } + } + result->tm_isdst = 0; + result->tm_gmtoff = 0; +#if defined(HAVE_TM_ZONE) + result->tm_zone = (char *)"UTC"; +#endif + return result; +#else + return GMTIME(timep, *result); +#endif +} + +static long this_year = 0; +static time_t known_leap_seconds_limit; +static int number_of_leap_seconds_known; + +static void +init_leap_second_info() +{ + /* + * leap seconds are determined by IERS. + * It is announced 6 months before the leap second. + * So no one knows leap seconds in the future after the next year. + */ + if (this_year == 0) { + time_t now; + struct tm *tm, result; + struct vtm vtm; + wideval_t timew; + now = time(NULL); + gmtime(&now); + tm = gmtime_with_leapsecond(&now, &result); + if (!tm) return; + this_year = tm->tm_year; + + if (TIMET_MAX - now < (time_t)(366*86400)) + known_leap_seconds_limit = TIMET_MAX; + else + known_leap_seconds_limit = now + (time_t)(366*86400); + + if (!gmtime_with_leapsecond(&known_leap_seconds_limit, &result)) + return; + + vtm.year = LONG2NUM(result.tm_year + 1900); + vtm.mon = result.tm_mon + 1; + vtm.mday = result.tm_mday; + vtm.hour = result.tm_hour; + vtm.min = result.tm_min; + vtm.sec = result.tm_sec; + vtm.subsecx = INT2FIX(0); + vtm.utc_offset = INT2FIX(0); + + timew = timegmw_noleapsecond(&vtm); + + number_of_leap_seconds_known = NUM2INT(w2v(wsub(TIMET2WV(known_leap_seconds_limit), rb_time_unmagnify(timew)))); + } +} + +static wideval_t +timegmw(struct vtm *vtm) +{ + wideval_t timew; + struct tm tm; + time_t t; + const char *errmsg; + + /* The first leap second is 1972-06-30 23:59:60 UTC. + * No leap seconds before. */ + if (gt(INT2FIX(1972), vtm->year)) + return timegmw_noleapsecond(vtm); + + init_leap_second_info(); + + timew = timegmw_noleapsecond(vtm); + + if (wlt(rb_time_magnify(TIMET2WV(known_leap_seconds_limit)), timew)) { + return wadd(timew, rb_time_magnify(WINT2WV(number_of_leap_seconds_known))); + } + + tm.tm_year = rb_long2int(NUM2LONG(vtm->year) - 1900); + tm.tm_mon = vtm->mon - 1; + tm.tm_mday = vtm->mday; + tm.tm_hour = vtm->hour; + tm.tm_min = vtm->min; + tm.tm_sec = vtm->sec; + tm.tm_isdst = 0; + + errmsg = find_time_t(&tm, 1, &t); + if (errmsg) + rb_raise(rb_eArgError, "%s", errmsg); + return wadd(rb_time_magnify(TIMET2WV(t)), v2w(vtm->subsecx)); +} + +static struct vtm * +gmtimew(wideval_t timew, struct vtm *result) +{ + time_t t; + struct tm tm; + VALUE subsecx; + wideval_t timew2; + + if (wlt(timew, WINT2FIXWV(0))) { + gmtimew_noleapsecond(timew, result); + return result; + } + + init_leap_second_info(); + + if (wlt(rb_time_magnify(TIMET2WV(known_leap_seconds_limit)), timew)) { + timew = wsub(timew, rb_time_magnify(WINT2WV(number_of_leap_seconds_known))); + gmtimew_noleapsecond(timew, result); + return result; + } + + split_second(timew, &timew2, &subsecx); + + t = WV2TIMET(timew2); + if (!gmtime_with_leapsecond(&t, &tm)) + return NULL; + + result->year = LONG2NUM((long)tm.tm_year + 1900); + result->mon = tm.tm_mon + 1; + result->mday = tm.tm_mday; + result->hour = tm.tm_hour; + result->min = tm.tm_min; + result->sec = tm.tm_sec; + result->subsecx = subsecx; + result->utc_offset = INT2FIX(0); + result->wday = tm.tm_wday; + result->yday = tm.tm_yday+1; + result->isdst = tm.tm_isdst; + result->zone = "UTC"; + + return result; +} + +static struct tm *localtime_with_gmtoff_zone(const time_t *t, struct tm *result, long *gmtoff, const char **zone); + +/* + * The idea is come from Perl: + * http://use.perl.org/articles/08/02/07/197204.shtml + * + * compat_common_month_table is generated by following program. + * This table finds the last month which start the same day of a week. + * The year 2037 is not used because + * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=522949 + * + * #!/usr/bin/ruby + * + * require 'date' + * + * h = {} + * 2036.downto(2010) {|y| + * 1.upto(12) {|m| + * next if m == 2 && y % 4 == 0 + * d = Date.new(y,m,1) + * h[m] ||= {} + * h[m][d.wday] ||= y + * } + * } + * + * 1.upto(12) {|m| + * print "{" + * 0.upto(6) {|w| + * y = h[m][w] + * print " #{y}," + * } + * puts "}," + * } + * + */ +static int compat_common_month_table[12][7] = { + /* Sun Mon Tue Wed Thu Fri Sat */ + { 2034, 2035, 2036, 2031, 2032, 2027, 2033 }, /* January */ + { 2026, 2027, 2033, 2034, 2035, 2030, 2031 }, /* February */ + { 2026, 2032, 2033, 2034, 2035, 2030, 2036 }, /* March */ + { 2035, 2030, 2036, 2026, 2032, 2033, 2034 }, /* April */ + { 2033, 2034, 2035, 2030, 2036, 2026, 2032 }, /* May */ + { 2036, 2026, 2032, 2033, 2034, 2035, 2030 }, /* June */ + { 2035, 2030, 2036, 2026, 2032, 2033, 2034 }, /* July */ + { 2032, 2033, 2034, 2035, 2030, 2036, 2026 }, /* August */ + { 2030, 2036, 2026, 2032, 2033, 2034, 2035 }, /* September */ + { 2034, 2035, 2030, 2036, 2026, 2032, 2033 }, /* October */ + { 2026, 2032, 2033, 2034, 2035, 2030, 2036 }, /* November */ + { 2030, 2036, 2026, 2032, 2033, 2034, 2035 }, /* December */ +}; + +/* + * compat_leap_month_table is generated by following program. + * + * #!/usr/bin/ruby + * + * require 'date' + * + * h = {} + * 2037.downto(2010) {|y| + * 1.upto(12) {|m| + * next unless m == 2 && y % 4 == 0 + * d = Date.new(y,m,1) + * h[m] ||= {} + * h[m][d.wday] ||= y + * } + * } + * + * 2.upto(2) {|m| + * 0.upto(6) {|w| + * y = h[m][w] + * print " #{y}," + * } + * puts + * } + */ +static int compat_leap_month_table[7] = { +/* Sun Mon Tue Wed Thu Fri Sat */ + 2032, 2016, 2028, 2012, 2024, 2036, 2020, /* February */ +}; + +static int +calc_wday(int year, int month, int day) +{ + int a, y, m; + int wday; + + a = (14 - month) / 12; + y = year + 4800 - a; + m = month + 12 * a - 3; + wday = day + (153*m+2)/5 + 365*y + y/4 - y/100 + y/400 + 2; + wday = wday % 7; + return wday; +} + +static VALUE +guess_local_offset(struct vtm *vtm_utc, int *isdst_ret, const char **zone_ret) +{ + struct tm tm; + long gmtoff; + const char *zone; + time_t t; + struct vtm vtm2; + VALUE timev; + int y, wday; + + /* The first DST is at 1916 in German. + * So we don't need to care DST before that. */ + if (lt(vtm_utc->year, INT2FIX(1916))) { + VALUE off = INT2FIX(0); + int isdst = 0; + zone = "UTC"; + +# if defined(NEGATIVE_TIME_T) + /* 1901-12-13 20:45:52 UTC : The oldest time in 32-bit signed time_t. */ + if (localtime_with_gmtoff_zone((t = (time_t)0x80000000, &t), &tm, &gmtoff, &zone)) { + off = LONG2FIX(gmtoff); + isdst = tm.tm_isdst; + } + else +# endif + /* 1970-01-01 00:00:00 UTC : The Unix epoch - the oldest time in portable time_t. */ + if (localtime_with_gmtoff_zone((t = 0, &t), &tm, &gmtoff, &zone)) { + off = LONG2FIX(gmtoff); + isdst = tm.tm_isdst; + } + + if (isdst_ret) + *isdst_ret = isdst; + if (zone_ret) + *zone_ret = zone; + return off; + } + + /* It is difficult to guess future. */ + + vtm2 = *vtm_utc; + + /* guess using a year before 2038. */ + y = NUM2INT(mod(vtm_utc->year, INT2FIX(400))); + wday = calc_wday(y, vtm_utc->mon, 1); + if (vtm_utc->mon == 2 && leap_year_p(y)) + vtm2.year = INT2FIX(compat_leap_month_table[wday]); + else + vtm2.year = INT2FIX(compat_common_month_table[vtm_utc->mon-1][wday]); + + timev = w2v(rb_time_unmagnify(timegmw(&vtm2))); + t = NUM2TIMET(timev); + zone = "UTC"; + if (localtime_with_gmtoff_zone(&t, &tm, &gmtoff, &zone)) { + if (isdst_ret) + *isdst_ret = tm.tm_isdst; + if (zone_ret) + *zone_ret = zone; + return LONG2FIX(gmtoff); + } + + { + /* Use the current time offset as a last resort. */ + static time_t now = 0; + static long now_gmtoff = 0; + static const char *now_zone = "UTC"; + if (now == 0) { + now = time(NULL); + localtime_with_gmtoff_zone(&now, &tm, &now_gmtoff, &now_zone); + } + if (isdst_ret) + *isdst_ret = tm.tm_isdst; + if (zone_ret) + *zone_ret = now_zone; + return LONG2FIX(now_gmtoff); + } +} + +static VALUE +small_vtm_sub(struct vtm *vtm1, struct vtm *vtm2) +{ + int off; + + off = vtm1->sec - vtm2->sec; + off += (vtm1->min - vtm2->min) * 60; + off += (vtm1->hour - vtm2->hour) * 3600; + if (ne(vtm1->year, vtm2->year)) + off += lt(vtm1->year, vtm2->year) ? -24*3600 : 24*3600; + else if (vtm1->mon != vtm2->mon) + off += vtm1->mon < vtm2->mon ? -24*3600 : 24*3600; + else if (vtm1->mday != vtm2->mday) + off += vtm1->mday < vtm2->mday ? -24*3600 : 24*3600; + + return INT2FIX(off); +} + +static wideval_t +timelocalw(struct vtm *vtm) +{ + time_t t; + struct tm tm; + VALUE v; + wideval_t timew1, timew2; + struct vtm vtm1, vtm2; + int n; + + if (FIXNUM_P(vtm->year)) { + long l = FIX2LONG(vtm->year) - 1900; + if (l < INT_MIN || INT_MAX < l) + goto no_localtime; + tm.tm_year = (int)l; + } + else { + v = sub(vtm->year, INT2FIX(1900)); + if (lt(v, INT2NUM(INT_MIN)) || lt(INT2NUM(INT_MAX), v)) + goto no_localtime; + tm.tm_year = NUM2INT(v); + } + + tm.tm_mon = vtm->mon-1; + tm.tm_mday = vtm->mday; + tm.tm_hour = vtm->hour; + tm.tm_min = vtm->min; + tm.tm_sec = vtm->sec; + tm.tm_isdst = vtm->isdst; + + if (find_time_t(&tm, 0, &t)) + goto no_localtime; + return wadd(rb_time_magnify(TIMET2WV(t)), v2w(vtm->subsecx)); + + no_localtime: + timew1 = timegmw(vtm); + + if (!localtimew(timew1, &vtm1)) + rb_raise(rb_eArgError, "localtimew error"); + + n = vtmcmp(vtm, &vtm1); + if (n == 0) { + timew1 = wsub(timew1, rb_time_magnify(WINT2FIXWV(12*3600))); + if (!localtimew(timew1, &vtm1)) + rb_raise(rb_eArgError, "localtimew error"); + n = 1; + } + + if (n < 0) { + timew2 = timew1; + vtm2 = vtm1; + timew1 = wsub(timew1, rb_time_magnify(WINT2FIXWV(24*3600))); + if (!localtimew(timew1, &vtm1)) + rb_raise(rb_eArgError, "localtimew error"); + } + else { + timew2 = wadd(timew1, rb_time_magnify(WINT2FIXWV(24*3600))); + if (!localtimew(timew2, &vtm2)) + rb_raise(rb_eArgError, "localtimew error"); + } + timew1 = wadd(timew1, rb_time_magnify(v2w(small_vtm_sub(vtm, &vtm1)))); + timew2 = wadd(timew2, rb_time_magnify(v2w(small_vtm_sub(vtm, &vtm2)))); + + if (weq(timew1, timew2)) + return timew1; + + if (!localtimew(timew1, &vtm1)) + rb_raise(rb_eArgError, "localtimew error"); + if (vtm->hour != vtm1.hour || vtm->min != vtm1.min || vtm->sec != vtm1.sec) + return timew2; + + if (!localtimew(timew2, &vtm2)) + rb_raise(rb_eArgError, "localtimew error"); + if (vtm->hour != vtm2.hour || vtm->min != vtm2.min || vtm->sec != vtm2.sec) + return timew1; + + if (vtm->isdst) + return lt(vtm1.utc_offset, vtm2.utc_offset) ? timew2 : timew1; + else + return lt(vtm1.utc_offset, vtm2.utc_offset) ? timew1 : timew2; +} + +static struct tm * +localtime_with_gmtoff_zone(const time_t *t, struct tm *result, long *gmtoff, const char **zone) +{ + struct tm tm; + + if (LOCALTIME(t, tm)) { +#if defined(HAVE_STRUCT_TM_TM_GMTOFF) + *gmtoff = tm.tm_gmtoff; +#else + struct tm *u, *l; + long off; + struct tm tmbuf; + l = &tm; + u = GMTIME(t, tmbuf); + if (!u) + return NULL; + if (l->tm_year != u->tm_year) + off = l->tm_year < u->tm_year ? -1 : 1; + else if (l->tm_mon != u->tm_mon) + off = l->tm_mon < u->tm_mon ? -1 : 1; + else if (l->tm_mday != u->tm_mday) + off = l->tm_mday < u->tm_mday ? -1 : 1; + else + off = 0; + off = off * 24 + l->tm_hour - u->tm_hour; + off = off * 60 + l->tm_min - u->tm_min; + off = off * 60 + l->tm_sec - u->tm_sec; + *gmtoff = off; +#endif -VALUE rb_cTime; -VALUE rb_cNSDate; -static VALUE time_utc_offset _((VALUE, SEL)); + if (zone) { +#if defined(HAVE_TM_ZONE) + *zone = zone_str(tm.tm_zone); +#elif defined(HAVE_TZNAME) && defined(HAVE_DAYLIGHT) + /* this needs tzset or localtime, instead of localtime_r */ + *zone = zone_str(tzname[daylight && tm.tm_isdst]); +#else + { + char buf[64]; + strftime(buf, sizeof(buf), "%Z", &tm); + *zone = zone_str(buf); + } +#endif + } + + *result = tm; + return result; + } + return NULL; +} + +static int +timew_out_of_timet_range(wideval_t timew) +{ + VALUE timexv; +#if WIDEVALUE_IS_WIDER && SIZEOF_TIME_T < SIZEOF_INT64_T + if (FIXWV_P(timew)) { + wideint_t t = FIXWV2WINT(timew); + if (t < TIME_SCALE * (wideint_t)TIMET_MIN || + TIME_SCALE * (1 + (wideint_t)TIMET_MAX) <= t) + return 1; + return 0; + } +#endif + timexv = w2v(timew); + if (lt(timexv, mul(INT2FIX(TIME_SCALE), TIMET2NUM(TIMET_MIN))) || + le(mul(INT2FIX(TIME_SCALE), add(TIMET2NUM(TIMET_MAX), INT2FIX(1))), timexv)) + return 1; + return 0; +} + +static struct vtm * +localtimew(wideval_t timew, struct vtm *result) +{ + VALUE subsecx, offset; + const char *zone; + int isdst; + + if (!timew_out_of_timet_range(timew)) { + time_t t; + struct tm tm; + long gmtoff; + wideval_t timew2; + + split_second(timew, &timew2, &subsecx); + + t = WV2TIMET(timew2); + + if (localtime_with_gmtoff_zone(&t, &tm, &gmtoff, &zone)) { + result->year = LONG2NUM((long)tm.tm_year + 1900); + result->mon = tm.tm_mon + 1; + result->mday = tm.tm_mday; + result->hour = tm.tm_hour; + result->min = tm.tm_min; + result->sec = tm.tm_sec; + result->subsecx = subsecx; + result->wday = tm.tm_wday; + result->yday = tm.tm_yday+1; + result->isdst = tm.tm_isdst; + result->utc_offset = LONG2NUM(gmtoff); + result->zone = zone; + return result; + } + } + + if (!gmtimew(timew, result)) + return NULL; + + offset = guess_local_offset(result, &isdst, &zone); + + if (!gmtimew(wadd(timew, rb_time_magnify(v2w(offset))), result)) + return NULL; -static ID id_divmod, id_mul, id_submicro; + result->utc_offset = offset; + result->isdst = isdst; + result->zone = zone; + + return result; +} struct time_object { struct RBasic basic; - struct timespec ts; - struct tm tm; + wideval_t timew; /* time_t value * TIME_SCALE. possibly Rational. */ + struct vtm vtm; int gmt; int tm_got; }; -#define GetTimeval(obj, tobj) (tobj = (struct time_object *)obj) +#define GetTimeval(obj, tobj) \ + (tobj = (struct time_object *)obj) + +#define IsTimeval(obj) (CLASS_OF(obj) == rb_cTime) + +#define TIME_UTC_P(tobj) ((tobj)->gmt == 1) +#define TIME_SET_UTC(tobj) ((tobj)->gmt = 1) + +#define TIME_LOCALTIME_P(tobj) ((tobj)->gmt == 0) +#define TIME_SET_LOCALTIME(tobj) ((tobj)->gmt = 0) + +#define TIME_FIXOFF_P(tobj) ((tobj)->gmt == 2) +#define TIME_SET_FIXOFF(tobj, off) \ + ((tobj)->gmt = 2, \ + (tobj)->vtm.utc_offset = (off), \ + (tobj)->vtm.zone = NULL) + +#define TIME_COPY_GMT(tobj1, tobj2) ((tobj1)->gmt = (tobj2)->gmt) + +static VALUE time_get_tm(VALUE, struct time_object *); +#define MAKE_TM(time, tobj) \ + do { \ + if ((tobj)->tm_got == 0) { \ + time_get_tm((time), (tobj)); \ + } \ + } while (0) + +#if !WITH_OBJC +static void +time_mark(void *ptr) +{ + struct time_object *tobj = ptr; + if (!tobj) return; + if (!FIXWV_P(tobj->timew)) + rb_gc_mark(w2v(tobj->timew)); + rb_gc_mark(tobj->vtm.year); + rb_gc_mark(tobj->vtm.subsecx); + rb_gc_mark(tobj->vtm.utc_offset); +} + +static void +time_free(void *tobj) +{ + if (tobj) xfree(tobj); +} + +static size_t +time_memsize(const void *tobj) +{ + return tobj ? sizeof(struct time_object) : 0; +} + +static const rb_data_type_t time_data_type = { + "time", + time_mark, time_free, time_memsize, +}; +#endif static VALUE time_s_alloc(VALUE klass, SEL sel) @@ -43,8 +1871,8 @@ time_s_alloc(VALUE klass, SEL sel) tobj->basic.klass = klass; tobj->basic.flags = 0; tobj->tm_got=0; - tobj->ts.tv_sec = 0; - tobj->ts.tv_nsec = 0; + tobj->timew = WINT2FIXWV(0); + return (VALUE)tobj; } @@ -52,10 +1880,54 @@ static void time_modify(VALUE time) { rb_check_frozen(time); - if (!OBJ_TAINTED(time) && rb_safe_level() >= 4) + if (!OBJ_UNTRUSTED(time) && rb_safe_level() >= 4) rb_raise(rb_eSecurityError, "Insecure: can't modify Time"); } +static wideval_t +timespec2timew(struct timespec *ts) +{ + wideval_t timew; + + timew = rb_time_magnify(TIMET2WV(ts->tv_sec)); + if (ts->tv_nsec) + timew = wadd(timew, wmulquoll(WINT2WV(ts->tv_nsec), TIME_SCALE, 1000000000)); + return timew; +} + +static struct timespec +timew2timespec(wideval_t timew) +{ + VALUE subsecx; + struct timespec ts; + wideval_t timew2; + + if (timew_out_of_timet_range(timew)) + rb_raise(rb_eArgError, "time out of system range"); + split_second(timew, &timew2, &subsecx); + ts.tv_sec = WV2TIMET(timew2); + ts.tv_nsec = NUM2LONG(mulquo(subsecx, INT2FIX(1000000000), INT2FIX(TIME_SCALE))); + return ts; +} + +static struct timespec * +timew2timespec_exact(wideval_t timew, struct timespec *ts) +{ + VALUE subsecx; + wideval_t timew2; + VALUE nsecv; + + if (timew_out_of_timet_range(timew)) + return NULL; + split_second(timew, &timew2, &subsecx); + ts->tv_sec = WV2TIMET(timew2); + nsecv = mulquo(subsecx, INT2FIX(1000000000), INT2FIX(TIME_SCALE)); + if (!FIXNUM_P(nsecv)) + return NULL; + ts->tv_nsec = NUM2LONG(nsecv); + return ts; +} + /* * Document-method: now * @@ -63,53 +1935,323 @@ time_modify(VALUE time) * initialized to the current system time. */ -/* - * call-seq: - * Time.new -> time - * - * Returns a Time object initialized to the current system - * time. Note: The object created will be created using the - * resolution available on your system clock, and so may include - * fractional seconds. - * - * a = Time.new #=> 2007-11-19 07:50:02 -0600 - * b = Time.new #=> 2007-11-19 07:50:02 -0600 - * a == b #=> false - * "%.6f" % a.to_f #=> "1195480202.282373" - * "%.6f" % b.to_f #=> "1195480202.283415" - * - */ - static VALUE -time_init(VALUE time, SEL sel) +time_init_0(VALUE time) { struct time_object *tobj; + struct timespec ts; time_modify(time); GetTimeval(time, tobj); tobj->tm_got=0; - tobj->ts.tv_sec = 0; - tobj->ts.tv_nsec = 0; + tobj->timew = WINT2FIXWV(0); #ifdef HAVE_CLOCK_GETTIME - if (clock_gettime(CLOCK_REALTIME, &tobj->ts) == -1) { + if (clock_gettime(CLOCK_REALTIME, &ts) == -1) { rb_sys_fail("clock_gettime"); } #else { - struct timeval tv; + struct timeval tv; if (gettimeofday(&tv, 0) < 0) { rb_sys_fail("gettimeofday"); } - tobj->ts.tv_sec = tv.tv_sec; - tobj->ts.tv_nsec = tv.tv_usec * 1000; + ts.tv_sec = tv.tv_sec; + ts.tv_nsec = tv.tv_usec * 1000; } #endif + tobj->timew = timespec2timew(&ts); return time; } -#define NDIV(x,y) (-(-((x)+1)/(y))-1) -#define NMOD(x,y) ((y)-(-((x)+1)%(y))-1) +static VALUE +time_set_utc_offset(VALUE time, VALUE off) +{ + struct time_object *tobj; + off = num_exact(off); + + time_modify(time); + GetTimeval(time, tobj); + + tobj->tm_got = 0; + TIME_SET_FIXOFF(tobj, off); + + return time; +} + +static void +vtm_add_offset(struct vtm *vtm, VALUE off) +{ + int sign; + VALUE subsec, v; + int sec, min, hour; + int day; + + vtm->utc_offset = sub(vtm->utc_offset, off); + + if (lt(off, INT2FIX(0))) { + sign = -1; + off = neg(off); + } + else { + sign = 1; + } + divmodv(off, INT2FIX(1), &off, &subsec); + divmodv(off, INT2FIX(60), &off, &v); + sec = NUM2INT(v); + divmodv(off, INT2FIX(60), &off, &v); + min = NUM2INT(v); + divmodv(off, INT2FIX(24), &off, &v); + hour = NUM2INT(v); + + if (sign < 0) { + subsec = neg(subsec); + sec = -sec; + min = -min; + hour = -hour; + } + + day = 0; + + if (!rb_equal(subsec, INT2FIX(0))) { + vtm->subsecx = add(vtm->subsecx, w2v(rb_time_magnify(v2w(subsec)))); + if (lt(vtm->subsecx, INT2FIX(0))) { + vtm->subsecx = add(vtm->subsecx, INT2FIX(TIME_SCALE)); + sec -= 1; + } + if (le(INT2FIX(TIME_SCALE), vtm->subsecx)) { + vtm->subsecx = sub(vtm->subsecx, INT2FIX(TIME_SCALE)); + sec += 1; + } + goto not_zero_sec; + } + if (sec) { + not_zero_sec: + /* If sec + subsec == 0, don't change vtm->sec. + * It may be 60 which is a leap second. */ + vtm->sec += sec; + if (vtm->sec < 0) { + vtm->sec += 60; + min -= 1; + } + if (60 <= vtm->sec) { + vtm->sec -= 60; + min += 1; + } + } + if (min) { + vtm->min += min; + if (vtm->min < 0) { + vtm->min += 60; + hour -= 1; + } + if (60 <= vtm->min) { + vtm->min -= 60; + hour += 1; + } + } + if (hour) { + vtm->hour += hour; + if (vtm->hour < 0) { + vtm->hour += 24; + day = -1; + } + if (24 <= vtm->hour) { + vtm->hour -= 24; + day = 1; + } + } + + if (day) { + if (day < 0) { + if (vtm->mon == 1 && vtm->mday == 1) { + vtm->mday = 31; + vtm->mon = 12; /* December */ + vtm->year = sub(vtm->year, INT2FIX(1)); + vtm->yday = leap_year_v_p(vtm->year) ? 365 : 364; + } + else if (vtm->mday == 1) { + const int *days_in_month = leap_year_v_p(vtm->year) ? + leap_year_days_in_month : + common_year_days_in_month; + vtm->mon--; + vtm->mday = days_in_month[vtm->mon-1]; + vtm->yday--; + } + else { + vtm->mday--; + vtm->yday--; + } + vtm->wday = (vtm->wday + 6) % 7; + } + else { + int leap = leap_year_v_p(vtm->year); + if (vtm->mon == 12 && vtm->mday == 31) { + vtm->year = add(vtm->year, INT2FIX(1)); + vtm->mon = 1; /* January */ + vtm->mday = 1; + vtm->yday = 1; + } + else if (vtm->mday == (leap ? leap_year_days_in_month : + common_year_days_in_month)[vtm->mon-1]) { + vtm->mon++; + vtm->mday = 1; + vtm->yday++; + } + else { + vtm->mday++; + vtm->yday++; + } + vtm->wday = (vtm->wday + 1) % 7; + } + } +} + +static VALUE +utc_offset_arg(VALUE arg) +{ + VALUE tmp; + if (!NIL_P(tmp = rb_check_string_type(arg))) { + int n; + char *s = (char*)RSTRING_PTR(tmp); + if (!rb_enc_str_asciicompat_p(tmp) || + RSTRING_LEN(tmp) != 6 || + (s[0] != '+' && s[0] != '-') || + !ISDIGIT(s[1]) || + !ISDIGIT(s[2]) || + s[3] != ':' || + !ISDIGIT(s[4]) || + !ISDIGIT(s[5])) + rb_raise(rb_eArgError, "\"+HH:MM\" or \"-HH:MM\" expected for utc_offset"); + n = (s[1] * 10 + s[2] - '0' * 11) * 3600; + n += (s[4] * 10 + s[5] - '0' * 11) * 60; + if (s[0] == '-') + n = -n; + return INT2FIX(n); + } + else { + return num_exact(arg); + } +} + +static VALUE +time_init_1(int argc, VALUE *argv, VALUE time) +{ + struct vtm vtm; + VALUE v[7]; + struct time_object *tobj; + + vtm.wday = -1; + vtm.yday = 0; + vtm.zone = ""; + + /* year mon mday hour min sec off */ + rb_scan_args(argc, argv, "16", &v[0],&v[1],&v[2],&v[3],&v[4],&v[5],&v[6]); + + vtm.year = obj2vint(v[0]); + + vtm.mon = NIL_P(v[1]) ? 1 : month_arg(v[1]); + + vtm.mday = NIL_P(v[2]) ? 1 : obj2int(v[2]); + + vtm.hour = NIL_P(v[3]) ? 0 : obj2int(v[3]); + + vtm.min = NIL_P(v[4]) ? 0 : obj2int(v[4]); + + vtm.sec = 0; + vtm.subsecx = INT2FIX(0); + if (!NIL_P(v[5])) { + VALUE sec = num_exact(v[5]); + VALUE subsec; + divmodv(sec, INT2FIX(1), &sec, &subsec); + vtm.sec = NUM2INT(sec); + vtm.subsecx = w2v(rb_time_magnify(v2w(subsec))); + } + + vtm.isdst = -1; + vtm.utc_offset = Qnil; + if (!NIL_P(v[6])) { + VALUE arg = v[6]; + if (arg == ID2SYM(rb_intern("dst"))) + vtm.isdst = 1; + else if (arg == ID2SYM(rb_intern("std"))) + vtm.isdst = 0; + else + vtm.utc_offset = utc_offset_arg(arg); + } + + validate_vtm(&vtm); + + time_modify(time); + GetTimeval(time, tobj); + tobj->tm_got=0; + tobj->timew = WINT2FIXWV(0); + + if (!NIL_P(vtm.utc_offset)) { + VALUE off = vtm.utc_offset; + vtm_add_offset(&vtm, neg(off)); + vtm.utc_offset = Qnil; + tobj->timew = timegmw(&vtm); + return time_set_utc_offset(time, off); + } + else { + tobj->timew = timelocalw(&vtm); + return time_localtime(time); + } +} + + +/* + * call-seq: + * Time.new -> time + * Time.new(year, month=nil, day=nil, hour=nil, min=nil, sec=nil, utc_offset=nil) -> time + * + * Returns a Time object. + * + * It is initialized to the current system time if no argument. + * Note: The object created will be created using the + * resolution available on your system clock, and so may include + * fractional seconds. + * + * If one or more arguments specified, the time is initialized + * to the specified time. + * _sec_ may have fraction if it is a rational. + * + * _utc_offset_ is the offset from UTC. + * It is a string such as "+09:00" or a number of seconds such as 32400. + * + * a = Time.new #=> 2007-11-19 07:50:02 -0600 + * b = Time.new #=> 2007-11-19 07:50:02 -0600 + * a == b #=> false + * "%.6f" % a.to_f #=> "1195480202.282373" + * "%.6f" % b.to_f #=> "1195480202.283415" + * + * Time.new(2008,6,21, 13,30,0, "+09:00") #=> 2008-06-21 13:30:00 +0900 + * + * # A trip for RubyConf 2007 + * t1 = Time.new(2007,11,1,15,25,0, "+09:00") # JST (Narita) + * t2 = Time.new(2007,11,1,12, 5,0, "-05:00") # CDT (Minneapolis) + * t3 = Time.new(2007,11,1,13,25,0, "-05:00") # CDT (Minneapolis) + * t4 = Time.new(2007,11,1,16,53,0, "-04:00") # EDT (Charlotte) + * t5 = Time.new(2007,11,5, 9,24,0, "-05:00") # EST (Charlotte) + * t6 = Time.new(2007,11,5,11,21,0, "-05:00") # EST (Detroit) + * t7 = Time.new(2007,11,5,13,45,0, "-05:00") # EST (Detroit) + * t8 = Time.new(2007,11,6,17,10,0, "+09:00") # JST (Narita) + * p((t2-t1)/3600.0) #=> 10.666666666666666 + * p((t4-t3)/3600.0) #=> 2.466666666666667 + * p((t6-t5)/3600.0) #=> 1.95 + * p((t8-t7)/3600.0) #=> 13.416666666666666 + * + */ + +static VALUE +time_init(VALUE time, SEL sel, int argc, VALUE *argv) +{ + if (argc == 0) + return time_init_0(time); + else + return time_init_1(argc, argv, time); +} static void time_overflow_p(time_t *secp, long *nsecp) @@ -141,16 +2283,24 @@ time_overflow_p(time_t *secp, long *nsecp) *nsecp = nsec; } +static wideval_t +nsec2timew(time_t sec, long nsec) +{ + struct timespec ts; + time_overflow_p(&sec, &nsec); + ts.tv_sec = sec; + ts.tv_nsec = nsec; + return timespec2timew(&ts); +} + static VALUE -time_new_internal(VALUE klass, time_t sec, long nsec) +time_new_timew(VALUE klass, wideval_t timew) { VALUE time = time_s_alloc(klass, 0); struct time_object *tobj; GetTimeval(time, tobj); - time_overflow_p(&sec, &nsec); - tobj->ts.tv_sec = sec; - tobj->ts.tv_nsec = nsec; + tobj->timew = timew; return time; } @@ -158,13 +2308,28 @@ time_new_internal(VALUE klass, time_t sec, long nsec) VALUE rb_time_new(time_t sec, long usec) { - return time_new_internal(rb_cTime, sec, usec * 1000); + return time_new_timew(rb_cTime, nsec2timew(sec, usec * 1000)); } VALUE rb_time_nano_new(time_t sec, long nsec) { - return time_new_internal(rb_cTime, sec, nsec); + return time_new_timew(rb_cTime, nsec2timew(sec, nsec)); +} + +VALUE +rb_time_num_new(VALUE timev, VALUE off) +{ + VALUE time = time_new_timew(rb_cTime, rb_time_magnify(v2w(timev))); + + if (!NIL_P(off)) { + off = utc_offset_arg(off); + validate_utc_offset(off); + time_set_utc_offset(time, off); + return time; + } + + return time; } static struct timespec @@ -180,7 +2345,7 @@ time_timespec(VALUE num, int interval) switch (TYPE(num)) { case T_FIXNUM: - t.tv_sec = FIX2LONG(num); + t.tv_sec = NUM2TIMET(num); if (interval && t.tv_sec < 0) rb_raise(rb_eArgError, "%s must be positive", tstr); t.tv_nsec = 0; @@ -193,37 +2358,43 @@ time_timespec(VALUE num, int interval) double f, d; d = modf(RFLOAT_VALUE(num), &f); + if (d >= 0) { + t.tv_nsec = (int)(d*1e9+0.5); + } + else if ((t.tv_nsec = (int)(-d*1e9+0.5)) > 0) { + t.tv_nsec = 1000000000 - t.tv_nsec; + f -= 1; + } t.tv_sec = (time_t)f; if (f != t.tv_sec) { rb_raise(rb_eRangeError, "%f out of Time range", RFLOAT_VALUE(num)); } - t.tv_nsec = (long)(d*1e9+0.5); } break; case T_BIGNUM: - t.tv_sec = NUM2LONG(num); + t.tv_sec = NUM2TIMET(num); if (interval && t.tv_sec < 0) rb_raise(rb_eArgError, "%s must be positive", tstr); t.tv_nsec = 0; break; default: - if (rb_respond_to(num, id_divmod)) { - ary = rb_check_array_type(rb_funcall(num, id_divmod, 1, INT2FIX(1))); - if (NIL_P(ary)) { - goto typeerror; - } + i = INT2FIX(1); + ary = Qundef; + if (rb_vm_respond_to(num, sel_divmod, true)) { + ary = rb_vm_call(num, sel_divmod, 0, NULL); + } + if (ary != Qundef && !NIL_P(ary = rb_check_array_type(ary))) { i = rb_ary_entry(ary, 0); f = rb_ary_entry(ary, 1); - t.tv_sec = NUM2LONG(i); + t.tv_sec = NUM2TIMET(i); if (interval && t.tv_sec < 0) rb_raise(rb_eArgError, "%s must be positive", tstr); f = rb_funcall(f, id_mul, 1, INT2FIX(1000000000)); t.tv_nsec = NUM2LONG(f); } else { -typeerror: rb_raise(rb_eTypeError, "can't convert %s into %s", rb_obj_classname(num), tstr); } @@ -239,8 +2410,8 @@ time_timeval(VALUE num, int interval) struct timeval tv; ts = time_timespec(num, interval); - tv.tv_sec = ts.tv_sec; - tv.tv_usec = ts.tv_nsec / 1000; + tv.tv_sec = (TYPEOF_TIMEVAL_TV_SEC)ts.tv_sec; + tv.tv_usec = (TYPEOF_TIMEVAL_TV_USEC)(ts.tv_nsec / 1000); return tv; } @@ -248,7 +2419,7 @@ time_timeval(VALUE num, int interval) struct timeval rb_time_interval(VALUE num) { - return time_timeval(num, Qtrue); + return time_timeval(num, TRUE); } struct timeval @@ -256,14 +2427,16 @@ rb_time_timeval(VALUE time) { struct time_object *tobj; struct timeval t; + struct timespec ts; - if (CLASS_OF(time) == rb_cTime) { + if (IsTimeval(time)) { GetTimeval(time, tobj); - t.tv_sec = tobj->ts.tv_sec; - t.tv_usec = tobj->ts.tv_nsec / 1000; + ts = timew2timespec(tobj->timew); + t.tv_sec = (TYPEOF_TIMEVAL_TV_SEC)ts.tv_sec; + t.tv_usec = (TYPEOF_TIMEVAL_TV_USEC)(ts.tv_nsec / 1000); return t; } - return time_timeval(time, Qfalse); + return time_timeval(time, FALSE); } struct timespec @@ -272,27 +2445,44 @@ rb_time_timespec(VALUE time) struct time_object *tobj; struct timespec t; - if (CLASS_OF(time) == rb_cTime) { + if (IsTimeval(time)) { GetTimeval(time, tobj); - t = tobj->ts; + t = timew2timespec(tobj->timew); return t; } - return time_timespec(time, Qfalse); + return time_timespec(time, FALSE); +} + +#if !WITH_OBJC +/* + * call-seq: + * Time.now -> time + * + * Creates a new time object for the current time. + * + * Time.now #=> 2009-06-24 12:39:54 +0900 + */ + +static VALUE +time_s_now(VALUE klass) +{ + return rb_class_new_instance(0, NULL, klass); } +#endif /* * call-seq: - * Time.at(time) => time - * Time.at(seconds_with_frac) => time - * Time.at(seconds, microseconds_with_frac) => time - * + * Time.at(time) -> time + * Time.at(seconds_with_frac) -> time + * Time.at(seconds, microseconds_with_frac) -> time + * * Creates a new time object with the value given by time, * the given number of seconds_with_frac, or * seconds and microseconds_with_frac from the Epoch. * seconds_with_frac and microseconds_with_frac * can be Integer, Float, Rational, or other Numeric. * non-portable feature allows the offset to be negative on some systems. - * + * * Time.at(0) #=> 1969-12-31 18:00:00 -0600 * Time.at(Time.at(0)) #=> 1969-12-31 18:00:00 -0600 * Time.at(946702800) #=> 1999-12-31 23:00:00 -0600 @@ -304,24 +2494,27 @@ rb_time_timespec(VALUE time) static VALUE time_s_at(VALUE klass, SEL sel, int argc, VALUE *argv) { - struct timespec ts; VALUE time, t; + wideval_t timew; if (rb_scan_args(argc, argv, "11", &time, &t) == 2) { - ts.tv_sec = NUM2LONG(time); - ts.tv_nsec = NUM2LONG(rb_funcall(t, id_mul, 1, INT2FIX(1000))); + time = num_exact(time); + t = num_exact(t); + timew = wadd(rb_time_magnify(v2w(time)), wmulquoll(v2w(t), TIME_SCALE, 1000000)); + t = time_new_timew(klass, timew); } - else { - ts = rb_time_timespec(time); - } - t = time_new_internal(klass, ts.tv_sec, ts.tv_nsec); - if (CLASS_OF(time) == rb_cTime) { + else if (IsTimeval(time)) { struct time_object *tobj, *tobj2; - - GetTimeval(time, tobj); + GetTimeval(time, tobj); + t = time_new_timew(klass, tobj->timew); GetTimeval(t, tobj2); - tobj2->gmt = tobj->gmt; + TIME_COPY_GMT(tobj2, tobj); } + else { + timew = rb_time_magnify(v2w(num_exact(time))); + t = time_new_timew(klass, timew); + } + return t; } @@ -330,52 +2523,123 @@ static const char months[][4] = { "jul", "aug", "sep", "oct", "nov", "dec", }; -static long -obj2long(VALUE obj) +static int +obj2int(VALUE obj) +{ + if (TYPE(obj) == T_STRING) { + obj = rb_str_to_inum(obj, 10, FALSE); + } + + return NUM2INT(obj); +} + +static VALUE +obj2vint(VALUE obj) { if (TYPE(obj) == T_STRING) { - obj = rb_str_to_inum(obj, 10, Qfalse); + obj = rb_str_to_inum(obj, 10, FALSE); + } + else { + obj = rb_to_int(obj); } - return NUM2LONG(obj); + return obj; } -static long -obj2nsec(VALUE obj, long *nsec) +static int +obj2subsecx(VALUE obj, VALUE *subsecx) { - struct timespec ts; + VALUE subsec; if (TYPE(obj) == T_STRING) { - obj = rb_str_to_inum(obj, 10, Qfalse); - *nsec = 0; - return NUM2LONG(obj); + obj = rb_str_to_inum(obj, 10, FALSE); + *subsecx = INT2FIX(0); + return NUM2INT(obj); } - ts = time_timespec(obj, 1); - *nsec = ts.tv_nsec; - return ts.tv_sec; + divmodv(num_exact(obj), INT2FIX(1), &obj, &subsec); + *subsecx = w2v(rb_time_magnify(v2w(subsec))); + return NUM2INT(obj); } static long -obj2long1000(VALUE obj) +usec2subsecx(VALUE obj) { if (TYPE(obj) == T_STRING) { - obj = rb_str_to_inum(obj, 10, Qfalse); - return NUM2LONG(obj) * 1000; + obj = rb_str_to_inum(obj, 10, FALSE); + } + + return mulquo(num_exact(obj), INT2FIX(TIME_SCALE), INT2FIX(1000000)); +} + +static int +month_arg(VALUE arg) +{ + int i, mon; + + VALUE s = rb_check_string_type(arg); + if (!NIL_P(s)) { + mon = 0; + for (i=0; i<12; i++) { + if (RSTRING_LEN(s) == 3 && + STRCASECMP(months[i], RSTRING_PTR(s)) == 0) { + mon = i+1; + break; + } + } + if (mon == 0) { + char c = RSTRING_PTR(s)[0]; + + if ('0' <= c && c <= '9') { + mon = obj2int(s); + } + } } + else { + mon = obj2int(arg); + } + return mon; +} + +static void +validate_utc_offset(VALUE utc_offset) +{ + if (le(utc_offset, INT2FIX(-86400)) || ge(utc_offset, INT2FIX(86400))) + rb_raise(rb_eArgError, "utc_offset out of range"); +} - return NUM2LONG(rb_funcall(obj, id_mul, 1, INT2FIX(1000))); +static void +validate_vtm(struct vtm *vtm) +{ + if ( vtm->mon < 1 || vtm->mon > 12 + || vtm->mday < 1 || vtm->mday > 31 + || vtm->hour < 0 || vtm->hour > 24 + || (vtm->hour == 24 && (vtm->min > 0 || vtm->sec > 0)) + || vtm->min < 0 || vtm->min > 59 + || vtm->sec < 0 || vtm->sec > 60 + || lt(vtm->subsecx, INT2FIX(0)) || ge(vtm->subsecx, INT2FIX(TIME_SCALE)) + || (!NIL_P(vtm->utc_offset) && (validate_utc_offset(vtm->utc_offset), 0))) + rb_raise(rb_eArgError, "argument out of range"); } static void -time_arg(int argc, VALUE *argv, struct tm *tm, long *nsec) +time_arg(int argc, VALUE *argv, struct vtm *vtm) { VALUE v[8]; - int i; - long year; - MEMZERO(tm, struct tm, 1); - *nsec = 0; + vtm->year = INT2FIX(0); + vtm->mon = 0; + vtm->mday = 0; + vtm->hour = 0; + vtm->min = 0; + vtm->sec = 0; + vtm->subsecx = INT2FIX(0); + vtm->utc_offset = Qnil; + vtm->wday = 0; + vtm->yday = 0; + vtm->isdst = 0; + vtm->zone = ""; + if (argc == 10) { v[0] = argv[5]; v[1] = argv[4]; @@ -384,135 +2648,57 @@ time_arg(int argc, VALUE *argv, struct tm *tm, long *nsec) v[4] = argv[1]; v[5] = argv[0]; v[6] = Qnil; - tm->tm_isdst = RTEST(argv[8]) ? 1 : 0; + vtm->isdst = RTEST(argv[8]) ? 1 : 0; } else { rb_scan_args(argc, argv, "17", &v[0],&v[1],&v[2],&v[3],&v[4],&v[5],&v[6],&v[7]); /* v[6] may be usec or zone (parsedate) */ /* v[7] is wday (parsedate; ignored) */ - tm->tm_wday = -1; - tm->tm_isdst = -1; - } - - year = obj2long(v[0]); - - if (0 <= year && year < 39) { - rb_warning("2 digits year is used: %ld", year); - year += 100; - } - else if (69 <= year && year < 139) { - rb_warning("2 or 3 digits year is used: %ld", year); - } - else { - year -= 1900; + vtm->wday = -1; + vtm->isdst = -1; } - tm->tm_year = year; + vtm->year = obj2vint(v[0]); if (NIL_P(v[1])) { - tm->tm_mon = 0; + vtm->mon = 1; } else { - VALUE s = rb_check_string_type(v[1]); - if (!NIL_P(s)) { - tm->tm_mon = -1; - for (i=0; i<12; i++) { - if (RSTRING_LEN(s) == 3 && - STRCASECMP(months[i], RSTRING_PTR(s)) == 0) { - tm->tm_mon = i; - break; - } - } - if (tm->tm_mon == -1) { - char c = RSTRING_PTR(s)[0]; - - if ('0' <= c && c <= '9') { - tm->tm_mon = obj2long(s)-1; - } - } - } - else { - tm->tm_mon = obj2long(v[1])-1; - } + vtm->mon = month_arg(v[1]); } + if (NIL_P(v[2])) { - tm->tm_mday = 1; + vtm->mday = 1; } else { - tm->tm_mday = obj2long(v[2]); + vtm->mday = obj2int(v[2]); } - tm->tm_hour = NIL_P(v[3])?0:obj2long(v[3]); - tm->tm_min = NIL_P(v[4])?0:obj2long(v[4]); + + vtm->hour = NIL_P(v[3])?0:obj2int(v[3]); + + vtm->min = NIL_P(v[4])?0:obj2int(v[4]); + if (!NIL_P(v[6]) && argc == 7) { - tm->tm_sec = NIL_P(v[5])?0:obj2long(v[5]); - *nsec = obj2long1000(v[6]); + vtm->sec = NIL_P(v[5])?0:obj2int(v[5]); + vtm->subsecx = usec2subsecx(v[6]); } else { /* when argc == 8, v[6] is timezone, but ignored */ - tm->tm_sec = NIL_P(v[5])?0:obj2nsec(v[5], nsec); + vtm->sec = NIL_P(v[5])?0:obj2subsecx(v[5], &vtm->subsecx); } - /* value validation */ - if ( - tm->tm_year != year || -#ifndef NEGATIVE_TIME_T - tm->tm_year < 69 || -#endif - tm->tm_mon < 0 || tm->tm_mon > 11 - || tm->tm_mday < 1 || tm->tm_mday > 31 - || tm->tm_hour < 0 || tm->tm_hour > 24 - || (tm->tm_hour == 24 && (tm->tm_min > 0 || tm->tm_sec > 0)) - || tm->tm_min < 0 || tm->tm_min > 59 - || tm->tm_sec < 0 || tm->tm_sec > 60) - rb_raise(rb_eArgError, "argument out of range"); + validate_vtm(vtm); } -static VALUE time_gmtime(VALUE, SEL); -static VALUE time_localtime(VALUE, SEL); -static VALUE time_get_tm(VALUE, int); - static int leap_year_p(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(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)) @@ -534,59 +2720,117 @@ timegm_noleapsecond(struct tm *tm) DIV(tm_year+299,400))*86400; } -static int -tmcmp(struct tm *a, struct tm *b) +#if 0 +#define DEBUG_FIND_TIME_NUMGUESS +#define DEBUG_GUESSRANGE +#endif + +#ifdef DEBUG_GUESSRANGE +#define DEBUG_REPORT_GUESSRANGE fprintf(stderr, "find time guess range: %ld - %ld : %lu\n", guess_lo, guess_hi, (unsigned_time_t)(guess_hi-guess_lo)) +#else +#define DEBUG_REPORT_GUESSRANGE +#endif + +#ifdef DEBUG_FIND_TIME_NUMGUESS +#define DEBUG_FIND_TIME_NUMGUESS_INC find_time_numguess++, +static unsigned long long find_time_numguess; + +static VALUE find_time_numguess_getter(void) { - if (a->tm_year != b->tm_year) - return a->tm_year < b->tm_year ? -1 : 1; - else if (a->tm_mon != b->tm_mon) - return a->tm_mon < b->tm_mon ? -1 : 1; - else if (a->tm_mday != b->tm_mday) - return a->tm_mday < b->tm_mday ? -1 : 1; - else if (a->tm_hour != b->tm_hour) - return a->tm_hour < b->tm_hour ? -1 : 1; - else if (a->tm_min != b->tm_min) - return a->tm_min < b->tm_min ? -1 : 1; - else if (a->tm_sec != b->tm_sec) - return a->tm_sec < b->tm_sec ? -1 : 1; - else - return 0; + return ULL2NUM(find_time_numguess); } - -#if SIZEOF_TIME_T == SIZEOF_LONG -typedef unsigned long unsigned_time_t; -#elif SIZEOF_TIME_T == SIZEOF_INT -typedef unsigned int unsigned_time_t; -#elif SIZEOF_TIME_T == SIZEOF_LONG_LONG -typedef unsigned LONG_LONG unsigned_time_t; #else -# error cannot find integer type which size is same as time_t. +#define DEBUG_FIND_TIME_NUMGUESS_INC #endif -static time_t -search_time_t(struct tm *tptr, int utc_p) +static const char * +find_time_t(struct tm *tptr, int utc_p, time_t *tp) { - time_t guess, guess_lo, guess_hi; - struct tm *tm, tm_lo, tm_hi; - int d, have_guess; + time_t guess, guess0, guess_lo, guess_hi; + struct tm *tm, tm0, tm_lo, tm_hi; + int d; int find_dst; + struct tm result; + int status; + int tptr_tm_yday; + +#define GUESS(p) (DEBUG_FIND_TIME_NUMGUESS_INC (utc_p ? gmtime_with_leapsecond((p), &result) : LOCALTIME((p), result))) + + guess_lo = TIMET_MIN; + guess_hi = TIMET_MAX; find_dst = 0 < tptr->tm_isdst; -#ifdef NEGATIVE_TIME_T - guess_lo = (time_t)~((unsigned_time_t)~(time_t)0 >> 1); -#else - guess_lo = 0; +#if defined(HAVE_MKTIME) + tm0 = *tptr; + if (!utc_p && (guess = mktime(&tm0)) != -1) { + tm = GUESS(&guess); + if (tm && tmcmp(tptr, tm) == 0) { + goto found; + } + } #endif - guess_hi = ((time_t)-1) < ((time_t)0) ? - (time_t)((unsigned_time_t)~(time_t)0 >> 1) : - ~(time_t)0; - guess = timegm_noleapsecond(tptr); - tm = (utc_p ? gmtime : localtime)(&guess); + tm0 = *tptr; + if (tm0.tm_mon < 0) { + tm0.tm_mon = 0; + tm0.tm_mday = 1; + tm0.tm_hour = 0; + tm0.tm_min = 0; + tm0.tm_sec = 0; + } + else if (11 < tm0.tm_mon) { + tm0.tm_mon = 11; + tm0.tm_mday = 31; + tm0.tm_hour = 23; + tm0.tm_min = 59; + tm0.tm_sec = 60; + } + else if (tm0.tm_mday < 1) { + tm0.tm_mday = 1; + tm0.tm_hour = 0; + tm0.tm_min = 0; + tm0.tm_sec = 0; + } + else if ((d = (leap_year_p(1900 + tm0.tm_year) ? + leap_year_days_in_month : + common_year_days_in_month)[tm0.tm_mon]) < tm0.tm_mday) { + tm0.tm_mday = d; + tm0.tm_hour = 23; + tm0.tm_min = 59; + tm0.tm_sec = 60; + } + else if (tm0.tm_hour < 0) { + tm0.tm_hour = 0; + tm0.tm_min = 0; + tm0.tm_sec = 0; + } + else if (23 < tm0.tm_hour) { + tm0.tm_hour = 23; + tm0.tm_min = 59; + tm0.tm_sec = 60; + } + else if (tm0.tm_min < 0) { + tm0.tm_min = 0; + tm0.tm_sec = 0; + } + else if (59 < tm0.tm_min) { + tm0.tm_min = 59; + tm0.tm_sec = 60; + } + else if (tm0.tm_sec < 0) { + tm0.tm_sec = 0; + } + else if (60 < tm0.tm_sec) { + tm0.tm_sec = 60; + } + + DEBUG_REPORT_GUESSRANGE; + guess0 = guess = timegm_noleapsecond(&tm0); + tm = GUESS(&guess); if (tm) { d = tmcmp(tptr, tm); - if (d == 0) return guess; + if (d == 0) { goto found; } if (d < 0) { guess_hi = guess; guess -= 24 * 60 * 60; @@ -595,170 +2839,111 @@ search_time_t(struct tm *tptr, int utc_p) guess_lo = guess; guess += 24 * 60 * 60; } - if (guess_lo < guess && guess < guess_hi && - (tm = (utc_p ? gmtime : localtime)(&guess)) != NULL) { + DEBUG_REPORT_GUESSRANGE; + if (guess_lo < guess && guess < guess_hi && (tm = GUESS(&guess)) != NULL) { d = tmcmp(tptr, tm); - if (d == 0) return guess; + if (d == 0) { goto found; } if (d < 0) guess_hi = guess; else guess_lo = guess; + DEBUG_REPORT_GUESSRANGE; } } - tm = (utc_p ? gmtime : localtime)(&guess_lo); + tm = GUESS(&guess_lo); if (!tm) goto error; d = tmcmp(tptr, tm); if (d < 0) goto out_of_range; - if (d == 0) return guess_lo; + if (d == 0) { guess = guess_lo; goto found; } tm_lo = *tm; - tm = (utc_p ? gmtime : localtime)(&guess_hi); + tm = GUESS(&guess_hi); if (!tm) goto error; d = tmcmp(tptr, tm); if (d > 0) goto out_of_range; - if (d == 0) return guess_hi; + if (d == 0) { guess = guess_hi; goto found; } tm_hi = *tm; - have_guess = 0; + DEBUG_REPORT_GUESSRANGE; - while (guess_lo + 1 < guess_hi) { - /* there is a gap between guess_lo and guess_hi. */ - unsigned long range = 0; - if (!have_guess) { - int a, b; - /* - Try precious guess by a linear interpolation at first. - `a' and `b' is a coefficient of guess_lo and guess_hi as: - - guess = (guess_lo * a + guess_hi * b) / (a + b) - - However this causes overflow in most cases, following assignment - is used instead: - - guess = guess_lo / d * a + (guess_lo % d) * a / d - + guess_hi / d * b + (guess_hi % d) * b / d - where d = a + b - - To avoid overflow in this assignment, `d' is restricted to less than - sqrt(2**31). By this restriction and other reasons, the guess is - not accurate and some error is expected. `range' approximates - the maximum error. - - When these parameters are not suitable, i.e. guess is not within - guess_lo and guess_hi, simple guess by binary search is used. - */ - range = 366 * 24 * 60 * 60; - a = (tm_hi.tm_year - tptr->tm_year); - b = (tptr->tm_year - tm_lo.tm_year); - /* 46000 is selected as `some big number less than sqrt(2**31)'. */ - if (a + b <= 46000 / 12) { - range = 31 * 24 * 60 * 60; - a *= 12; - b *= 12; - a += tm_hi.tm_mon - tptr->tm_mon; - b += tptr->tm_mon - tm_lo.tm_mon; - if (a + b <= 46000 / 31) { - range = 24 * 60 * 60; - a *= 31; - b *= 31; - a += tm_hi.tm_mday - tptr->tm_mday; - b += tptr->tm_mday - tm_lo.tm_mday; - if (a + b <= 46000 / 24) { - range = 60 * 60; - a *= 24; - b *= 24; - a += tm_hi.tm_hour - tptr->tm_hour; - b += tptr->tm_hour - tm_lo.tm_hour; - if (a + b <= 46000 / 60) { - range = 60; - a *= 60; - b *= 60; - a += tm_hi.tm_min - tptr->tm_min; - b += tptr->tm_min - tm_lo.tm_min; - if (a + b <= 46000 / 60) { - range = 1; - a *= 60; - b *= 60; - a += tm_hi.tm_sec - tptr->tm_sec; - b += tptr->tm_sec - tm_lo.tm_sec; - } - } - } - } - } - if (a <= 0) a = 1; - if (b <= 0) b = 1; - d = a + b; - /* - Although `/' and `%' may produce unexpected result with negative - argument, it doesn't cause serious problem because there is a - fail safe. - */ - guess = guess_lo / d * a + (guess_lo % d) * a / d - + guess_hi / d * b + (guess_hi % d) * b / d; - have_guess = 1; - } + status = 1; - if (guess <= guess_lo || guess_hi <= guess) { - /* Precious guess is invalid. try binary search. */ - guess = guess_lo / 2 + guess_hi / 2; - if (guess <= guess_lo) - guess = guess_lo + 1; - else if (guess >= guess_hi) - guess = guess_hi - 1; - range = 0; - } + while (guess_lo + 1 < guess_hi) { + if (status == 0) { + binsearch: + guess = guess_lo / 2 + guess_hi / 2; + if (guess <= guess_lo) + guess = guess_lo + 1; + else if (guess >= guess_hi) + guess = guess_hi - 1; + status = 1; + } + else { + if (status == 1) { + time_t guess0_hi = timegm_noleapsecond(&tm_hi); + guess = guess_hi - (guess0_hi - guess0); + if (guess == guess_hi) /* hh:mm:60 tends to cause this condition. */ + guess--; + status = 2; + } + else if (status == 2) { + time_t guess0_lo = timegm_noleapsecond(&tm_lo); + guess = guess_lo + (guess0 - guess0_lo); + if (guess == guess_lo) + guess++; + status = 0; + } + if (guess <= guess_lo || guess_hi <= guess) { + /* Precious guess is invalid. try binary search. */ +#ifdef DEBUG_GUESSRANGE + if (guess <= guess_lo) fprintf(stderr, "too small guess: %ld <= %ld\n", guess, guess_lo); + if (guess_hi <= guess) fprintf(stderr, "too big guess: %ld <= %ld\n", guess_hi, guess); +#endif + goto binsearch; + } + } - tm = (utc_p ? gmtime : localtime)(&guess); + tm = GUESS(&guess); if (!tm) goto error; - have_guess = 0; - + d = tmcmp(tptr, tm); - if (d < 0) { - guess_hi = guess; - tm_hi = *tm; - if (range) { - guess = guess - range; - range = 0; - if (guess_lo < guess && guess < guess_hi) - have_guess = 1; - } - } - else if (d > 0) { - guess_lo = guess; - tm_lo = *tm; - if (range) { - guess = guess + range; - range = 0; - if (guess_lo < guess && guess < guess_hi) - have_guess = 1; - } - } - else { + + if (d < 0) { + guess_hi = guess; + tm_hi = *tm; + DEBUG_REPORT_GUESSRANGE; + } + else if (d > 0) { + guess_lo = guess; + tm_lo = *tm; + DEBUG_REPORT_GUESSRANGE; + } + else { + found: if (!utc_p) { /* If localtime is nonmonotonic, another result may exist. */ time_t guess2; if (find_dst) { guess2 = guess - 2 * 60 * 60; - tm = localtime(&guess2); + tm = LOCALTIME(&guess2, result); if (tm) { if (tptr->tm_hour != (tm->tm_hour + 2) % 24 || tptr->tm_min != tm->tm_min || - tptr->tm_sec != tm->tm_sec - ) { + tptr->tm_sec != tm->tm_sec) { guess2 -= (tm->tm_hour - tptr->tm_hour) * 60 * 60 + (tm->tm_min - tptr->tm_min) * 60 + (tm->tm_sec - tptr->tm_sec); if (tptr->tm_mday != tm->tm_mday) guess2 += 24 * 60 * 60; if (guess != guess2) { - tm = localtime(&guess2); - if (tmcmp(tptr, tm) == 0) { + tm = LOCALTIME(&guess2, result); + if (tm && tmcmp(tptr, tm) == 0) { if (guess < guess2) - return guess; + *tp = guess; else - return guess2; + *tp = guess2; + return NULL; } } } @@ -766,136 +2951,141 @@ search_time_t(struct tm *tptr, int utc_p) } else { guess2 = guess + 2 * 60 * 60; - tm = localtime(&guess2); + tm = LOCALTIME(&guess2, result); if (tm) { if ((tptr->tm_hour + 2) % 24 != tm->tm_hour || tptr->tm_min != tm->tm_min || - tptr->tm_sec != tm->tm_sec - ) { + tptr->tm_sec != tm->tm_sec) { guess2 -= (tm->tm_hour - tptr->tm_hour) * 60 * 60 + (tm->tm_min - tptr->tm_min) * 60 + (tm->tm_sec - tptr->tm_sec); if (tptr->tm_mday != tm->tm_mday) guess2 -= 24 * 60 * 60; if (guess != guess2) { - tm = localtime(&guess2); - if (tmcmp(tptr, tm) == 0) { + tm = LOCALTIME(&guess2, result); + if (tm && tmcmp(tptr, tm) == 0) { if (guess < guess2) - return guess2; + *tp = guess2; else - return guess; + *tp = guess; + return NULL; } } } } } } - return guess; + *tp = guess; + return NULL; } } /* Given argument has no corresponding time_t. Let's outerpolation. */ - if (tm_lo.tm_year == tptr->tm_year && tm_lo.tm_mon == tptr->tm_mon) { - return guess_lo + - (tptr->tm_mday - tm_lo.tm_mday) * 24 * 60 * 60 + - (tptr->tm_hour - tm_lo.tm_hour) * 60 * 60 + - (tptr->tm_min - tm_lo.tm_min) * 60 + - (tptr->tm_sec - tm_lo.tm_sec); - } - else if (tm_hi.tm_year == tptr->tm_year && tm_hi.tm_mon == tptr->tm_mon) { - return guess_hi + - (tptr->tm_mday - tm_hi.tm_mday) * 24 * 60 * 60 + - (tptr->tm_hour - tm_hi.tm_hour) * 60 * 60 + - (tptr->tm_min - tm_hi.tm_min) * 60 + - (tptr->tm_sec - tm_hi.tm_sec); - } + /* + * `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 + */ + + tptr_tm_yday = calc_tm_yday(tptr->tm_year, tptr->tm_mon, tptr->tm_mday); + + *tp = guess_lo + + ((tptr->tm_year - tm_lo.tm_year) * 365 + + ((tptr->tm_year-69)/4) - + ((tptr->tm_year-1)/100) + + ((tptr->tm_year+299)/400) - + ((tm_lo.tm_year-69)/4) + + ((tm_lo.tm_year-1)/100) - + ((tm_lo.tm_year+299)/400) + + tptr_tm_yday - + tm_lo.tm_yday) * 86400 + + (tptr->tm_hour - tm_lo.tm_hour) * 3600 + + (tptr->tm_min - tm_lo.tm_min) * 60 + + (tptr->tm_sec - tm_lo.tm_sec); + + return NULL; out_of_range: - rb_raise(rb_eArgError, "time out of range"); + return "time out of range"; error: - rb_raise(rb_eArgError, "gmtime/localtime error"); - return 0; /* not reached */ + return "gmtime/localtime error"; } -static time_t -make_time_t(struct tm *tptr, int utc_p) +static int +vtmcmp(struct vtm *a, struct vtm *b) { - time_t t; -#ifdef NEGATIVE_TIME_T - struct tm *tmp; -#endif - struct tm buf; - buf = *tptr; - if (utc_p) { -#if defined(HAVE_TIMEGM) - if ((t = timegm(&buf)) != -1) - return t; -#ifdef NEGATIVE_TIME_T - if ((tmp = gmtime(&t)) && - tptr->tm_year == tmp->tm_year && - tptr->tm_mon == tmp->tm_mon && - tptr->tm_mday == tmp->tm_mday && - tptr->tm_hour == tmp->tm_hour && - tptr->tm_min == tmp->tm_min && - tptr->tm_sec == tmp->tm_sec - ) - return t; -#endif -#endif - return search_time_t(&buf, utc_p); - } - else { -#if defined(HAVE_MKTIME) - if ((t = mktime(&buf)) != -1) - return t; -#ifdef NEGATIVE_TIME_T - if ((tmp = localtime(&t)) && - tptr->tm_year == tmp->tm_year && - tptr->tm_mon == tmp->tm_mon && - tptr->tm_mday == tmp->tm_mday && - tptr->tm_hour == tmp->tm_hour && - tptr->tm_min == tmp->tm_min && - tptr->tm_sec == tmp->tm_sec - ) - return t; -#endif -#endif - return search_time_t(&buf, utc_p); - } + if (ne(a->year, b->year)) + return lt(a->year, b->year) ? -1 : 1; + else if (a->mon != b->mon) + return a->mon < b->mon ? -1 : 1; + else if (a->mday != b->mday) + return a->mday < b->mday ? -1 : 1; + else if (a->hour != b->hour) + return a->hour < b->hour ? -1 : 1; + else if (a->min != b->min) + return a->min < b->min ? -1 : 1; + else if (a->sec != b->sec) + return a->sec < b->sec ? -1 : 1; + else if (ne(a->subsecx, b->subsecx)) + return lt(a->subsecx, b->subsecx) ? -1 : 1; + else + return 0; +} + +static int +tmcmp(struct tm *a, struct tm *b) +{ + if (a->tm_year != b->tm_year) + return a->tm_year < b->tm_year ? -1 : 1; + else if (a->tm_mon != b->tm_mon) + return a->tm_mon < b->tm_mon ? -1 : 1; + else if (a->tm_mday != b->tm_mday) + return a->tm_mday < b->tm_mday ? -1 : 1; + else if (a->tm_hour != b->tm_hour) + return a->tm_hour < b->tm_hour ? -1 : 1; + else if (a->tm_min != b->tm_min) + return a->tm_min < b->tm_min ? -1 : 1; + else if (a->tm_sec != b->tm_sec) + return a->tm_sec < b->tm_sec ? -1 : 1; + else + return 0; } static VALUE time_utc_or_local(int argc, VALUE *argv, int utc_p, VALUE klass) { - struct tm tm; + struct vtm vtm; VALUE time; - long nsec; - time_arg(argc, argv, &tm, &nsec); - time = time_new_internal(klass, make_time_t(&tm, utc_p), nsec); + time_arg(argc, argv, &vtm); + if (utc_p) + time = time_new_timew(klass, timegmw(&vtm)); + else + time = time_new_timew(klass, timelocalw(&vtm)); if (utc_p) return time_gmtime(time, 0); - return time_localtime(time, 0); + return time_localtime(time); } /* * call-seq: - * Time.utc(year) => time - * Time.utc(year, month) => time - * Time.utc(year, month, day) => time - * Time.utc(year, month, day, hour) => time - * Time.utc(year, month, day, hour, min) => time - * Time.utc(year, month, day, hour, min, sec_with_frac) => time - * Time.utc(year, month, day, hour, min, sec, usec_with_frac) => time - * Time.utc(sec, min, hour, day, month, year, wday, yday, isdst, tz) => time - * Time.gm(year) => time - * Time.gm(year, month) => time - * Time.gm(year, month, day) => time - * Time.gm(year, month, day, hour) => time - * Time.gm(year, month, day, hour, min) => time - * Time.gm(year, month, day, hour, min, sec_with_frac) => time - * Time.gm(year, month, day, hour, min, sec, usec_with_frac) => time - * Time.gm(sec, min, hour, day, month, year, wday, yday, isdst, tz) => time - * + * Time.utc(year) -> time + * Time.utc(year, month) -> time + * Time.utc(year, month, day) -> time + * Time.utc(year, month, day, hour) -> time + * Time.utc(year, month, day, hour, min) -> time + * Time.utc(year, month, day, hour, min, sec_with_frac) -> time + * Time.utc(year, month, day, hour, min, sec, usec_with_frac) -> time + * Time.utc(sec, min, hour, day, month, year, wday, yday, isdst, tz) -> time + * Time.gm(year) -> time + * Time.gm(year, month) -> time + * Time.gm(year, month, day) -> time + * Time.gm(year, month, day, hour) -> time + * Time.gm(year, month, day, hour, min) -> time + * Time.gm(year, month, day, hour, min, sec_with_frac) -> time + * Time.gm(year, month, day, hour, min, sec, usec_with_frac) -> time + * Time.gm(sec, min, hour, day, month, year, wday, yday, isdst, tz) -> time + * * Creates a time based on given values, interpreted as UTC (GMT). The * year must be specified. Other values default to the minimum value * for that field (and may be nil or omitted). Months may @@ -912,51 +3102,51 @@ time_utc_or_local(int argc, VALUE *argv, int utc_p, VALUE klass) static VALUE time_s_mkutc(VALUE klass, SEL sel, int argc, VALUE *argv) { - return time_utc_or_local(argc, argv, Qtrue, klass); + return time_utc_or_local(argc, argv, TRUE, klass); } /* * call-seq: - * Time.local(year) => time - * Time.local(year, month) => time - * Time.local(year, month, day) => time - * Time.local(year, month, day, hour) => time - * Time.local(year, month, day, hour, min) => time - * Time.local(year, month, day, hour, min, sec_with_frac) => time - * Time.local(year, month, day, hour, min, sec, usec_with_frac) => time - * Time.local(sec, min, hour, day, month, year, wday, yday, isdst, tz) => time - * Time.mktime(year) => time - * Time.mktime(year, month) => time - * Time.mktime(year, month, day) => time - * Time.mktime(year, month, day, hour) => time - * Time.mktime(year, month, day, hour, min) => time - * Time.mktime(year, month, day, hour, min, sec_with_frac) => time - * Time.mktime(year, month, day, hour, min, sec, usec_with_frac) => time - * Time.mktime(sec, min, hour, day, month, year, wday, yday, isdst, tz) => time - * + * Time.local(year) -> time + * Time.local(year, month) -> time + * Time.local(year, month, day) -> time + * Time.local(year, month, day, hour) -> time + * Time.local(year, month, day, hour, min) -> time + * Time.local(year, month, day, hour, min, sec_with_frac) -> time + * Time.local(year, month, day, hour, min, sec, usec_with_frac) -> time + * Time.local(sec, min, hour, day, month, year, wday, yday, isdst, tz) -> time + * Time.mktime(year) -> time + * Time.mktime(year, month) -> time + * Time.mktime(year, month, day) -> time + * Time.mktime(year, month, day, hour) -> time + * Time.mktime(year, month, day, hour, min) -> time + * Time.mktime(year, month, day, hour, min, sec_with_frac) -> time + * Time.mktime(year, month, day, hour, min, sec, usec_with_frac) -> time + * Time.mktime(sec, min, hour, day, month, year, wday, yday, isdst, tz) -> time + * * Same as Time::gm, but interprets the values in the * local time zone. - * + * * Time.local(2000,"jan",1,20,15,1) #=> 2000-01-01 20:15:01 -0600 */ static VALUE time_s_mktime(VALUE klass, SEL sel, int argc, VALUE *argv) { - return time_utc_or_local(argc, argv, Qfalse, klass); + return time_utc_or_local(argc, argv, FALSE, klass); } /* * call-seq: - * time.to_i => int - * time.tv_sec => int - * + * time.to_i -> int + * time.tv_sec -> int + * * Returns the value of time as an integer number of seconds * since the Epoch. - * + * * t = Time.now - * "%10.5f" % t.to_f #=> "1049896564.17839" - * t.to_i #=> 1049896564 + * "%10.5f" % t.to_f #=> "1270968656.89607" + * t.to_i #=> 1270968656 */ static VALUE @@ -965,22 +3155,22 @@ time_to_i(VALUE time, SEL sel) struct time_object *tobj; GetTimeval(time, tobj); - return LONG2NUM(tobj->ts.tv_sec); + return w2v(wdiv(tobj->timew, WINT2FIXWV(TIME_SCALE))); } /* * call-seq: - * time.to_f => float - * + * time.to_f -> float + * * Returns the value of time as a floating point number of * seconds since the Epoch. - * + * * t = Time.now - * "%10.5f" % t.to_f #=> "1049896564.13654" - * t.to_i #=> 1049896564 + * "%10.5f" % t.to_f #=> "1270968744.77658" + * t.to_i #=> 1270968744 * * Note that IEEE 754 double is not accurate enough to represent - * nanoseconds from the Epoch. + * number of nanoseconds from the Epoch. */ static double @@ -988,22 +3178,51 @@ time_since_epoch(VALUE time) { struct time_object *tobj; GetTimeval(time, tobj); - return (double)tobj->ts.tv_sec + (double)tobj->ts.tv_nsec/1e9; + return NUM2DBL(rb_time_unmagnify_to_float(tobj->timew)); } static VALUE time_to_f(VALUE time, SEL sel) { - return DOUBLE2NUM(time_since_epoch(time)); + return DBL2NUM(time_since_epoch(time)); +} + +/* + * call-seq: + * time.to_r -> a_rational + * + * Returns the value of time as a rational number of seconds + * since the Epoch. + * + * t = Time.now + * p t.to_r #=> (1270968792716287611/1000000000) + * + * This methods is intended to be used to get an accurate value + * representing nanoseconds from the Epoch. You can use this + * to convert time to another Epoch. + */ + +static VALUE +time_to_r(VALUE time, SEL sel) +{ + struct time_object *tobj; + VALUE v; + + GetTimeval(time, tobj); + v = w2v(rb_time_unmagnify(tobj->timew)); + if (TYPE(v) != T_RATIONAL) { + v = rb_Rational1(v); + } + return v; } /* * call-seq: - * time.usec => int - * time.tv_usec => int - * + * time.usec -> int + * time.tv_usec -> int + * * Returns just the number of microseconds for time. - * + * * t = Time.now #=> 2007-11-19 08:03:26 -0600 * "%10.6f" % t.to_f #=> "1195481006.775195" * t.usec #=> 775195 @@ -1013,18 +3232,22 @@ static VALUE time_usec(VALUE time, SEL sel) { struct time_object *tobj; + wideval_t w, q, r; GetTimeval(time, tobj); - return LONG2NUM(tobj->ts.tv_nsec/1000); + + w = wmod(tobj->timew, WINT2WV(TIME_SCALE)); + wmuldivmod(w, WINT2FIXWV(1000000), WINT2FIXWV(TIME_SCALE), &q, &r); + return rb_to_int(w2v(q)); } /* * call-seq: - * time.nsec => int - * time.tv_nsec => int - * + * time.nsec -> int + * time.tv_nsec -> int + * * Returns just the number of nanoseconds for time. - * + * * t = Time.now #=> 2007-11-17 15:18:03 +0900 * "%10.9f" % t.to_f #=> "1195280283.536151409" * t.nsec #=> 536151406 @@ -1041,20 +3264,47 @@ time_nsec(VALUE time, SEL sel) struct time_object *tobj; GetTimeval(time, tobj); - return LONG2NUM(tobj->ts.tv_nsec); + return rb_to_int(w2v(wmulquoll(wmod(tobj->timew, WINT2WV(TIME_SCALE)), 1000000000, TIME_SCALE))); +} + +/* + * call-seq: + * time.subsec -> number + * + * Returns just the fraction for time. + * + * The result is possibly rational. + * + * t = Time.now #=> 2009-03-26 22:33:12 +0900 + * "%10.9f" % t.to_f #=> "1238074392.940563917" + * t.subsec #=> (94056401/100000000) + * + * The lowest digit of to_f and subsec is different because + * IEEE 754 double is not accurate enough to represent + * the rational. + * The accurate value is returned by subsec. + */ + +static VALUE +time_subsec(VALUE time, SEL sel) +{ + struct time_object *tobj; + + GetTimeval(time, tobj); + return quo(w2v(wmod(tobj->timew, WINT2FIXWV(TIME_SCALE))), INT2FIX(TIME_SCALE)); } /* * call-seq: - * time <=> other_time => -1, 0, +1 - * + * time <=> other_time -> -1, 0, +1 or nil + * * Comparison---Compares time with other_time. - * + * * t = Time.now #=> 2007-11-19 08:12:12 -0600 * t2 = t + 2592000 #=> 2007-12-19 08:12:12 -0600 * t <=> t2 #=> -1 * t2 <=> t #=> 1 - * + * * t = Time.now #=> 2007-11-19 08:13:38 -0600 * t2 = t + 0.1 #=> 2007-11-19 08:13:38 -0600 * t.nsec #=> 98222999 @@ -1068,20 +3318,24 @@ static VALUE time_cmp(VALUE time1, SEL sel, VALUE time2) { struct time_object *tobj1, *tobj2; + int n; GetTimeval(time1, tobj1); - if (CLASS_OF(time2) == rb_cTime) { + if (IsTimeval(time2)) { GetTimeval(time2, tobj2); - if (tobj1->ts.tv_sec == tobj2->ts.tv_sec) { - if (tobj1->ts.tv_nsec == tobj2->ts.tv_nsec) return INT2FIX(0); - if (tobj1->ts.tv_nsec > tobj2->ts.tv_nsec) return INT2FIX(1); - return INT2FIX(-1); - } - if (tobj1->ts.tv_sec > tobj2->ts.tv_sec) return INT2FIX(1); - return INT2FIX(-1); + n = wcmp(tobj1->timew, tobj2->timew); } + else { + VALUE tmp; + + tmp = rb_funcall(time2, rb_intern("<=>"), 1, time1); + if (NIL_P(tmp)) return Qnil; - return Qnil; + n = -rb_cmpint(tmp, time1, time2); + } + if (n == 0) return INT2FIX(0); + if (n > 0) return INT2FIX(1); + return INT2FIX(-1); } /* @@ -1099,23 +3353,21 @@ time_eql(VALUE time1, SEL sel, VALUE time2) struct time_object *tobj1, *tobj2; GetTimeval(time1, tobj1); - if (CLASS_OF(time2) == rb_cTime) { + if (IsTimeval(time2)) { GetTimeval(time2, tobj2); - if (tobj1->ts.tv_sec == tobj2->ts.tv_sec) { - if (tobj1->ts.tv_nsec == tobj2->ts.tv_nsec) return Qtrue; - } + return rb_equal(w2v(tobj1->timew), w2v(tobj2->timew)); } return Qfalse; } /* * call-seq: - * time.utc? => true or false - * time.gmt? => true or false - * + * time.utc? -> true or false + * time.gmt? -> true or false + * * Returns true if time represents a time in UTC * (GMT). - * + * * t = Time.now #=> 2007-11-19 08:15:23 -0600 * t.utc? #=> false * t = Time.gm(2000,"jan",1,20,15,1) #=> 2000-01-01 20:15:01 UTC @@ -1133,13 +3385,13 @@ time_utc_p(VALUE time, SEL sel) struct time_object *tobj; GetTimeval(time, tobj); - if (tobj->gmt) return Qtrue; + if (TIME_UTC_P(tobj)) return Qtrue; return Qfalse; } /* * call-seq: - * time.hash => fixnum + * time.hash -> fixnum * * Return a hash code for this time object. */ @@ -1148,11 +3400,9 @@ static VALUE time_hash(VALUE time, SEL sel) { struct time_object *tobj; - long hash; GetTimeval(time, tobj); - hash = tobj->ts.tv_sec ^ tobj->ts.tv_nsec; - return LONG2FIX(hash); + return rb_hash(w2v(tobj->timew)); } /* :nodoc: */ @@ -1163,7 +3413,7 @@ time_init_copy(VALUE copy, SEL sel, VALUE time) if (copy == time) return copy; time_modify(copy); - if (CLASS_OF(time) != rb_cTime) { + if (!IsTimeval(time)) { rb_raise(rb_eTypeError, "wrong argument type"); } GetTimeval(time, tobj); @@ -1181,51 +3431,74 @@ time_dup(VALUE time) return dup; } +static VALUE +time_localtime(VALUE time) +{ + struct time_object *tobj; + struct vtm vtm; + + GetTimeval(time, tobj); + if (TIME_LOCALTIME_P(tobj)) { + if (tobj->tm_got) + return time; + } + else { + time_modify(time); + } + + if (!localtimew(tobj->timew, &vtm)) + rb_raise(rb_eArgError, "localtime error"); + tobj->vtm = vtm; + + tobj->tm_got = 1; + TIME_SET_LOCALTIME(tobj); + return time; +} + /* * call-seq: - * time.localtime => time - * + * time.localtime -> time + * time.localtime(utc_offset) -> time + * * Converts time to local time (using the local time zone in * effect for this process) modifying the receiver. - * - * t = Time.gm(2000, "jan", 1, 20, 15, 1) #=> 2000-01-01 20:15:01 UTC - * t.gmt? #=> true + * + * If _utc_offset_ is given, it is used instead of the local time. + * + * t = Time.utc(2000, "jan", 1, 20, 15, 1) #=> 2000-01-01 20:15:01 UTC + * t.utc? #=> true + * * t.localtime #=> 2000-01-01 14:15:01 -0600 - * t.gmt? #=> false + * t.utc? #=> false + * + * t.localtime("+09:00") #=> 2000-01-02 05:15:01 +0900 + * t.utc? #=> false */ static VALUE -time_localtime(VALUE time, SEL sel) +time_localtime_m(VALUE time, SEL sel, int argc, VALUE *argv) { - struct time_object *tobj; - struct tm *tm_tmp; - time_t t; + VALUE off; + rb_scan_args(argc, argv, "01", &off); - GetTimeval(time, tobj); - if (!tobj->gmt) { - if (tobj->tm_got) - return time; - } - else { - time_modify(time); + if (!NIL_P(off)) { + off = utc_offset_arg(off); + validate_utc_offset(off); + + time_set_utc_offset(time, off); + return time_fixoff(time); } - t = tobj->ts.tv_sec; - tm_tmp = localtime(&t); - if (!tm_tmp) - rb_raise(rb_eArgError, "localtime error"); - tobj->tm = *tm_tmp; - tobj->tm_got = 1; - tobj->gmt = 0; - return time; + + return time_localtime(time); } /* * call-seq: - * time.gmtime => time - * time.utc => time - * + * time.gmtime -> time + * time.utc -> time + * * Converts time to UTC (GMT), modifying the receiver. - * + * * t = Time.now #=> 2007-11-19 08:18:31 -0600 * t.gmt? #=> false * t.gmtime #=> 2007-11-19 14:18:31 UTC @@ -1241,55 +3514,106 @@ static VALUE time_gmtime(VALUE time, SEL sel) { struct time_object *tobj; - struct tm *tm_tmp; - time_t t; + struct vtm vtm; GetTimeval(time, tobj); - if (tobj->gmt) { + if (TIME_UTC_P(tobj)) { if (tobj->tm_got) return time; } else { time_modify(time); } - t = tobj->ts.tv_sec; - tm_tmp = gmtime(&t); - if (!tm_tmp) + + if (!gmtimew(tobj->timew, &vtm)) rb_raise(rb_eArgError, "gmtime error"); - tobj->tm = *tm_tmp; + tobj->vtm = vtm; + + tobj->tm_got = 1; + TIME_SET_UTC(tobj); + return time; +} + +static VALUE +time_fixoff(VALUE time) +{ + struct time_object *tobj; + struct vtm vtm; + VALUE off; + + GetTimeval(time, tobj); + if (TIME_FIXOFF_P(tobj)) { + if (tobj->tm_got) + return time; + } + else { + time_modify(time); + } + + if (TIME_FIXOFF_P(tobj)) + off = tobj->vtm.utc_offset; + else + off = INT2FIX(0); + + if (!gmtimew(tobj->timew, &vtm)) + rb_raise(rb_eArgError, "gmtime error"); + + tobj->vtm = vtm; + vtm_add_offset(&tobj->vtm, off); + tobj->tm_got = 1; - tobj->gmt = 1; + TIME_SET_FIXOFF(tobj, off); return time; } /* * call-seq: - * time.getlocal => new_time - * + * time.getlocal -> new_time + * time.getlocal(utc_offset) -> new_time + * * Returns a new new_time object representing time in * local time (using the local time zone in effect for this process). - * - * t = Time.gm(2000,1,1,20,15,1) #=> 2000-01-01 20:15:01 UTC - * t.gmt? #=> true + * + * If _utc_offset_ is given, it is used instead of the local time. + * + * t = Time.utc(2000,1,1,20,15,1) #=> 2000-01-01 20:15:01 UTC + * t.utc? #=> true + * * l = t.getlocal #=> 2000-01-01 14:15:01 -0600 - * l.gmt? #=> false + * l.utc? #=> false * t == l #=> true + * + * j = t.getlocal("+09:00") #=> 2000-01-02 05:15:01 +0900 + * j.utc? #=> false + * t == j #=> true */ static VALUE -time_getlocaltime(VALUE time, SEL sel) +time_getlocaltime(VALUE time, SEL sel, int argc, VALUE *argv) { - return time_localtime(time_dup(time), 0); + VALUE off; + rb_scan_args(argc, argv, "01", &off); + + if (!NIL_P(off)) { + off = utc_offset_arg(off); + validate_utc_offset(off); + + time = time_dup(time); + time_set_utc_offset(time, off); + return time_fixoff(time); + } + + return time_localtime(time_dup(time)); } /* * call-seq: - * time.getgm => new_time - * time.getutc => new_time - * + * time.getgm -> new_time + * time.getutc -> new_time + * * Returns a new new_time object representing time in * UTC. - * + * * t = Time.local(2000,1,1,20,15,1) #=> 2000-01-01 20:15:01 -0600 * t.gmt? #=> false * y = t.getgm #=> 2000-01-02 02:15:01 UTC @@ -1304,19 +3628,22 @@ time_getgmtime(VALUE time, SEL sel) } static VALUE -time_get_tm(VALUE time, int gmt) +time_get_tm(VALUE time, struct time_object *tobj) { - if (gmt) return time_gmtime(time, 0); - return time_localtime(time, 0); + if (TIME_UTC_P(tobj)) return time_gmtime(time, 0); + if (TIME_FIXOFF_P(tobj)) return time_fixoff(time); + return time_localtime(time); } +static VALUE strftimev(const char *fmt, VALUE time); + /* * call-seq: - * time.asctime => string - * time.ctime => string - * + * time.asctime -> string + * time.ctime -> string + * * Returns a canonical string representation of time. - * + * * Time.now.asctime #=> "Wed Apr 9 08:56:03 2003" */ @@ -1324,30 +3651,23 @@ static VALUE time_asctime(VALUE time, SEL sel) { struct time_object *tobj; - char *s; GetTimeval(time, tobj); - if (tobj->tm_got == 0) { - time_get_tm(time, tobj->gmt); - } - s = asctime(&tobj->tm); - if (s[24] == '\n') s[24] = '\0'; - - return rb_str_new2(s); + return strftimev("%a %b %e %T %Y", time); } /* * call-seq: - * time.inspect => string - * time.to_s => string - * + * time.inspect -> string + * time.to_s -> string + * * Returns a string representing time. Equivalent to calling * Time#strftime with a format string of * ``%Y-%m-%d %H:%M:%S %z'' * for a local time and * ``%Y-%m-%d %H:%M:%S UTC'' * for a UTC time. - * + * * Time.now.to_s #=> "2007-10-05 16:09:51 +0900" * Time.now.utc.to_s #=> "2007-10-05 07:09:51 UTC" */ @@ -1356,84 +3676,42 @@ static VALUE time_to_s(VALUE time, SEL sel) { struct time_object *tobj; - char buf[128]; - int len; GetTimeval(time, tobj); - if (tobj->tm_got == 0) { - time_get_tm(time, tobj->gmt); - } - if (tobj->gmt == 1) { - len = strftime(buf, 128, "%Y-%m-%d %H:%M:%S UTC", &tobj->tm); - } - else { - long off; - char sign = '+'; -#if defined(HAVE_STRUCT_TM_TM_GMTOFF) - off = tobj->tm.tm_gmtoff; -#else - VALUE tmp = time_utc_offset(time, 0); - off = NUM2INT(tmp); -#endif - if (off < 0) { - sign = '-'; - off = -off; - } - len = strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S ", &tobj->tm); - len += snprintf(buf+len, sizeof(buf)-len, "%c%02d%02d", sign, - (int)(off/3600), (int)(off%3600/60)); - } - return rb_str_new(buf, len); + if (TIME_UTC_P(tobj)) + return strftimev("%Y-%m-%d %H:%M:%S UTC", time); + else + return strftimev("%Y-%m-%d %H:%M:%S %z", time); } static VALUE time_add(struct time_object *tobj, VALUE offset, int sign) { - double v = NUM2DBL(offset); - double f, d; - unsigned_time_t sec_off; - time_t sec; - long nsec_off, nsec; VALUE result; - - if (v < 0) { - v = -v; - sign = -sign; - } - d = modf(v, &f); - sec_off = (unsigned_time_t)f; - if (f != (double)sec_off) - rb_raise(rb_eRangeError, "time %s %f out of Time range", - sign < 0 ? "-" : "+", v); - nsec_off = (long)(d*1e9+0.5); - - if (sign < 0) { - sec = tobj->ts.tv_sec - sec_off; - nsec = tobj->ts.tv_nsec - nsec_off; - if (sec > tobj->ts.tv_sec) - rb_raise(rb_eRangeError, "time - %f out of Time range", v); - } - else { - sec = tobj->ts.tv_sec + sec_off; - nsec = tobj->ts.tv_nsec + nsec_off; - if (sec < tobj->ts.tv_sec) - rb_raise(rb_eRangeError, "time + %f out of Time range", v); - } - result = rb_time_nano_new(sec, nsec); - if (tobj->gmt) { + offset = num_exact(offset); + if (sign < 0) + result = time_new_timew(rb_cTime, wsub(tobj->timew, rb_time_magnify(v2w(offset)))); + else + result = time_new_timew(rb_cTime, wadd(tobj->timew, rb_time_magnify(v2w(offset)))); + if (TIME_UTC_P(tobj)) { GetTimeval(result, tobj); - tobj->gmt = 1; + TIME_SET_UTC(tobj); + } + else if (TIME_FIXOFF_P(tobj)) { + VALUE off = tobj->vtm.utc_offset; + GetTimeval(result, tobj); + TIME_SET_FIXOFF(tobj, off); } return result; } /* * call-seq: - * time + numeric => time - * + * time + numeric -> time + * * Addition---Adds some number of seconds (possibly fractional) to * time and returns that value as a new time. - * + * * t = Time.now #=> 2007-11-19 08:22:21 -0600 * t + (60 * 60 * 24) #=> 2007-11-20 08:22:21 -0600 */ @@ -1444,7 +3722,7 @@ time_plus(VALUE time1, SEL sel, VALUE time2) struct time_object *tobj; GetTimeval(time1, tobj); - if (CLASS_OF(time2) == rb_cTime) { + if (IsTimeval(time2)) { rb_raise(rb_eTypeError, "time + time?"); } return time_add(tobj, time2, 1); @@ -1452,13 +3730,13 @@ time_plus(VALUE time1, SEL sel, VALUE time2) /* * call-seq: - * time - other_time => float - * time - numeric => time - * + * time - other_time -> float + * time - numeric -> time + * * Difference---Returns a new time that represents the difference * between two times, or subtracts the given number of seconds in * numeric from time. - * + * * t = Time.now #=> 2007-11-19 08:23:10 -0600 * t2 = t + 2592000 #=> 2007-12-19 08:23:10 -0600 * t2 - t #=> 2592000.0 @@ -1471,43 +3749,37 @@ time_minus(VALUE time1, SEL sel, VALUE time2) struct time_object *tobj; GetTimeval(time1, tobj); - if (CLASS_OF(time2) == rb_cTime) { + if (IsTimeval(time2)) { struct time_object *tobj2; - double f; GetTimeval(time2, tobj2); - if (tobj->ts.tv_sec < tobj2->ts.tv_sec) - f = -(double)(unsigned_time_t)(tobj2->ts.tv_sec - tobj->ts.tv_sec); - else - f = (double)(unsigned_time_t)(tobj->ts.tv_sec - tobj2->ts.tv_sec); - f += ((double)tobj->ts.tv_nsec - (double)tobj2->ts.tv_nsec)*1e-9; - - return DOUBLE2NUM(f); + return rb_Float(rb_time_unmagnify_to_float(wsub(tobj->timew, tobj2->timew))); } return time_add(tobj, time2, -1); } /* * call-seq: - * time.succ => new_time + * time.succ -> new_time * * Return a new time object, one second later than time. + * Time#succ is obsolete since 1.9.2 for time is not a discrete value. * * t = Time.now #=> 2007-11-19 08:23:57 -0600 * t.succ #=> 2007-11-19 08:23:58 -0600 */ -static VALUE +VALUE time_succ(VALUE time, SEL sel) { struct time_object *tobj; - int gmt; + struct time_object *tobj2; + rb_warn("Time#succ is obsolete; use time + 1"); GetTimeval(time, tobj); - gmt = tobj->gmt; - time = rb_time_nano_new(tobj->ts.tv_sec + 1, tobj->ts.tv_nsec); - GetTimeval(time, tobj); - tobj->gmt = gmt; + time = time_new_timew(rb_cTime, wadd(tobj->timew, WINT2FIXWV(TIME_SCALE))); + GetTimeval(time, tobj2); + TIME_COPY_GMT(tobj2, tobj); return time; } @@ -1517,15 +3789,89 @@ rb_time_succ(VALUE time) return time_succ(time, 0); } +/* + * call-seq: + * time.round([ndigits]) -> new_time + * + * Rounds sub seconds to a given precision in decimal digits (0 digits by default). + * It returns a new time object. + * _ndigits_ should be zero or positive integer. + * + * require 'time' + * + * t = Time.utc(2010,3,30, 5,43,"25.123456789".to_r) + * p t.iso8601(10) #=> "2010-03-30T05:43:25.1234567890Z" + * p t.round.iso8601(10) #=> "2010-03-30T05:43:25.0000000000Z" + * p t.round(0).iso8601(10) #=> "2010-03-30T05:43:25.0000000000Z" + * p t.round(1).iso8601(10) #=> "2010-03-30T05:43:25.1000000000Z" + * p t.round(2).iso8601(10) #=> "2010-03-30T05:43:25.1200000000Z" + * p t.round(3).iso8601(10) #=> "2010-03-30T05:43:25.1230000000Z" + * p t.round(4).iso8601(10) #=> "2010-03-30T05:43:25.1235000000Z" + * p t.round(5).iso8601(10) #=> "2010-03-30T05:43:25.1234600000Z" + * p t.round(6).iso8601(10) #=> "2010-03-30T05:43:25.1234570000Z" + * p t.round(7).iso8601(10) #=> "2010-03-30T05:43:25.1234568000Z" + * p t.round(8).iso8601(10) #=> "2010-03-30T05:43:25.1234567900Z" + * p t.round(9).iso8601(10) #=> "2010-03-30T05:43:25.1234567890Z" + * p t.round(10).iso8601(10) #=> "2010-03-30T05:43:25.1234567890Z" + * + * t = Time.utc(1999,12,31, 23,59,59) + * p((t + 0.4).round.iso8601(3)) #=> "1999-12-31T23:59:59.000Z" + * p((t + 0.49).round.iso8601(3)) #=> "1999-12-31T23:59:59.000Z" + * p((t + 0.5).round.iso8601(3)) #=> "2000-01-01T00:00:00.000Z" + * p((t + 1.4).round.iso8601(3)) #=> "2000-01-01T00:00:00.000Z" + * p((t + 1.49).round.iso8601(3)) #=> "2000-01-01T00:00:00.000Z" + * p((t + 1.5).round.iso8601(3)) #=> "2000-01-01T00:00:01.000Z" + * + * t = Time.utc(1999,12,31, 23,59,59) + * p (t + 0.123456789).round(4).iso8601(6) #=> "1999-12-31T23:59:59.123500Z" + */ + +static VALUE +time_round(VALUE time, SEL sel, int argc, VALUE *argv) +{ + VALUE ndigits, v, a, b, den; + long nd; + struct time_object *tobj; + + rb_scan_args(argc, argv, "01", &ndigits); + + if (NIL_P(ndigits)) + ndigits = INT2FIX(0); + else + ndigits = rb_to_int(ndigits); + + nd = NUM2LONG(ndigits); + if (nd < 0) + rb_raise(rb_eArgError, "negative ndigits given"); + + GetTimeval(time, tobj); + v = w2v(rb_time_unmagnify(tobj->timew)); + + a = INT2FIX(1); + b = INT2FIX(10); + while (0 < nd) { + if (nd & 1) + a = mul(a, b); + b = mul(b, b); + nd = nd >> 1; + } + den = quo(INT2FIX(1), a); + v = mod(v, den); + if (lt(v, quo(den, INT2FIX(2)))) + return time_add(tobj, v, -1); + else + return time_add(tobj, sub(den, v), 1); +} + /* * call-seq: - * time.sec => fixnum - * + * time.sec -> fixnum + * * Returns the second of the minute (0..60)[Yes, seconds really can * range from zero to 60. This allows the system to inject leap seconds * every now and then to correct for the fact that years are not really * a convenient number of hours long.] for time. - * + * * t = Time.now #=> 2007-11-19 08:25:02 -0600 * t.sec #=> 2 */ @@ -1536,18 +3882,16 @@ time_sec(VALUE time, SEL sel) struct time_object *tobj; GetTimeval(time, tobj); - if (tobj->tm_got == 0) { - time_get_tm(time, tobj->gmt); - } - return INT2FIX(tobj->tm.tm_sec); + MAKE_TM(time, tobj); + return INT2FIX(tobj->vtm.sec); } /* * call-seq: - * time.min => fixnum - * + * time.min -> fixnum + * * Returns the minute of the hour (0..59) for time. - * + * * t = Time.now #=> 2007-11-19 08:25:51 -0600 * t.min #=> 25 */ @@ -1558,18 +3902,16 @@ time_min(VALUE time, SEL sel) struct time_object *tobj; GetTimeval(time, tobj); - if (tobj->tm_got == 0) { - time_get_tm(time, tobj->gmt); - } - return INT2FIX(tobj->tm.tm_min); + MAKE_TM(time, tobj); + return INT2FIX(tobj->vtm.min); } /* * call-seq: - * time.hour => fixnum - * + * time.hour -> fixnum + * * Returns the hour of the day (0..23) for time. - * + * * t = Time.now #=> 2007-11-19 08:26:20 -0600 * t.hour #=> 8 */ @@ -1580,19 +3922,17 @@ time_hour(VALUE time, SEL sel) struct time_object *tobj; GetTimeval(time, tobj); - if (tobj->tm_got == 0) { - time_get_tm(time, tobj->gmt); - } - return INT2FIX(tobj->tm.tm_hour); + MAKE_TM(time, tobj); + return INT2FIX(tobj->vtm.hour); } /* * call-seq: - * time.day => fixnum - * time.mday => fixnum - * + * time.day -> fixnum + * time.mday -> fixnum + * * Returns the day of the month (1..n) for time. - * + * * t = Time.now #=> 2007-11-19 08:27:03 -0600 * t.day #=> 19 * t.mday #=> 19 @@ -1604,19 +3944,17 @@ time_mday(VALUE time, SEL sel) struct time_object *tobj; GetTimeval(time, tobj); - if (tobj->tm_got == 0) { - time_get_tm(time, tobj->gmt); - } - return INT2FIX(tobj->tm.tm_mday); + MAKE_TM(time, tobj); + return INT2FIX(tobj->vtm.mday); } /* * call-seq: - * time.mon => fixnum - * time.month => fixnum - * + * time.mon -> fixnum + * time.month -> fixnum + * * Returns the month of the year (1..12) for time. - * + * * t = Time.now #=> 2007-11-19 08:27:30 -0600 * t.mon #=> 11 * t.month #=> 11 @@ -1628,18 +3966,16 @@ time_mon(VALUE time, SEL sel) struct time_object *tobj; GetTimeval(time, tobj); - if (tobj->tm_got == 0) { - time_get_tm(time, tobj->gmt); - } - return INT2FIX(tobj->tm.tm_mon+1); + MAKE_TM(time, tobj); + return INT2FIX(tobj->vtm.mon); } /* * call-seq: - * time.year => fixnum - * + * time.year -> fixnum + * * Returns the year for time (including the century). - * + * * t = Time.now #=> 2007-11-19 08:27:51 -0600 * t.year #=> 2007 */ @@ -1650,19 +3986,17 @@ time_year(VALUE time, SEL sel) struct time_object *tobj; GetTimeval(time, tobj); - if (tobj->tm_got == 0) { - time_get_tm(time, tobj->gmt); - } - return LONG2NUM((long)tobj->tm.tm_year+1900); + MAKE_TM(time, tobj); + return tobj->vtm.year; } /* * call-seq: - * time.wday => fixnum - * + * time.wday -> fixnum + * * Returns an integer representing the day of the week, 0..6, with * Sunday == 0. - * + * * t = Time.now #=> 2007-11-20 02:35:35 -0600 * t.wday #=> 2 * t.sunday? #=> false @@ -1680,27 +4014,23 @@ time_wday(VALUE time, SEL sel) struct time_object *tobj; GetTimeval(time, tobj); - if (tobj->tm_got == 0) { - time_get_tm(time, tobj->gmt); - } - return INT2FIX(tobj->tm.tm_wday); + MAKE_TM(time, tobj); + return INT2FIX(tobj->vtm.wday); } #define wday_p(n) {\ struct time_object *tobj;\ GetTimeval(time, tobj);\ - if (tobj->tm_got == 0) {\ - time_get_tm(time, tobj->gmt);\ - }\ - return (tobj->tm.tm_wday == (n)) ? Qtrue : Qfalse;\ + MAKE_TM(time, tobj);\ + return (tobj->vtm.wday == (n)) ? Qtrue : Qfalse;\ } /* * call-seq: - * time.sunday? => true or false - * + * time.sunday? -> true or false + * * Returns true if time represents Sunday. - * + * * t = Time.local(1990, 4, 1) #=> 1990-04-01 00:00:00 -0600 * t.sunday? #=> true */ @@ -1713,8 +4043,8 @@ time_sunday(VALUE time, SEL sel) /* * call-seq: - * time.monday? => true or false - * + * time.monday? -> true or false + * * Returns true if time represents Monday. * * t = Time.local(2003, 8, 4) #=> 2003-08-04 00:00:00 -0500 @@ -1729,8 +4059,8 @@ time_monday(VALUE time, SEL sel) /* * call-seq: - * time.tuesday? => true or false - * + * time.tuesday? -> true or false + * * Returns true if time represents Tuesday. * * t = Time.local(1991, 2, 19) #=> 1991-02-19 00:00:00 -0600 @@ -1745,8 +4075,8 @@ time_tuesday(VALUE time, SEL sel) /* * call-seq: - * time.wednesday? => true or false - * + * time.wednesday? -> true or false + * * Returns true if time represents Wednesday. * * t = Time.local(1993, 2, 24) #=> 1993-02-24 00:00:00 -0600 @@ -1761,8 +4091,8 @@ time_wednesday(VALUE time, SEL sel) /* * call-seq: - * time.thursday? => true or false - * + * time.thursday? -> true or false + * * Returns true if time represents Thursday. * * t = Time.local(1995, 12, 21) #=> 1995-12-21 00:00:00 -0600 @@ -1777,8 +4107,8 @@ time_thursday(VALUE time, SEL sel) /* * call-seq: - * time.friday? => true or false - * + * time.friday? -> true or false + * * Returns true if time represents Friday. * * t = Time.local(1987, 12, 18) #=> 1987-12-18 00:00:00 -0600 @@ -1793,8 +4123,8 @@ time_friday(VALUE time, SEL sel) /* * call-seq: - * time.saturday? => true or false - * + * time.saturday? -> true or false + * * Returns true if time represents Saturday. * * t = Time.local(2006, 6, 10) #=> 2006-06-10 00:00:00 -0500 @@ -1809,10 +4139,10 @@ time_saturday(VALUE time, SEL sel) /* * call-seq: - * time.yday => fixnum - * + * time.yday -> fixnum + * * Returns an integer representing the day of the year, 1..366. - * + * * t = Time.now #=> 2007-11-19 08:32:31 -0600 * t.yday #=> 323 */ @@ -1823,20 +4153,18 @@ time_yday(VALUE time, SEL sel) struct time_object *tobj; GetTimeval(time, tobj); - if (tobj->tm_got == 0) { - time_get_tm(time, tobj->gmt); - } - return INT2FIX(tobj->tm.tm_yday+1); + MAKE_TM(time, tobj); + return INT2FIX(tobj->vtm.yday); } /* * call-seq: - * time.isdst => true or false - * time.dst? => true or false - * + * time.isdst -> true or false + * time.dst? -> true or false + * * Returns true if time occurs during Daylight * Saving Time in its time zone. - * + * * # CST6CDT: * Time.local(2000, 1, 1).zone #=> "CST" * Time.local(2000, 1, 1).isdst #=> false @@ -1860,19 +4188,17 @@ time_isdst(VALUE time, SEL sel) struct time_object *tobj; GetTimeval(time, tobj); - if (tobj->tm_got == 0) { - time_get_tm(time, tobj->gmt); - } - return tobj->tm.tm_isdst?Qtrue:Qfalse; + MAKE_TM(time, tobj); + return tobj->vtm.isdst ? Qtrue : Qfalse; } /* * call-seq: - * time.zone => string - * + * time.zone -> string + * * Returns the name of the time zone used for time. As of Ruby * 1.8, returns ``UTC'' rather than ``GMT'' for UTC times. - * + * * t = Time.gm(2000, "jan", 1, 20, 15, 1) * t.zone #=> "UTC" * t = Time.local(2000, "jan", 1, 20, 15, 1) @@ -1883,38 +4209,27 @@ static VALUE time_zone(VALUE time, SEL sel) { struct time_object *tobj; -#if !defined(HAVE_TM_ZONE) && (!defined(HAVE_TZNAME) || !defined(HAVE_DAYLIGHT)) - char buf[64]; - int len; -#endif - + GetTimeval(time, tobj); - if (tobj->tm_got == 0) { - time_get_tm(time, tobj->gmt); - } + MAKE_TM(time, tobj); - if (tobj->gmt == 1) { + if (TIME_UTC_P(tobj)) { return rb_str_new2("UTC"); } -#if defined(HAVE_TM_ZONE) - return rb_str_new2(tobj->tm.tm_zone); -#elif defined(HAVE_TZNAME) && defined(HAVE_DAYLIGHT) - return rb_str_new2(tzname[daylight && tobj->tm.tm_isdst]); -#else - len = strftime(buf, 64, "%Z", &tobj->tm); - return rb_str_new(buf, len); -#endif + if (tobj->vtm.zone == NULL) + return Qnil; + return rb_str_new2(tobj->vtm.zone); } /* * call-seq: - * time.gmt_offset => fixnum - * time.gmtoff => fixnum - * time.utc_offset => fixnum - * + * time.gmt_offset -> fixnum + * time.gmtoff -> fixnum + * time.utc_offset -> fixnum + * * Returns the offset in seconds between the timezone of time * and UTC. - * + * * t = Time.gm(2000,1,1,20,15,1) #=> 2000-01-01 20:15:01 UTC * t.gmt_offset #=> 0 * l = t.getlocal #=> 2000-01-01 14:15:01 -0600 @@ -1927,52 +4242,27 @@ time_utc_offset(VALUE time, SEL sel) struct time_object *tobj; GetTimeval(time, tobj); - if (tobj->tm_got == 0) { - time_get_tm(time, tobj->gmt); - } + MAKE_TM(time, tobj); - if (tobj->gmt == 1) { + if (TIME_UTC_P(tobj)) { return INT2FIX(0); } else { -#if defined(HAVE_STRUCT_TM_TM_GMTOFF) - return INT2NUM(tobj->tm.tm_gmtoff); -#else - struct tm *u, *l; - time_t t; - long off; - l = &tobj->tm; - t = tobj->ts.tv_sec; - u = gmtime(&t); - if (!u) - rb_raise(rb_eArgError, "gmtime error"); - if (l->tm_year != u->tm_year) - off = l->tm_year < u->tm_year ? -1 : 1; - else if (l->tm_mon != u->tm_mon) - off = l->tm_mon < u->tm_mon ? -1 : 1; - else if (l->tm_mday != u->tm_mday) - off = l->tm_mday < u->tm_mday ? -1 : 1; - else - off = 0; - off = off * 24 + l->tm_hour - u->tm_hour; - off = off * 60 + l->tm_min - u->tm_min; - off = off * 60 + l->tm_sec - u->tm_sec; - return LONG2FIX(off); -#endif + return tobj->vtm.utc_offset; } } /* * call-seq: - * time.to_a => array - * + * time.to_a -> array + * * Returns a ten-element array of values for time: * {[ sec, min, hour, day, month, year, wday, yday, isdst, zone * ]}. See the individual methods for an explanation of the * valid ranges of each value. The ten elements can be passed directly * to Time::utc or Time::local to create a * new Time. - * + * * t = Time.now #=> 2007-11-19 08:36:01 -0600 * now = t.to_a #=> [1, 36, 8, 19, 11, 2007, 1, 323, false, "CST"] */ @@ -1983,27 +4273,39 @@ time_to_a(VALUE time, SEL sel) struct time_object *tobj; GetTimeval(time, tobj); - if (tobj->tm_got == 0) { - time_get_tm(time, tobj->gmt); - } + MAKE_TM(time, tobj); return rb_ary_new3(10, - INT2FIX(tobj->tm.tm_sec), - INT2FIX(tobj->tm.tm_min), - INT2FIX(tobj->tm.tm_hour), - INT2FIX(tobj->tm.tm_mday), - INT2FIX(tobj->tm.tm_mon+1), - LONG2NUM((long)tobj->tm.tm_year+1900), - INT2FIX(tobj->tm.tm_wday), - INT2FIX(tobj->tm.tm_yday+1), - tobj->tm.tm_isdst?Qtrue:Qfalse, + INT2FIX(tobj->vtm.sec), + INT2FIX(tobj->vtm.min), + INT2FIX(tobj->vtm.hour), + INT2FIX(tobj->vtm.mday), + INT2FIX(tobj->vtm.mon), + tobj->vtm.year, + INT2FIX(tobj->vtm.wday), + INT2FIX(tobj->vtm.yday), + tobj->vtm.isdst?Qtrue:Qfalse, time_zone(time, 0)); } +size_t +rb_strftime(char *s, size_t maxsize, const char *format, + const struct vtm *vtm, VALUE timev, + int gmt); + +size_t +rb_strftime_timespec(char *s, size_t maxsize, const char *format, const struct vtm *vtm, struct timespec *ts, int gmt); + #define SMALLBUF 100 -static int -rb_strftime(char **buf, const char *format, struct tm *time) +static size_t +rb_strftime_alloc(char **buf, const char *format, + struct vtm *vtm, wideval_t timew, int gmt) { - int size, len, flen; + size_t size, len, flen; + VALUE timev = Qnil; + struct timespec ts; + + if (!timew2timespec_exact(timew, &ts)) + timev = w2v(rb_time_unmagnify(timew)); (*buf)[0] = '\0'; flen = strlen(format); @@ -2011,12 +4313,18 @@ rb_strftime(char **buf, const char *format, struct tm *time) return 0; } errno = 0; - len = strftime(*buf, SMALLBUF, format, time); + if (timev == Qnil) + len = rb_strftime_timespec(*buf, SMALLBUF, format, vtm, &ts, gmt); + else + len = rb_strftime(*buf, SMALLBUF, format, vtm, timev, gmt); if (len != 0 || (**buf == '\0' && errno != ERANGE)) return len; for (size=1024; ; size*=2) { *buf = xmalloc(size); (*buf)[0] = '\0'; - len = strftime(*buf, size, format, time); + if (timev == Qnil) + len = rb_strftime_timespec(*buf, size, format, vtm, &ts, gmt); + else + len = rb_strftime(*buf, size, format, vtm, timev, gmt); /* * buflen can be zero EITHER because there's not enough * room in the string, or because the control command @@ -2024,16 +4332,32 @@ rb_strftime(char **buf, const char *format, struct tm *time) * if the buffer is 1024 times bigger than the length of the * format string, it's not failing for lack of room. */ - if (len > 0 || size >= 1024 * flen) return len; + if (len > 0 || size >= 1024 * flen) break; xfree(*buf); } - /* not reached */ + return len; +} + +static VALUE +strftimev(const char *fmt, VALUE time) +{ + struct time_object *tobj; + char buffer[SMALLBUF], *buf = buffer; + long len; + VALUE str; + + GetTimeval(time, tobj); + MAKE_TM(time, tobj); + len = rb_strftime_alloc(&buf, fmt, &tobj->vtm, tobj->timew, TIME_UTC_P(tobj)); + str = rb_str_new(buf, len); + if (buf != buffer) xfree(buf); + return str; } /* * call-seq: - * time.strftime( string ) => string - * + * time.strftime( string ) -> string + * * Formats time according to the directives in the given format * string. Any text not listed as a directive will be passed through * to the output string. @@ -2044,17 +4368,39 @@ rb_strftime(char **buf, const char *format, struct tm *time) * %b - The abbreviated month name (``Jan'') * %B - The full month name (``January'') * %c - The preferred local date and time representation + * %C - Century (20 in 2009) * %d - Day of the month (01..31) + * %D - Date (%m/%d/%y) + * %e - Day of the month, blank-padded ( 1..31) + * %F - Equivalent to %Y-%m-%d (the ISO 8601 date format) + * %h - Equivalent to %b * %H - Hour of the day, 24-hour clock (00..23) * %I - Hour of the day, 12-hour clock (01..12) * %j - Day of the year (001..366) + * %k - hour, 24-hour clock, blank-padded ( 0..23) + * %l - hour, 12-hour clock, blank-padded ( 0..12) + * %L - Millisecond of the second (000..999) * %m - Month of the year (01..12) * %M - Minute of the hour (00..59) + * %n - Newline (\n) + * %N - Fractional seconds digits, default is 9 digits (nanosecond) + * %3N millisecond (3 digits) + * %6N microsecond (6 digits) + * %9N nanosecond (9 digits) * %p - Meridian indicator (``AM'' or ``PM'') + * %P - Meridian indicator (``am'' or ``pm'') + * %r - time, 12-hour (same as %I:%M:%S %p) + * %R - time, 24-hour (%H:%M) + * %s - Number of seconds since 1970-01-01 00:00:00 UTC. * %S - Second of the minute (00..60) + * %t - Tab character (\t) + * %T - time, 24-hour (%H:%M:%S) + * %u - Day of the week as a decimal, Monday being 1. (1..7) * %U - Week number of the current year, * starting with the first Sunday as the first * day of the first week (00..53) + * %v - VMS date (%e-%b-%Y) + * %V - Week number of year according to ISO 8601 (01..53) * %W - Week number of the current year, * starting with the first Monday as the first * day of the first week (00..53) @@ -2063,9 +4409,10 @@ rb_strftime(char **buf, const char *format, struct tm *time) * %X - Preferred representation for the time alone, no date * %y - Year without a century (00..99) * %Y - Year with century + * %z - Time zone as hour offset from UTC (e.g. +0900) * %Z - Time zone name * %% - Literal ``%'' character - * + * * t = Time.now #=> 2007-11-19 08:37:48 -0600 * t.strftime("Printed on %m/%d/%Y") #=> "Printed on 11/19/2007" * t.strftime("at %I:%M%p") #=> "at 08:37AM" @@ -2074,6 +4421,7 @@ rb_strftime(char **buf, const char *format, struct tm *time) static VALUE time_strftime(VALUE time, SEL sel, VALUE format) { + void rb_enc_copy(VALUE, VALUE); struct time_object *tobj; char buffer[SMALLBUF], *buf = buffer; const char *fmt; @@ -2081,9 +4429,7 @@ time_strftime(VALUE time, SEL sel, VALUE format) VALUE str; GetTimeval(time, tobj); - if (tobj->tm_got == 0) { - time_get_tm(time, tobj->gmt); - } + MAKE_TM(time, tobj); StringValue(format); if (!rb_enc_str_asciicompat_p(format)) { rb_raise(rb_eArgError, "format should have ASCII compatible encoding"); @@ -2094,13 +4440,13 @@ time_strftime(VALUE time, SEL sel, VALUE format) if (len == 0) { rb_warning("strftime called with empty format string"); } - else if (strlen(fmt) < len) { + else if (memchr(fmt, '\0', len)) { /* Ruby string may contain \0's. */ const char *p = fmt, *pe = fmt + len; str = rb_str_new(0, 0); while (p < pe) { - len = rb_strftime(&buf, p, &tobj->tm); + len = rb_strftime_alloc(&buf, p, &tobj->vtm, tobj->timew, TIME_UTC_P(tobj)); rb_str_cat(str, buf, len); p += strlen(p); if (buf != buffer) { @@ -2113,10 +4459,12 @@ time_strftime(VALUE time, SEL sel, VALUE format) return str; } else { - len = rb_strftime(&buf, RSTRING_PTR(format), &tobj->tm); + len = rb_strftime_alloc(&buf, RSTRING_PTR(format), + &tobj->vtm, tobj->timew, TIME_UTC_P(tobj)); } str = rb_str_new(buf, len); if (buf != buffer) xfree(buf); + rb_enc_copy(str, format); return str; } @@ -2125,48 +4473,74 @@ time_strftime(VALUE time, SEL sel, VALUE format) */ static VALUE -time_mdump(VALUE time) +time_mdump(VALUE time, SEL sel) { struct time_object *tobj; - struct tm *tm; unsigned long p, s; UInt8 buf[8]; - time_t t; - int nsec; int i; VALUE str; + struct vtm vtm; + long year; + long usec, nsec; + VALUE subsecx, nano, subnano, v; + GetTimeval(time, tobj); - t = tobj->ts.tv_sec; - tm = gmtime(&t); + gmtimew(tobj->timew, &vtm); + + if (FIXNUM_P(vtm.year)) { + year = FIX2LONG(vtm.year); + if (year < 1900 || 1900+0xffff < year) + rb_raise(rb_eArgError, "year too big to marshal: %ld UTC", year); + } + else { + rb_raise(rb_eArgError, "year too big to marshal"); + } + + subsecx = vtm.subsecx; + + nano = mulquo(subsecx, INT2FIX(1000000000), INT2FIX(TIME_SCALE)); + divmodv(nano, INT2FIX(1), &v, &subnano); + nsec = FIX2LONG(v); + usec = nsec / 1000; + nsec = nsec % 1000; - if ((tm->tm_year & 0xffff) != tm->tm_year) - rb_raise(rb_eArgError, "year too big to marshal: %ld", (long)tm->tm_year); + nano = add(LONG2FIX(nsec), subnano); - p = 0x1UL << 31 | /* 1 */ - tobj->gmt << 30 | /* 1 */ - tm->tm_year << 14 | /* 16 */ - tm->tm_mon << 10 | /* 4 */ - tm->tm_mday << 5 | /* 5 */ - tm->tm_hour; /* 5 */ - s = tm->tm_min << 26 | /* 6 */ - tm->tm_sec << 20 | /* 6 */ - tobj->ts.tv_nsec / 1000; /* 20 */ - nsec = tobj->ts.tv_nsec % 1000; + p = 0x1UL << 31 | /* 1 */ + TIME_UTC_P(tobj) << 30 | /* 1 */ + (year-1900) << 14 | /* 16 */ + (vtm.mon-1) << 10 | /* 4 */ + vtm.mday << 5 | /* 5 */ + vtm.hour; /* 5 */ + s = vtm.min << 26 | /* 6 */ + vtm.sec << 20 | /* 6 */ + usec; /* 20 */ for (i=0; i<4; i++) { - buf[i] = p & 0xff; + buf[i] = (unsigned char)p; p = RSHIFT(p, 8); } for (i=4; i<8; i++) { - buf[i] = s & 0xff; + buf[i] = (unsigned char)s; s = RSHIFT(s, 8); } str = rb_bstr_new_with_data(buf, 8); rb_copy_generic_ivar(str, time); - if (nsec) { + if (!rb_equal(nano, INT2FIX(0))) { + if (TYPE(nano) == T_RATIONAL) { + rb_ivar_set(str, id_nano_num, RRATIONAL(nano)->num); + rb_ivar_set(str, id_nano_den, RRATIONAL(nano)->den); + } + else { + rb_ivar_set(str, id_nano_num, nano); + rb_ivar_set(str, id_nano_den, INT2FIX(1)); + } + } + if (nsec) { /* submicro is only for Ruby 1.9.1 compatibility */ /* * submicro is formatted in fixed-point packed BCD (without sign). * It represent digits under microsecond. @@ -2175,22 +4549,29 @@ time_mdump(VALUE time) * Extra digits are ignored for loading. */ UInt8 buf[2]; - int len = sizeof(buf); - buf[1] = (nsec % 10) << 4; + int len = (int)sizeof(buf); + buf[1] = (char)((nsec % 10) << 4); nsec /= 10; - buf[0] = nsec % 10; + buf[0] = (char)(nsec % 10); nsec /= 10; - buf[0] |= (nsec % 10) << 4; + buf[0] |= (char)((nsec % 10) << 4); if (buf[1] == 0) len = 1; rb_ivar_set(str, id_submicro, rb_bstr_new_with_data(buf, len)); } + if (!TIME_UTC_P(tobj)) { + VALUE off = time_utc_offset(time, 0), div, mod; + divmodv(off, INT2FIX(1), &div, &mod); + if (rb_equal(mod, INT2FIX(0))) + off = rb_Integer(div); + rb_ivar_set(str, id_offset, off); + } return str; } /* * call-seq: - * time._dump => string + * time._dump -> string * * Dump _time_ for marshaling. */ @@ -2201,7 +4582,7 @@ time_dump(VALUE time, SEL sel, int argc, VALUE *argv) VALUE str; rb_scan_args(argc, argv, "01", 0); - str = time_mdump(time); + str = time_mdump(time, 0); return str; } @@ -2211,23 +4592,45 @@ time_dump(VALUE time, SEL sel, int argc, VALUE *argv) */ static VALUE -time_mload(VALUE time, VALUE str) +time_mload(VALUE time, SEL sel, VALUE str) { struct time_object *tobj; + unsigned long p, s; time_t sec; long usec; - struct tm tm; - int gmt; + struct vtm vtm; + int i, gmt; long nsec; + VALUE submicro, nano_num, nano_den, offset; + wideval_t timew; time_modify(time); - VALUE submicro = rb_attr_get(str, id_submicro); + nano_num = rb_attr_get(str, id_nano_num); +#if 0 // TODO + if (nano_num != Qnil) { + st_delete(rb_generic_ivar_table(str), (st_data_t*)&id_nano_num, 0); + } +#endif + nano_den = rb_attr_get(str, id_nano_den); +#if 0 // TODO + if (nano_den != Qnil) { + st_delete(rb_generic_ivar_table(str), (st_data_t*)&id_nano_den, 0); + } +#endif + submicro = rb_attr_get(str, id_submicro); #if 0 // TODO if (submicro != Qnil) { st_delete(rb_generic_ivar_table(str), (st_data_t*)&id_submicro, 0); } #endif + offset = rb_attr_get(str, id_offset); + if (offset != Qnil) { + validate_utc_offset(offset); +#if 0 // TODO + st_delete(rb_generic_ivar_table(str), (st_data_t*)&id_offset, 0); +#endif + } rb_copy_generic_ivar(time, str); StringValue(str); @@ -2239,42 +4642,53 @@ time_mload(VALUE time, VALUE str) rb_raise(rb_eTypeError, "marshaled time format differ"); } - unsigned long p = 0; - unsigned long s = 0; - for (int i = 0; i < 4; i++) { - p |= buf[i] << (8 * i); + p = s = 0; + for (i=0; i<4; i++) { + p |= buf[i]<<(8*i); } - for (int i = 4; i < 8; i++) { - s |= buf[i] << (8 * (i - 4)); + for (i=4; i<8; i++) { + s |= buf[i]<<(8*(i-4)); } if ((p & (1UL<<31)) == 0) { gmt = 0; + offset = Qnil; sec = p; usec = s; nsec = usec * 1000; + timew = wadd(rb_time_magnify(TIMET2WV(sec)), wmulquoll(WINT2FIXWV(usec), TIME_SCALE, 1000000)); } else { p &= ~(1UL<<31); - gmt = (p >> 30) & 0x1; - tm.tm_year = (p >> 14) & 0xffff; - tm.tm_mon = (p >> 10) & 0xf; - tm.tm_mday = (p >> 5) & 0x1f; - tm.tm_hour = p & 0x1f; - tm.tm_min = (s >> 26) & 0x3f; - tm.tm_sec = (s >> 20) & 0x3f; - tm.tm_isdst = 0; - - sec = make_time_t(&tm, Qtrue); + gmt = (int)((p >> 30) & 0x1); + + vtm.year = INT2FIX(((int)(p >> 14) & 0xffff) + 1900); + vtm.mon = ((int)(p >> 10) & 0xf) + 1; + vtm.mday = (int)(p >> 5) & 0x1f; + vtm.hour = (int) p & 0x1f; + vtm.min = (int)(s >> 26) & 0x3f; + vtm.sec = (int)(s >> 20) & 0x3f; + vtm.utc_offset = INT2FIX(0); + vtm.yday = vtm.wday = 0; + vtm.isdst = 0; + vtm.zone = ""; + usec = (long)(s & 0xfffff); nsec = usec * 1000; - if (submicro != Qnil) { + + vtm.subsecx = mulquo(LONG2FIX(nsec), INT2FIX(TIME_SCALE), LONG2FIX(1000000000)); + if (nano_num != Qnil) { + VALUE nano = quo(num_exact(nano_num), num_exact(nano_den)); + vtm.subsecx = add(vtm.subsecx, mulquo(nano, INT2FIX(TIME_SCALE), LONG2FIX(1000000000))); + } + else if (submicro != Qnil) { /* for Ruby 1.9.1 compatibility */ unsigned char *ptr; long len; int digit; ptr = (unsigned char*)StringValuePtr(submicro); len = RSTRING_LEN(submicro); + nsec = 0; if (0 < len) { if (10 <= (digit = ptr[0] >> 4)) goto end_submicro; nsec += digit * 100; @@ -2285,23 +4699,29 @@ time_mload(VALUE time, VALUE str) if (10 <= (digit = ptr[1] >> 4)) goto end_submicro; nsec += digit; } + vtm.subsecx = add(vtm.subsecx, mulquo(LONG2FIX(nsec), INT2FIX(TIME_SCALE), LONG2FIX(1000000000))); end_submicro: ; } + timew = timegmw(&vtm); } - time_overflow_p(&sec, &nsec); GetTimeval(time, tobj); tobj->tm_got = 0; - tobj->gmt = gmt; - tobj->ts.tv_sec = sec; - tobj->ts.tv_nsec = nsec; + tobj->timew = timew; + if (gmt) { + TIME_SET_UTC(tobj); + } + else if (!NIL_P(offset)) { + time_set_utc_offset(time, offset); + time_fixoff(time); + } return time; } /* * call-seq: - * Time._load(string) => time + * Time._load(string) -> time * * Unmarshal a dumped +Time+ object. */ @@ -2311,32 +4731,15 @@ time_load(VALUE klass, SEL sel, VALUE str) { VALUE time = time_s_alloc(klass, 0); - time_mload(time, str); + time_mload(time, 0, str); return time; } -/* - * Time is an abstraction of dates and times. Time is - * stored internally as the number of seconds and nanoseconds since - * the Epoch, January 1, 1970 00:00 UTC. On some operating - * systems, this offset is allowed to be negative. Also see the - * library modules Date. The - * Time class treats GMT (Greenwich Mean Time) and UTC - * (Coordinated Universal Time)[Yes, UTC really does stand for - * Coordinated Universal Time. There was a committee involved.] - * as equivalent. GMT is the older way of referring to these - * baseline times but persists in the names of calls on POSIX - * systems. - * - * All times are stored with some number of nanoseconds. Be aware of - * this fact when comparing times with each other---times that are - * apparently equal when displayed may be different when compared. - */ static double imp_timeIntervalSinceReferenceDate(void *rcv, SEL sel) { - return time_since_epoch((VALUE)rcv) - SINCE_EPOCH; + return time_since_epoch((VALUE)rcv) - SINCE_EPOCH; } static void * @@ -2345,16 +4748,48 @@ imp_initWithTimeIntervalSinceReferenceDate(void *rcv, SEL sel, double interval) struct timespec ts = rb_time_timespec(DOUBLE2NUM(interval + SINCE_EPOCH)); struct time_object *tobj; GetTimeval(rcv, tobj); - tobj->ts = ts; + tobj->timew = timespec2timew(&ts); return rcv; } +/* + * Time is an abstraction of dates and times. Time is + * stored internally as the number of seconds with fraction since + * the Epoch, January 1, 1970 00:00 UTC. + * Also see the library modules Date. + * The Time class treats GMT (Greenwich Mean Time) and + * UTC (Coordinated Universal Time)[Yes, UTC really does stand for + * Coordinated Universal Time. There was a committee involved.] + * as equivalent. GMT is the older way of referring to these + * baseline times but persists in the names of calls on POSIX + * systems. + * + * All times may have fraction. Be aware of + * this fact when comparing times with each other---times that are + * apparently equal when displayed may be different when compared. + */ + void Init_Time(void) { +#undef rb_intern +#define rb_intern(str) rb_intern_const(str) + + sel_to_r = sel_registerName("to_r"); + sel_divmod = sel_registerName("divmod:"); + + id_eq = rb_intern("=="); + id_ne = rb_intern("!="); + id_quo = rb_intern("quo"); + id_div = rb_intern("div"); + id_cmp = rb_intern("<=>"); + id_lshift = rb_intern("<<"); id_divmod = rb_intern("divmod"); id_mul = rb_intern("*"); id_submicro = rb_intern("submicro"); + id_nano_num = rb_intern("nano_num"); + id_nano_den = rb_intern("nano_den"); + id_offset = rb_intern("offset"); rb_cNSDate = (VALUE)objc_getClass("NSDate"); assert(rb_cNSDate != 0); @@ -2364,10 +4799,8 @@ Init_Time(void) rb_objc_install_NSObject_special_methods((Class)rb_cTime); rb_objc_define_method(*(VALUE *)rb_cTime, "alloc", time_s_alloc, 0); - rb_objc_define_method(*(VALUE *)rb_cTime, "new", rb_class_new_instance_imp, - -1); - rb_objc_define_method(*(VALUE *)rb_cTime, "now", rb_class_new_instance_imp, - -1); + rb_objc_define_method(*(VALUE *)rb_cTime, "new", rb_class_new_instance_imp, -1); + rb_objc_define_method(*(VALUE *)rb_cTime, "now", rb_class_new_instance_imp, -1); rb_objc_define_method(*(VALUE *)rb_cTime, "at", time_s_at, -1); rb_objc_define_method(*(VALUE *)rb_cTime, "utc", time_s_mkutc, -1); rb_objc_define_method(*(VALUE *)rb_cTime, "gm", time_s_mkutc, -1); @@ -2377,16 +4810,17 @@ Init_Time(void) rb_objc_define_method(rb_cTime, "dup", rb_obj_dup, 0); rb_objc_define_method(rb_cTime, "to_i", time_to_i, 0); rb_objc_define_method(rb_cTime, "to_f", time_to_f, 0); + rb_objc_define_method(rb_cTime, "to_r", time_to_r, 0); rb_objc_define_method(rb_cTime, "<=>", time_cmp, 1); rb_objc_define_method(rb_cTime, "eql?", time_eql, 1); rb_objc_define_method(rb_cTime, "hash", time_hash, 0); - rb_objc_define_method(rb_cTime, "initialize", time_init, 0); + rb_objc_define_method(rb_cTime, "initialize", time_init, -1); rb_objc_define_method(rb_cTime, "initialize_copy", time_init_copy, 1); - rb_objc_define_method(rb_cTime, "localtime", time_localtime, 0); + rb_objc_define_method(rb_cTime, "localtime", time_localtime_m, -1); rb_objc_define_method(rb_cTime, "gmtime", time_gmtime, 0); rb_objc_define_method(rb_cTime, "utc", time_gmtime, 0); - rb_objc_define_method(rb_cTime, "getlocal", time_getlocaltime, 0); + rb_objc_define_method(rb_cTime, "getlocal", time_getlocaltime, -1); rb_objc_define_method(rb_cTime, "getgm", time_getgmtime, 0); rb_objc_define_method(rb_cTime, "getutc", time_getgmtime, 0); @@ -2400,6 +4834,8 @@ Init_Time(void) rb_objc_define_method(rb_cTime, "-", time_minus, 1); rb_objc_define_method(rb_cTime, "succ", time_succ, 0); + rb_objc_define_method(rb_cTime, "round", time_round, -1); + rb_objc_define_method(rb_cTime, "sec", time_sec, 0); rb_objc_define_method(rb_cTime, "min", time_min, 0); rb_objc_define_method(rb_cTime, "hour", time_hour, 0); @@ -2433,6 +4869,7 @@ Init_Time(void) rb_objc_define_method(rb_cTime, "usec", time_usec, 0); rb_objc_define_method(rb_cTime, "tv_nsec", time_nsec, 0); rb_objc_define_method(rb_cTime, "nsec", time_nsec, 0); + rb_objc_define_method(rb_cTime, "subsec", time_subsec, 0); rb_objc_define_method(rb_cTime, "strftime", time_strftime, 1); @@ -2441,8 +4878,12 @@ Init_Time(void) rb_objc_define_method(*(VALUE *)rb_cTime, "_load", time_load, 1); #if 0 /* Time will support marshal_dump and marshal_load in the future (1.9 maybe) */ - rb_define_method(rb_cTime, "marshal_dump", time_mdump, 0); - rb_define_method(rb_cTime, "marshal_load", time_mload, 1); + rb_objc_define_method(rb_cTime, "marshal_dump", time_mdump, 0); + rb_objc_define_method(rb_cTime, "marshal_load", time_mload, 1); +#endif + +#ifdef DEBUG_FIND_TIME_NUMGUESS + rb_define_virtual_variable("$find_time_numguess", find_time_numguess_getter, NULL); #endif Class k = (Class)rb_cTime; diff --git a/timev.h b/timev.h new file mode 100644 index 000000000..631fcf3e1 --- /dev/null +++ b/timev.h @@ -0,0 +1,21 @@ +#ifndef RUBY_TIMEV_H +#define RUBY_TIMEV_H + +struct vtm { + VALUE year; /* 2000 for example. Integer. */ + int mon; /* 1..12 */ + int mday; /* 1..31 */ + int hour; /* 0..23 */ + int min; /* 0..59 */ + int sec; /* 0..60 */ + VALUE subsecx; /* 0 <= subsecx < TIME_SCALE. possibly Rational. */ + VALUE utc_offset; /* -3600 as -01:00 for example. possibly Rational. */ + int wday; /* 0:Sunday, 1:Monday, ..., 6:Saturday */ + int yday; /* 1..366 */ + int isdst; /* 0:StandardTime 1:DayLightSavingTime */ + const char *zone; /* "JST", "EST", "EDT", etc. */ +}; + +#define TIME_SCALE 1000000000 + +#endif