From 4eabe8193a801fca0a6456b465217baae472ee7a Mon Sep 17 00:00:00 2001 From: tadf Date: Tue, 4 Jun 2013 22:18:12 +0000 Subject: * ext/date/date_core.c (d_lite_cmp, d_lite_equal): simplified. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++ ext/date/date_core.c | 117 +-------------------------------------------------- 2 files changed, 6 insertions(+), 115 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7cf7b6b64f..5c1ea23f8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Jun 5 07:14:18 2013 Tadayoshi Funaba + + * ext/date/date_core.c (d_lite_cmp, d_lite_equal): simplified. + Wed Jun 5 07:07:01 2013 Tadayoshi Funaba * ext/date/date_core.c: fixed a bug [ruby-core:55295]. reported diff --git a/ext/date/date_core.c b/ext/date/date_core.c index 78acf23d1c..e539402a2c 100644 --- a/ext/date/date_core.c +++ b/ext/date/date_core.c @@ -6285,8 +6285,7 @@ d_lite_cmp(VALUE self, VALUE other) m_gregorian_p(adat) == m_gregorian_p(bdat))) return cmp_dd(self, other); - if (have_jd_p(adat) && - have_jd_p(bdat)) { + { VALUE a_nth, b_nth; int a_jd, b_jd; @@ -6314,76 +6313,6 @@ d_lite_cmp(VALUE self, VALUE other) return INT2FIX(1); } } - else { -#ifndef USE_PACK - VALUE a_nth, b_nth; - int a_year, b_year, - a_mon, b_mon, - a_mday, b_mday; -#else - VALUE a_nth, b_nth; - int a_year, b_year, - 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)) { - a_year = m_year(adat); - b_year = m_year(bdat); - if (a_year == b_year) { -#ifndef USE_PACK - a_mon = m_mon(adat); - b_mon = m_mon(bdat); - if (a_mon == b_mon) { - a_mday = m_mday(adat); - b_mday = m_mday(bdat); - if (a_mday == b_mday) { - return INT2FIX(0); - } - else if (a_mday < b_mday) { - return INT2FIX(-1); - } - else { - return INT2FIX(1); - } - } - else if (a_mon < b_mon) { - return INT2FIX(-1); - } - else { - return INT2FIX(1); - } -#else - a_pd = m_pc(adat); - b_pd = m_pc(bdat); - if (a_pd == b_pd) { - return INT2FIX(0); - } - else if (a_pd < b_pd) { - return INT2FIX(-1); - } - else { - return INT2FIX(1); - } -#endif - } - else if (a_year < b_year) { - return INT2FIX(-1); - } - else { - return INT2FIX(1); - } - } - else if (f_lt_p(a_nth, b_nth)) { - return INT2FIX(-1); - } - else { - return INT2FIX(1); - } - } } } @@ -6428,8 +6357,7 @@ d_lite_equal(VALUE self, VALUE other) if (!(m_gregorian_p(adat) == m_gregorian_p(bdat))) return equal_gen(self, other); - if (have_jd_p(adat) && - have_jd_p(bdat)) { + { VALUE a_nth, b_nth; int a_jd, b_jd; @@ -6444,47 +6372,6 @@ d_lite_equal(VALUE self, VALUE other) return Qtrue; return Qfalse; } - else { -#ifndef USE_PACK - VALUE a_nth, b_nth; - int a_year, b_year, - a_mon, b_mon, - a_mday, b_mday; -#else - VALUE a_nth, b_nth; - int a_year, b_year, - 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)) { - a_year = m_year(adat); - b_year = m_year(bdat); - if (a_year == b_year) { -#ifndef USE_PACK - a_mon = m_mon(adat); - b_mon = m_mon(bdat); - if (a_mon == b_mon) { - a_mday = m_mday(adat); - b_mday = m_mday(bdat); - if (a_mday == b_mday) - return Qtrue; - } -#else - /* mon and mday only */ - a_pd = (m_pc(adat) >> MDAY_SHIFT); - b_pd = (m_pc(bdat) >> MDAY_SHIFT); - if (a_pd == b_pd) { - return Qtrue; - } -#endif - } - } - return Qfalse; - } } } -- cgit v1.2.3