[前][次][番号順一覧][スレッド一覧]

ruby-changes:29025

From: tadf <ko1@a...>
Date: Wed, 5 Jun 2013 07:09:54 +0900 (JST)
Subject: [ruby-changes:29025] tadf:r41077 (trunk): * ext/date/date_core.c: fixed a bug . reported

tadf	2013-06-05 07:09:36 +0900 (Wed, 05 Jun 2013)

  New Revision: 41077

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=41077

  Log:
    * ext/date/date_core.c: fixed a bug [ruby-core:55295].  reported
      by Riley Lynch.

  Modified files:
    trunk/ChangeLog
    trunk/ext/date/date_core.c
    trunk/test/date/test_switch_hitter.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 41076)
+++ ChangeLog	(revision 41077)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Jun  5 07:07:01 2013  Tadayoshi Funaba  <tadf@d...>
+
+	* 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@s...>
 
 	* lib/rubygems:  Update to RubyGems 2.0.3
Index: ext/date/date_core.c
===================================================================
--- ext/date/date_core.c	(revision 41076)
+++ ext/date/date_core.c	(revision 41077)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ext/date/date_core.c#L1
 /*
-  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) https://github.com/ruby/ruby/blob/trunk/ext/date/date_core.c#L1107
 	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)
 {
@@ -1192,6 +1214,16 @@ get_c_time(union DateData *x) https://github.com/ruby/ruby/blob/trunk/ext/date/date_core.c#L1214
 }
 
 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)
 {
     assert(complex_dat_p(x));
@@ -1364,6 +1396,19 @@ guess_style(VALUE y, double sg) /* -/+oo https://github.com/ruby/ruby/blob/trunk/ext/date/date_core.c#L1396
     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) https://github.com/ruby/ruby/blob/trunk/ext/date/date_core.c#L5524
 		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) https://github.com/ruby/ruby/blob/trunk/ext/date/date_core.c#L5577
 		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) https://github.com/ruby/ruby/blob/trunk/ext/date/date_core.c#L5684
 		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) https://github.com/ruby/ruby/blob/trunk/ext/date/date_core.c#L5787
 		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) https://github.com/ruby/ruby/blob/trunk/ext/date/date_core.c#L5831
 	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) https://github.com/ruby/ruby/blob/trunk/ext/date/date_core.c#L6210
 	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) https://github.com/ruby/ruby/blob/trunk/ext/date/date_core.c#L6290
 	    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) https://github.com/ruby/ruby/blob/trunk/ext/date/date_core.c#L6326
 		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) https://github.com/ruby/ruby/blob/trunk/ext/date/date_core.c#L6433
 	    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) https://github.com/ruby/ruby/blob/trunk/ext/date/date_core.c#L6456
 		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)) {
Index: test/date/test_switch_hitter.rb
===================================================================
--- test/date/test_switch_hitter.rb	(revision 41076)
+++ test/date/test_switch_hitter.rb	(revision 41077)
@@ -474,6 +474,59 @@ class TestSH < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/date/test_switch_hitter.rb#L474
     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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]