tadf	2011-06-24 00:45:58 +0900 (Fri, 24 Jun 2011)

  New Revision: 32216

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

  Log:
    * ext/date/date_core.c (c_valid_{julian,gregorian}_p): fixed the range of month.

  Modified files:
    trunk/ChangeLog
    trunk/ext/date/date_core.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32215)
+++ ChangeLog	(revision 32216)
@@ -1,3 +1,7 @@
+Fri Jun 24 00:44:15 2011  Tadayoshi Funaba  <tadf@d...>
+
+	* ext/date/date_core.c (c_valid_{julian,gregorian}_p): fixed the range of month.
+
 Fri Jun 24 00:14:23 2011  Tadayoshi Funaba  <tadf@d...>
 
 	* ext/date/date_core.c: trivial changes on text.
Index: ext/date/date_core.c
===================================================================
--- ext/date/date_core.c	(revision 32215)
+++ ext/date/date_core.c	(revision 32216)
@@ -693,7 +693,7 @@
 
     if (m < 0)
 	m += 13;
-    if (m < 0 || m > 12)
+    if (m < 1 || m > 12)
 	return 0;
     last = c_julian_last_day_of_month(y, m);
     if (d < 0)
@@ -712,7 +712,7 @@
 
     if (m < 0)
 	m += 13;
-    if (m < 0 || m > 12)
+    if (m < 1 || m > 12)
 	return 0;
     last = c_gregorian_last_day_of_month(y, m);
     if (d < 0)
@@ -2114,17 +2114,16 @@
 	    decode_year(y, ns ? -1 : +1, &nth2, ry);
 	}
     }
-    else if (style > 1) {
+    else {
 	decode_year(y, style, nth, ry);
-	r = c_valid_julian_p(*ry, m, d, rm, rd);
+	if (style < 0)
+	    r = c_valid_gregorian_p(*ry, m, d, rm, rd);
+	else
+	    r = c_valid_julian_p(*ry, m, d, rm, rd);
 	if (!r)
 	    return 0;
 	c_civil_to_jd(*ry, *rm, *rd, style, rjd, ns);
     }
-    else {
-	decode_year(y, style, nth, ry);
-	r = c_valid_civil_p(*ry, m, d, style, rm, rd, rjd, ns);
-    }
     return r;
 }
 

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