kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/date/date_core.c: adjust indent.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30963 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-02-26 14:35:30 +00:00
parent 7063546d64
commit fe060e0e5c
1 changed files with 145 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

290
ext/date/date_core.c
View file

@ -600,56 +600,56 @@ daydiff_to_sec(VALUE vof, int *rof)
{ {
switch (TYPE(vof)) { switch (TYPE(vof)) {
case T_FIXNUM: case T_FIXNUM:
{ {
int n; int n;
n = FIX2INT(vof); n = FIX2INT(vof);
if (n != -1 && n != 0 && n != 1) if (n != -1 && n != 0 && n != 1)
return 0; return 0;
*rof = n * DAY_IN_SECONDS; *rof = n * DAY_IN_SECONDS;
return 1; return 1;
} }
case T_FLOAT: case T_FLOAT:
{ {
double n; double n;
n = NUM2DBL(vof); n = NUM2DBL(vof);
if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS) if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS)
return 0; return 0;
*rof = round(n * DAY_IN_SECONDS); *rof = round(n * DAY_IN_SECONDS);
return 1; return 1;
} }
case T_RATIONAL: case T_RATIONAL:
{ {
VALUE vs = f_mul(vof, INT2FIX(DAY_IN_SECONDS)); VALUE vs = f_mul(vof, INT2FIX(DAY_IN_SECONDS));
VALUE vn = RRATIONAL(vs)->num; VALUE vn = RRATIONAL(vs)->num;
VALUE vd = RRATIONAL(vs)->den; VALUE vd = RRATIONAL(vs)->den;
int n, d; int n, d;
if (!FIXNUM_P(vn) || !FIXNUM_P(vd)) if (!FIXNUM_P(vn) || !FIXNUM_P(vd))
return 0; return 0;
n = FIX2INT(vn); n = FIX2INT(vn);
d = FIX2INT(vd); d = FIX2INT(vd);
if (d != 1) if (d != 1)
return 0; return 0;
if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS) if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS)
return 0; return 0;
*rof = n; *rof = n;
return 1; return 1;
} }
case T_STRING: case T_STRING:
{ {
VALUE vs = rb_funcall(cDate, rb_intern("zone_to_diff"), 1, vof); VALUE vs = rb_funcall(cDate, rb_intern("zone_to_diff"), 1, vof);
int n; int n;
if (!FIXNUM_P(vs)) if (!FIXNUM_P(vs))
return 0; return 0;
n = FIX2INT(vs); n = FIX2INT(vs);
if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS) if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS)
return 0; return 0;
*rof = n; *rof = n;
return 1; return 1;
} }
} }
return 0; return 0;
} }
@ -1666,28 +1666,28 @@ d_lite_plus(VALUE self, VALUE other)
switch (TYPE(other)) { switch (TYPE(other)) {
case T_FIXNUM: case T_FIXNUM:
{ {
long jd; long jd;
get_d_jd(dat); get_d_jd(dat);
jd = dat->l.jd + FIX2LONG(other); jd = dat->l.jd + FIX2LONG(other);
if (LIGHTABLE_JD(jd) && jd >= dat->l.sg) if (LIGHTABLE_JD(jd) && jd >= dat->l.sg)
return d_lite_s_new_internal(CLASS_OF(self), return d_lite_s_new_internal(CLASS_OF(self),
jd, dat->l.sg, jd, dat->l.sg,
0, 0, 0, 0, 0, 0,
dat->l.flags & ~HAVE_CIVIL); dat->l.flags & ~HAVE_CIVIL);
} }
break; break;
case T_FLOAT: case T_FLOAT:
{ {
double d = NUM2DBL(other); double d = NUM2DBL(other);
long l = round(d); long l = round(d);
if (l == d && LIGHTABLE_JD(l)) if (l == d && LIGHTABLE_JD(l))
return d_lite_plus(self, INT2FIX(l)); return d_lite_plus(self, INT2FIX(l));
} }
break; break;
} }
return iforwardop("plus_r"); return iforwardop("plus_r");
} }
@ -1758,7 +1758,7 @@ d_lite_minus(VALUE self, VALUE other)
d = adat->l.jd - bdat->l.jd; d = adat->l.jd - bdat->l.jd;
return rb_rational_new1(LONG2NUM(d)); return rb_rational_new1(LONG2NUM(d));
} }
} }
switch (TYPE(other)) { switch (TYPE(other)) {
case T_FIXNUM: case T_FIXNUM:
@ -2948,102 +2948,102 @@ dt_lite_plus(VALUE self, VALUE other)
switch (TYPE(other)) { switch (TYPE(other)) {
case T_FIXNUM: case T_FIXNUM:
{ {
long jd; long jd;
get_dt1(self); get_dt1(self);
get_dt_jd(dat); get_dt_jd(dat);
get_dt_df(dat); get_dt_df(dat);
jd = dat->l.jd + FIX2LONG(other); jd = dat->l.jd + FIX2LONG(other);
if (LIGHTABLE_JD(jd) && jd >= dat->l.sg) if (LIGHTABLE_JD(jd) && jd >= dat->l.sg)
return dt_lite_s_new_internal(CLASS_OF(self), return dt_lite_s_new_internal(CLASS_OF(self),
jd, jd,
dat->l.df, dat->l.df,
dat->l.sf, dat->l.sf,
dat->l.of, dat->l.of,
dat->l.sg, dat->l.sg,
0, 0, 0, 0, 0, 0,
dat->l.hour, dat->l.hour,
dat->l.min, dat->l.min,
dat->l.sec, dat->l.sec,
dat->l.flags & ~HAVE_CIVIL); dat->l.flags & ~HAVE_CIVIL);
} }
break; break;
case T_FLOAT: case T_FLOAT:
{ {
long jd, df; long jd, df;
long long sf; long long sf;
long double o; long double o;
int s; int s;
get_dt1(self); get_dt1(self);
get_dt_jd(dat); get_dt_jd(dat);
get_dt_df(dat); get_dt_df(dat);
jd = dat->l.jd; jd = dat->l.jd;
o = NUM2DBL(other); o = NUM2DBL(other);
if (o < 0) { if (o < 0) {
s = -1; s = -1;
o = -o; o = -o;
} }
else else
s = +1; s = +1;
jd = (long)floorl(o); jd = (long)floorl(o);
o = o - jd; o = o - jd;
o *= DAY_IN_SECONDS; o *= DAY_IN_SECONDS;
df = (long)floorl(o); df = (long)floorl(o);
o = o - df; o = o - df;
o *= SECOND_IN_NANOSECONDS; o *= SECOND_IN_NANOSECONDS;
sf = (long)roundl(o); sf = (long)roundl(o);
if (s < 0) { if (s < 0) {
jd = -jd; jd = -jd;
df = -df; df = -df;
sf = -sf; sf = -sf;
} }
sf = dat->l.sf + sf; sf = dat->l.sf + sf;
if (sf < 0) { if (sf < 0) {
df -= 1; df -= 1;
sf += SECOND_IN_NANOSECONDS; sf += SECOND_IN_NANOSECONDS;
} }
else if (sf >= SECOND_IN_NANOSECONDS) { else if (sf >= SECOND_IN_NANOSECONDS) {
df += 1; df += 1;
sf -= SECOND_IN_NANOSECONDS; sf -= SECOND_IN_NANOSECONDS;
} }
df = dat->l.df + df; df = dat->l.df + df;
if (df < 0) { if (df < 0) {
jd -= 1; jd -= 1;
df += DAY_IN_SECONDS; df += DAY_IN_SECONDS;
} }
else if (df >= DAY_IN_SECONDS) { else if (df >= DAY_IN_SECONDS) {
jd += 1; jd += 1;
df -= DAY_IN_SECONDS; df -= DAY_IN_SECONDS;
} }
jd = dat->l.jd + jd; jd = dat->l.jd + jd;
if (LIGHTABLE_JD(jd) && jd >= dat->l.sg) if (LIGHTABLE_JD(jd) && jd >= dat->l.sg)
return dt_lite_s_new_internal(CLASS_OF(self), return dt_lite_s_new_internal(CLASS_OF(self),
jd, jd,
df, df,
sf, sf,
dat->l.of, dat->l.of,
dat->l.sg, dat->l.sg,
0, 0, 0, 0, 0, 0,
dat->l.hour, dat->l.hour,
dat->l.min, dat->l.min,
dat->l.sec, dat->l.sec,
dat->l.flags & dat->l.flags &
~HAVE_CIVIL & ~HAVE_CIVIL &
~HAVE_TIME); ~HAVE_TIME);
} }
break; break;
} }
return iforwardop("plus_r"); return iforwardop("plus_r");
} }