Skip to content

Commit

Permalink
* ext/date/date_{core,strftime}.c: use struct tmx instead of vtm.
Browse files Browse the repository at this point in the history 
	* ext/date/date_tmx.h: new.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
tadf committed Apr 16, 2011
1 parent 531dfb4 commit 2b6ab9b
Show file tree
Hide file tree
Showing 5 changed files with 141 additions and 142 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
View file
@@ -1,3 +1,8 @@
Sun Apr 17 00:20:14 2011 Tadayoshi Funaba <tadf@dotrb.org>

* ext/date/date_{core,strftime}.c: use struct tmx instead of vtm.
* ext/date/date_tmx.h: new.

Sat Apr 16 22:23:52 2011 Tadayoshi Funaba <tadf@dotrb.org>

* ext/date/date_strftime.c (date_strftime_wo_timespec): changed
Expand Down
142 changes: 68 additions & 74 deletions ext/date/date_core.c
View file
Expand Up @@ -2402,16 +2402,16 @@ d_lite_inspect(VALUE self)
}

#include <errno.h>
#include "timev.h"
#include "date_tmx.h"

size_t
date_strftime(char *s, size_t maxsize, const char *format,
const struct vtm *vtm, VALUE timev);
const struct tmx *tmx);

#define SMALLBUF 100
static size_t
date_strftime_alloc(char **buf, const char *format,
struct vtm *vtm, VALUE timev)
struct tmx *tmx)
{
size_t size, len, flen;

Expand All @@ -2421,12 +2421,12 @@ date_strftime_alloc(char **buf, const char *format,
return 0;
}
errno = 0;
len = date_strftime(*buf, SMALLBUF, format, vtm, timev);
len = date_strftime(*buf, SMALLBUF, format, tmx);
if (len != 0 || (**buf == '\0' && errno != ERANGE)) return len;
for (size=1024; ; size*=2) {
*buf = xmalloc(size);
(*buf)[0] = '\0';
len = date_strftime(*buf, size, format, vtm, timev);
len = date_strftime(*buf, size, format, tmx);
/*
* buflen can be zero EITHER because there's not enough
* room in the string, or because the control command
Expand All @@ -2441,61 +2441,57 @@ date_strftime_alloc(char **buf, const char *format,
}

static void
d_lite_set_vtm_and_timev(VALUE self, struct vtm *vtm, VALUE *timev)
d_lite_set_tmx(VALUE self, struct tmx *tmx)
{
get_d1(self);

if (!light_mode_p(dat)) {
vtm->year = iforward0("year_r");
vtm->mon = FIX2INT(iforward0("mon_r"));
vtm->mday = FIX2INT(iforward0("mday_r"));
vtm->hour = FIX2INT(iforward0("hour_r"));
vtm->min = FIX2INT(iforward0("min_r"));
vtm->sec = FIX2INT(iforward0("sec_r"));
vtm->subsecx = iforward0("sec_fraction_r");
vtm->utc_offset = INT2FIX(0);
vtm->wday = FIX2INT(iforward0("wday_r"));
vtm->yday = FIX2INT(iforward0("yday_r"));
vtm->isdst = 0;
vtm->zone = RSTRING_PTR(iforward0("zone_r"));
*timev = f_mul(f_sub(dat->r.ajd,
rb_rational_new2(INT2FIX(4881175), INT2FIX(2))),
INT2FIX(86400));
tmx->year = iforward0("year_r");
tmx->yday = FIX2INT(iforward0("yday_r"));
tmx->mon = FIX2INT(iforward0("mon_r"));
tmx->mday = FIX2INT(iforward0("mday_r"));
tmx->hour = FIX2INT(iforward0("hour_r"));
tmx->min = FIX2INT(iforward0("min_r"));
tmx->sec = FIX2INT(iforward0("sec_r"));
tmx->wday = FIX2INT(iforward0("wday_r"));
tmx->offset = INT2FIX(0);
tmx->zone = RSTRING_PTR(iforward0("zone_r"));
tmx->timev = f_mul(f_sub(dat->r.ajd,
rb_rational_new2(INT2FIX(4881175),
INT2FIX(2))),
INT2FIX(86400));
}
else {
get_d_jd(dat);
get_d_civil(dat);

vtm->year = LONG2NUM(dat->l.year);
vtm->mon = dat->l.mon;
vtm->mday = dat->l.mday;
vtm->hour = 0;
vtm->min = 0;
vtm->sec = 0;
vtm->subsecx = INT2FIX(0);
vtm->utc_offset = INT2FIX(0);
vtm->wday = jd_to_wday(dat->l.jd);
vtm->yday = civil_to_yday(dat->l.year, dat->l.mon, dat->l.mday);
vtm->isdst = 0;
vtm->zone = "+00:00";
*timev = f_mul(INT2FIX(dat->l.jd - 2440588),
INT2FIX(86400));
tmx->year = LONG2NUM(dat->l.year);
tmx->yday = civil_to_yday(dat->l.year, dat->l.mon, dat->l.mday);
tmx->mon = dat->l.mon;
tmx->mday = dat->l.mday;
tmx->hour = 0;
tmx->min = 0;
tmx->sec = 0;
tmx->wday = jd_to_wday(dat->l.jd);
tmx->offset = INT2FIX(0);
tmx->zone = "+00:00";
tmx->timev = f_mul(INT2FIX(dat->l.jd - 2440588),
INT2FIX(86400));
}
}

static VALUE
date_strftime_internal(int argc, VALUE *argv, VALUE self,
const char *default_fmt,
void (*func)(VALUE, struct vtm *, VALUE *))
void (*func)(VALUE, struct tmx *))
{
get_d1(self);
{
VALUE vfmt;
const char *fmt;
long len;
char buffer[SMALLBUF], *buf = buffer;
struct vtm vtm;
VALUE timev;
struct tmx tmx;
VALUE str;

rb_scan_args(argc, argv, "01", &vfmt);
Expand All @@ -2511,14 +2507,14 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
}
fmt = RSTRING_PTR(vfmt);
len = RSTRING_LEN(vfmt);
(*func)(self, &vtm, &timev);
(*func)(self, &tmx);
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 = date_strftime_alloc(&buf, p, &vtm, timev);
len = date_strftime_alloc(&buf, p, &tmx);
rb_str_cat(str, buf, len);
p += strlen(p);
if (buf != buffer) {
Expand All @@ -2531,7 +2527,7 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
return str;
}
else
len = date_strftime_alloc(&buf, fmt, &vtm, timev);
len = date_strftime_alloc(&buf, fmt, &tmx);

str = rb_str_new(buf, len);
if (buf != buffer) xfree(buf);
Expand All @@ -2550,7 +2546,7 @@ static VALUE
d_lite_strftime(int argc, VALUE *argv, VALUE self)
{
return date_strftime_internal(argc, argv, self,
"%F", d_lite_set_vtm_and_timev);
"%F", d_lite_set_tmx);
}

/*
Expand Down Expand Up @@ -4046,47 +4042,45 @@ dt_lite_inspect(VALUE self)
}

static void
dt_lite_set_vtm_and_timev(VALUE self, struct vtm *vtm, VALUE *timev)
dt_lite_set_tmx(VALUE self, struct tmx *tmx)
{
get_dt1(self);

if (!light_mode_p(dat)) {
vtm->year = iforward0("year_r");
vtm->mon = FIX2INT(iforward0("mon_r"));
vtm->mday = FIX2INT(iforward0("mday_r"));
vtm->hour = FIX2INT(iforward0("hour_r"));
vtm->min = FIX2INT(iforward0("min_r"));
vtm->sec = FIX2INT(iforward0("sec_r"));
vtm->subsecx = iforward0("sec_fraction_r");
vtm->utc_offset = INT2FIX(0);
vtm->wday = FIX2INT(iforward0("wday_r"));
vtm->yday = FIX2INT(iforward0("yday_r"));
vtm->isdst = 0;
vtm->zone = RSTRING_PTR(iforward0("zone_r"));
*timev = f_mul(f_sub(dat->r.ajd,
rb_rational_new2(INT2FIX(4881175), INT2FIX(2))),
INT2FIX(86400));
tmx->year = iforward0("year_r");
tmx->yday = FIX2INT(iforward0("yday_r"));
tmx->mon = FIX2INT(iforward0("mon_r"));
tmx->mday = FIX2INT(iforward0("mday_r"));
tmx->hour = FIX2INT(iforward0("hour_r"));
tmx->min = FIX2INT(iforward0("min_r"));
tmx->sec = FIX2INT(iforward0("sec_r"));
tmx->wday = FIX2INT(iforward0("wday_r"));
tmx->offset = INT2FIX(0);
tmx->zone = RSTRING_PTR(iforward0("zone_r"));
tmx->timev = f_mul(f_sub(dat->r.ajd,
rb_rational_new2(INT2FIX(4881175),
INT2FIX(2))),
INT2FIX(86400));
}
else {
get_dt_jd(dat);
get_dt_civil(dat);
get_dt_time(dat);

vtm->year = LONG2NUM(dat->l.year);
vtm->mon = dat->l.mon;
vtm->mday = dat->l.mday;
vtm->hour = dat->l.hour;
vtm->min = dat->l.min;
vtm->sec = dat->l.sec;
vtm->subsecx = LONG2NUM(dat->l.sf);
vtm->utc_offset = INT2FIX(dat->l.of);
vtm->wday = jd_to_wday(local_jd(dat));
vtm->yday = civil_to_yday(dat->l.year, dat->l.mon, dat->l.mday);
vtm->isdst = 0;
vtm->zone = RSTRING_PTR(dt_lite_zone(self));
*timev = f_mul(f_sub(dt_lite_ajd(self),
rb_rational_new2(INT2FIX(4881175), INT2FIX(2))),
INT2FIX(86400));
tmx->year = LONG2NUM(dat->l.year);
tmx->yday = civil_to_yday(dat->l.year, dat->l.mon, dat->l.mday);
tmx->mon = dat->l.mon;
tmx->mday = dat->l.mday;
tmx->hour = dat->l.hour;
tmx->min = dat->l.min;
tmx->sec = dat->l.sec;
tmx->wday = jd_to_wday(local_jd(dat));
tmx->offset = INT2FIX(dat->l.of);
tmx->zone = RSTRING_PTR(dt_lite_zone(self));
tmx->timev = f_mul(f_sub(dt_lite_ajd(self),
rb_rational_new2(INT2FIX(4881175),
INT2FIX(2))),
INT2FIX(86400));
}
}

Expand All @@ -4100,7 +4094,7 @@ static VALUE
dt_lite_strftime(int argc, VALUE *argv, VALUE self)
{
return date_strftime_internal(argc, argv, self,
"%FT%T%:z", dt_lite_set_vtm_and_timev);
"%FT%T%:z", dt_lite_set_tmx);
}

/*
Expand Down

0 comments on commit 2b6ab9b

Please sign in to comment.