diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-15 11:43:34 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-15 11:43:34 +0000 |
| commit | 7d4e89a7c09bc00e5ed00b862df19ad3c462bd37 (patch) | |
| tree | 2d3ddaad6440935328787e1845ce47e1d5ca1234 | |
| parent | b5c27d1cabde475d6fe6306e927707f10442af0e (diff) | |
merges r29234 from trunk into ruby_1_9_2.
--
* lib/date.rb: [ruby-core:32096] Thanks Colin Bartlett.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29793 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/date.rb | 4 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Sun Sep 12 21:21:50 2010 Tadayoshi Funaba <tadf@dotrb.org> + + * lib/date.rb: [ruby-core:32096] Thanks Colin Bartlett. + Tue Nov 2 21:33:43 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp> * hash.c (ruby_setenv): merged r29225 but just warning diff --git a/lib/date.rb b/lib/date.rb index 3bb0875023..e4773ef897 100644 --- a/lib/date.rb +++ b/lib/date.rb @@ -589,7 +589,7 @@ class Date # +sg+ specifies the Day of Calendar Reform. def _valid_ordinal? (y, d, sg=GREGORIAN) # :nodoc: if d < 0 - j = find_ldoy(y, sg) + return unless j = find_ldoy(y, sg) ny, nd = jd_to_ordinal(j + d + 1, sg) return unless ny == y d = nd @@ -616,7 +616,7 @@ class Date m += 13 end if d < 0 - j = find_ldom(y, m, sg) + return unless j = find_ldom(y, m, sg) ny, nm, nd = jd_to_civil(j + d + 1, sg) return unless [ny, nm] == [y, m] d = nd @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 37 +#define RUBY_PATCHLEVEL 38 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |