merge revision(s) r45520: [Backport ruby#9706]

nagachika · nagachika · commit f6a385bc3216 · 2014-05-27T15:19:53.000Z
* ext/date/date_core.c (d_lite_cmp): should compare with #&lt;.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46185 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Wed May 28 00:18:29 2014  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (d_lite_cmp): should compare with #<.
+
 Fri May 23 00:04:13 2014  Tanaka Akira  <akr@fsij.org>
 
 	* ext/socket/socket.c (sock_s_getnameinfo): Save errno for EAI_SYSTEM.
diff --git a/ext/date/date_core.c b/ext/date/date_core.c
@@ -6306,7 +6306,7 @@ d_lite_cmp(VALUE self, VALUE other)
 		    return INT2FIX(1);
 		}
 	    }
-	    else if (a_nth < b_nth) {
+	    else if (f_lt_p(a_nth, b_nth)) {
 		return INT2FIX(-1);
 	    }
 	    else {
diff --git a/test/date/test_switch_hitter.rb b/test/date/test_switch_hitter.rb
@@ -312,6 +312,8 @@ def test_cmp
     assert_equal(-1, Date.new(2001,2,3) <=> Rational('4903888/2'))
     assert_equal(0, Date.new(2001,2,3) <=> Rational('4903887/2'))
     assert_equal(1, Date.new(2001,2,3) <=> Rational('4903886/2'))
+
+    assert_equal(-1, Date.new(-4713,11,1,Date::GREGORIAN) <=> Date.new(-4713,12,1,Date::GREGORIAN))
   end
 
   def test_eqeqeq
diff --git a/version.h b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-05-23"
-#define RUBY_PATCHLEVEL 106
+#define RUBY_RELEASE_DATE "2014-05-28"
+#define RUBY_PATCHLEVEL 107
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_DAY 28
 
 #include "ruby/version.h"
 

Original file line number	Diff line number	Diff line change
`@@ -6306,7 +6306,7 @@ d_lite_cmp(VALUE self, VALUE other)`
`6306`	`6306`	`return INT2FIX(1);`
`6307`	`6307`	`}`
`6308`	`6308`	`}`
`6309`		`- else if (a_nth < b_nth) {`
	`6309`	`+ else if (f_lt_p(a_nth, b_nth)) {`
`6310`	`6310`	`return INT2FIX(-1);`
`6311`	`6311`	`}`
`6312`	`6312`	`else {`