kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/date/date_strptime.c (date__strptime_internal): do not overwrite century.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45728 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2014-04-27 10:44:23 +00:00
parent 264b4150eb
commit bb05bcde01
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sun Apr 27 19:39:42 2014 Tadayoshi Funaba <tadf@dotrb.org>
* ext/date/date_strptime.c (date__strptime_internal): do not overwrite century.
Sat Apr 26 11:50:08 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* test/ruby/test_enum.rb (test_flat_map): Added test for flat_map.

10
ext/date/date_strptime.c
View file

@ -291,8 +291,9 @@ date__strptime_internal(const char *str, size_t slen,
if (!valid_range_p(n, 0, 99))
fail();
set_hash("cwyear",n);
set_hash("_cent",
INT2FIX(f_ge_p(n, INT2FIX(69)) ? 19 : 20));
if (NIL_P(ref_hash("_cent")))
set_hash("_cent",
INT2FIX(f_ge_p(n, INT2FIX(69)) ? 19 : 20));
goto matched;
}
@ -556,8 +557,9 @@ date__strptime_internal(const char *str, size_t slen,
if (sign == -1)
n = f_negate(n);
set_hash("year", n);
set_hash("_cent",
INT2FIX(f_ge_p(n, INT2FIX(69)) ? 19 : 20));
if (NIL_P(ref_hash("_cent")))
set_hash("_cent",
INT2FIX(f_ge_p(n, INT2FIX(69)) ? 19 : 20));
goto matched;
}

4
test/date/test_date_strptime.rb
View file

@ -195,8 +195,12 @@ class TestDateStrptime < Test::Unit::TestCase
[['01', '%y'], [2001,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
[['19 99', '%C %y'], [1999,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
[['20 01', '%C %y'], [2001,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
[['30 99', '%C %y'], [3099,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
[['30 01', '%C %y'], [3001,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
[['1999', '%C%y'], [1999,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
[['2001', '%C%y'], [2001,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
[['3099', '%C%y'], [3099,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
[['3001', '%C%y'], [3001,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
[['20060806', '%Y'], [20060806,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
[['20060806', "%Y\s"], [20060806,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],