diff options
| author | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-23 15:45:58 +0000 |
|---|---|---|
| committer | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-23 15:45:58 +0000 |
| commit | 3fbc9440feb66cf762834b6d66e6f3a893bab5b7 (patch) | |
| tree | fa4a94112e0354dd05fed5a6e2273f9b27142f52 /ext | |
| parent | 838af29cb12d05b45d75c84b73d2a4154935b6a2 (diff) | |
* ext/date/date_core.c (c_valid_{julian,gregorian}_p): fixed the range of month.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/date/date_core.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ext/date/date_core.c b/ext/date/date_core.c index e43415923b..bdb13a8752 100644 --- a/ext/date/date_core.c +++ b/ext/date/date_core.c @@ -693,7 +693,7 @@ c_valid_julian_p(int y, int m, int d, int *rm, int *rd) 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 @@ c_valid_gregorian_p(int y, int m, int d, int *rm, int *rd) 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 @@ valid_civil_p(VALUE y, int m, int d, double sg, 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; } |