зеркало из https://github.com/github/ruby.git
* ext/date/date_core.c: fixed a bug [ruby-core:55295]. reported
by Riley Lynch. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf
Родитель
091c24d51b
Коммит
551bcc6364
|
|
@ -1,3 +1,8 @@
|
|||
Wed Jun 5 07:07:01 2013 Tadayoshi Funaba <tadf@dotrb.org>
|
||||
|
||||
* ext/date/date_core.c: fixed a bug [ruby-core:55295]. reported
|
||||
by Riley Lynch.
|
||||
|
||||
Wed Jun 5 06:44:08 2013 Eric Hodel <drbrain@segment7.net>
|
||||
|
||||
* lib/rubygems: Update to RubyGems 2.0.3
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
date_core.c: Coded by Tadayoshi Funaba 2010-2012
|
||||
date_core.c: Coded by Tadayoshi Funaba 2010-2013
|
||||
*/
|
||||
|
||||
#include "ruby.h"
|
||||
|
|
@ -1107,6 +1107,28 @@ m_virtual_sg(union DateData *x)
|
|||
return c_virtual_sg(x);
|
||||
}
|
||||
|
||||
#define canonicalize_jd(_nth, _jd) \
|
||||
{\
|
||||
if (_jd < 0) {\
|
||||
_nth = f_sub(_nth, INT2FIX(1));\
|
||||
_jd += CM_PERIOD;\
|
||||
}\
|
||||
if (_jd >= CM_PERIOD) {\
|
||||
_nth = f_add(_nth, INT2FIX(1));\
|
||||
_jd -= CM_PERIOD;\
|
||||
}\
|
||||
}
|
||||
|
||||
inline static void
|
||||
canonicalize_s_jd(union DateData *x)
|
||||
{
|
||||
int j = x->s.jd;
|
||||
assert(have_jd_p(x));
|
||||
canonicalize_jd(x->s.nth, x->s.jd);
|
||||
if (x->s.jd != j)
|
||||
x->flags &= ~HAVE_CIVIL;
|
||||
}
|
||||
|
||||
inline static void
|
||||
get_s_jd(union DateData *x)
|
||||
{
|
||||
|
|
@ -1191,6 +1213,16 @@ get_c_time(union DateData *x)
|
|||
}
|
||||
}
|
||||
|
||||
inline static void
|
||||
canonicalize_c_jd(union DateData *x)
|
||||
{
|
||||
int j = x->c.jd;
|
||||
assert(have_jd_p(x));
|
||||
canonicalize_jd(x->c.nth, x->c.jd);
|
||||
if (x->c.jd != j)
|
||||
x->flags &= ~HAVE_CIVIL;
|
||||
}
|
||||
|
||||
inline static void
|
||||
get_c_jd(union DateData *x)
|
||||
{
|
||||
|
|
@ -1364,6 +1396,19 @@ guess_style(VALUE y, double sg) /* -/+oo or zero */
|
|||
return style;
|
||||
}
|
||||
|
||||
inline static void
|
||||
m_canonicalize_jd(union DateData *x)
|
||||
{
|
||||
if (simple_dat_p(x)) {
|
||||
get_s_jd(x);
|
||||
canonicalize_s_jd(x);
|
||||
}
|
||||
else {
|
||||
get_c_jd(x);
|
||||
canonicalize_c_jd(x);
|
||||
}
|
||||
}
|
||||
|
||||
inline static VALUE
|
||||
m_nth(union DateData *x)
|
||||
{
|
||||
|
|
@ -5479,15 +5524,7 @@ d_lite_plus(VALUE self, VALUE other)
|
|||
jd = m_jd(dat);
|
||||
else {
|
||||
jd = m_jd(dat) + (int)t;
|
||||
|
||||
if (jd < 0) {
|
||||
nth = f_sub(nth, INT2FIX(1));
|
||||
jd += CM_PERIOD;
|
||||
}
|
||||
else if (jd >= CM_PERIOD) {
|
||||
nth = f_add(nth, INT2FIX(1));
|
||||
jd -= CM_PERIOD;
|
||||
}
|
||||
canonicalize_jd(nth, jd);
|
||||
}
|
||||
|
||||
if (simple_dat_p(dat))
|
||||
|
|
@ -5540,14 +5577,7 @@ d_lite_plus(VALUE self, VALUE other)
|
|||
jd = m_jd(dat);
|
||||
else {
|
||||
jd = m_jd(dat) + jd;
|
||||
if (jd < 0) {
|
||||
nth = f_sub(nth, INT2FIX(1));
|
||||
jd += CM_PERIOD;
|
||||
}
|
||||
else if (jd >= CM_PERIOD) {
|
||||
nth = f_add(nth, INT2FIX(1));
|
||||
jd -= CM_PERIOD;
|
||||
}
|
||||
canonicalize_jd(nth, jd);
|
||||
}
|
||||
|
||||
if (f_zero_p(nth))
|
||||
|
|
@ -5654,14 +5684,7 @@ d_lite_plus(VALUE self, VALUE other)
|
|||
jd = m_jd(dat);
|
||||
else {
|
||||
jd = m_jd(dat) + jd;
|
||||
if (jd < 0) {
|
||||
nth = f_sub(nth, INT2FIX(1));
|
||||
jd += CM_PERIOD;
|
||||
}
|
||||
else if (jd >= CM_PERIOD) {
|
||||
nth = f_add(nth, INT2FIX(1));
|
||||
jd -= CM_PERIOD;
|
||||
}
|
||||
canonicalize_jd(nth, jd);
|
||||
}
|
||||
|
||||
if (f_zero_p(nth))
|
||||
|
|
@ -5764,14 +5787,7 @@ d_lite_plus(VALUE self, VALUE other)
|
|||
jd = m_jd(dat);
|
||||
else {
|
||||
jd = m_jd(dat) + jd;
|
||||
if (jd < 0) {
|
||||
nth = f_sub(nth, INT2FIX(1));
|
||||
jd += CM_PERIOD;
|
||||
}
|
||||
else if (jd >= CM_PERIOD) {
|
||||
nth = f_add(nth, INT2FIX(1));
|
||||
jd -= CM_PERIOD;
|
||||
}
|
||||
canonicalize_jd(nth, jd);
|
||||
}
|
||||
|
||||
if (f_zero_p(nth))
|
||||
|
|
@ -5815,15 +5831,7 @@ minus_dd(VALUE self, VALUE other)
|
|||
d = m_jd(adat) - m_jd(bdat);
|
||||
df = m_df(adat) - m_df(bdat);
|
||||
sf = f_sub(m_sf(adat), m_sf(bdat));
|
||||
|
||||
if (d < 0) {
|
||||
n = f_sub(n, INT2FIX(1));
|
||||
d += CM_PERIOD;
|
||||
}
|
||||
else if (d >= CM_PERIOD) {
|
||||
n = f_add(n, INT2FIX(1));
|
||||
d -= CM_PERIOD;
|
||||
}
|
||||
canonicalize_jd(n, d);
|
||||
|
||||
if (df < 0) {
|
||||
d -= 1;
|
||||
|
|
@ -6202,6 +6210,8 @@ cmp_dd(VALUE self, VALUE other)
|
|||
int a_jd, b_jd,
|
||||
a_df, b_df;
|
||||
|
||||
m_canonicalize_jd(adat);
|
||||
m_canonicalize_jd(bdat);
|
||||
a_nth = m_nth(adat);
|
||||
b_nth = m_nth(bdat);
|
||||
if (f_eqeq_p(a_nth, b_nth)) {
|
||||
|
|
@ -6280,6 +6290,8 @@ d_lite_cmp(VALUE self, VALUE other)
|
|||
VALUE a_nth, b_nth;
|
||||
int a_jd, b_jd;
|
||||
|
||||
m_canonicalize_jd(adat);
|
||||
m_canonicalize_jd(bdat);
|
||||
a_nth = m_nth(adat);
|
||||
b_nth = m_nth(bdat);
|
||||
if (f_eqeq_p(a_nth, b_nth)) {
|
||||
|
|
@ -6314,6 +6326,8 @@ d_lite_cmp(VALUE self, VALUE other)
|
|||
a_pd, b_pd;
|
||||
#endif
|
||||
|
||||
m_canonicalize_jd(adat);
|
||||
m_canonicalize_jd(bdat);
|
||||
a_nth = m_nth(adat);
|
||||
b_nth = m_nth(bdat);
|
||||
if (f_eqeq_p(a_nth, b_nth)) {
|
||||
|
|
@ -6419,6 +6433,8 @@ d_lite_equal(VALUE self, VALUE other)
|
|||
VALUE a_nth, b_nth;
|
||||
int a_jd, b_jd;
|
||||
|
||||
m_canonicalize_jd(adat);
|
||||
m_canonicalize_jd(bdat);
|
||||
a_nth = m_nth(adat);
|
||||
b_nth = m_nth(bdat);
|
||||
a_jd = m_local_jd(adat);
|
||||
|
|
@ -6440,6 +6456,8 @@ d_lite_equal(VALUE self, VALUE other)
|
|||
a_pd, b_pd;
|
||||
#endif
|
||||
|
||||
m_canonicalize_jd(adat);
|
||||
m_canonicalize_jd(bdat);
|
||||
a_nth = m_nth(adat);
|
||||
b_nth = m_nth(bdat);
|
||||
if (f_eqeq_p(a_nth, b_nth)) {
|
||||
|
|
|
|||
|
|
@ -474,6 +474,59 @@ class TestSH < Test::Unit::TestCase
|
|||
period2_iter(+cm_period * (1 << 64) - 3, +cm_period * (1 << 64) + 3)
|
||||
end
|
||||
|
||||
def test_different_alignments
|
||||
assert_equal(0, Date.jd(0) <=> Date.civil(-4713, 11, 24, Date::GREGORIAN))
|
||||
assert_equal(0, Date.jd(213447717) <=> Date.civil(579687, 11, 24))
|
||||
assert_equal(0, Date.jd(-213447717) <=> Date.civil(-589113, 11, 24, Date::GREGORIAN))
|
||||
|
||||
assert_equal(0, Date.jd(0) <=> DateTime.civil(-4713, 11, 24, 0, 0, 0, 0, Date::GREGORIAN))
|
||||
assert_equal(0, Date.jd(213447717) <=> DateTime.civil(579687, 11, 24))
|
||||
assert_equal(0, Date.jd(-213447717) <=> DateTime.civil(-589113, 11, 24, 0, 0, 0, 0, Date::GREGORIAN))
|
||||
|
||||
assert(Date.jd(0) == Date.civil(-4713, 11, 24, Date::GREGORIAN))
|
||||
assert(Date.jd(213447717) == Date.civil(579687, 11, 24))
|
||||
assert(Date.jd(-213447717) == Date.civil(-589113, 11, 24, Date::GREGORIAN))
|
||||
|
||||
assert(Date.jd(0) == DateTime.civil(-4713, 11, 24, 0, 0, 0, 0, Date::GREGORIAN))
|
||||
assert(Date.jd(213447717) == DateTime.civil(579687, 11, 24))
|
||||
assert(Date.jd(-213447717) == DateTime.civil(-589113, 11, 24, 0, 0, 0, 0, Date::GREGORIAN))
|
||||
|
||||
assert(Date.jd(0) === Date.civil(-4713, 11, 24, Date::GREGORIAN))
|
||||
assert(Date.jd(213447717) === Date.civil(579687, 11, 24))
|
||||
assert(Date.jd(-213447717) === Date.civil(-589113, 11, 24, Date::GREGORIAN))
|
||||
|
||||
assert(Date.jd(0) === DateTime.civil(-4713, 11, 24, 12, 0, 0, 0, Date::GREGORIAN))
|
||||
assert(Date.jd(213447717) === DateTime.civil(579687, 11, 24, 12))
|
||||
assert(Date.jd(-213447717) === DateTime.civil(-589113, 11, 24, 12, 0, 0, 0, Date::GREGORIAN))
|
||||
|
||||
a = Date.jd(0)
|
||||
b = Date.civil(-4713, 11, 24, Date::GREGORIAN)
|
||||
assert_equal(0, a <=> b)
|
||||
|
||||
a = Date.civil(-4712, 1, 1, Date::JULIAN)
|
||||
b = Date.civil(-4713, 11, 24, Date::GREGORIAN)
|
||||
a.jd; b.jd
|
||||
assert_equal(0, a <=> b)
|
||||
|
||||
a = Date.jd(0)
|
||||
b = Date.civil(-4713, 11, 24, Date::GREGORIAN)
|
||||
assert(a == b)
|
||||
|
||||
a = Date.civil(-4712, 1, 1, Date::JULIAN)
|
||||
b = Date.civil(-4713, 11, 24, Date::GREGORIAN)
|
||||
a.jd; b.jd
|
||||
assert(a == b)
|
||||
|
||||
a = Date.jd(0)
|
||||
b = Date.civil(-4713, 11, 24, Date::GREGORIAN)
|
||||
assert(a === b)
|
||||
|
||||
a = Date.civil(-4712, 1, 1, Date::JULIAN)
|
||||
b = Date.civil(-4713, 11, 24, Date::GREGORIAN)
|
||||
a.jd; b.jd
|
||||
assert(a === b)
|
||||
end
|
||||
|
||||
def test_marshal14
|
||||
s = "\x04\x03u:\x01\x04Date\x01\v\x04\x03[\x01\x02i\x03\xE8i%T"
|
||||
d = Marshal.load(s)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче