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

* time.c (time_init_1): Time.new will accept seconds as string or

Browse source 
int.  [ruby-core:43569][Bug #6193]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35122 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-03-24 13:22:22 +00:00
parent 463633e4a9
commit 28e48d3fd8
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Mar 24 22:22:18 2012 Sambasiva Rao Suda <sambasivarao@gmail.org>
* time.c (time_init_1): Time.new will accept seconds as string or
int. [ruby-core:43569][Bug #6193]
Fri Mar 23 15:12:12 2012 Martin Duerst <duerst@it.aoyama.ac.jp>
* transcode.c (documentation for str_encode): Explain

7
test/ruby/test_time.rb
View file

@ -744,4 +744,11 @@ class TestTime < Test::Unit::TestCase
end
assert_equal("Insecure: can't modify #{tc}", error.message, bug5036)
end
def test_sec_str
bug6193 = '[ruby-core:43569]'
t = nil
assert_nothing_raised(bug6193) {t = Time.new(2012, 1, 2, 3, 4, "5")}
assert_equal(Time.new(2012, 1, 2, 3, 4, 5), t, bug6193)
end
end

10
time.c
View file

@ -845,6 +845,7 @@ static VALUE obj2vint(VALUE obj);
static int month_arg(VALUE arg);
static void validate_utc_offset(VALUE utc_offset);
static void validate_vtm(struct vtm *vtm);
static int obj2subsecx(VALUE obj, VALUE *subsecx);
static VALUE time_gmtime(VALUE);
static VALUE time_localtime(VALUE);
@ -2156,15 +2157,8 @@ time_init_1(int argc, VALUE *argv, VALUE time)
vtm.min = NIL_P(v[4]) ? 0 : obj2int(v[4]);
vtm.sec = 0;
vtm.subsecx = INT2FIX(0);
if (!NIL_P(v[5])) {
VALUE sec = num_exact(v[5]);
VALUE subsec;
divmodv(sec, INT2FIX(1), &sec, &subsec);
vtm.sec = NUM2INT(sec);
vtm.subsecx = w2v(rb_time_magnify(v2w(subsec)));
}
vtm.sec = NIL_P(v[5]) ? 0 : obj2subsecx(v[5], &vtm.subsecx);
vtm.isdst = -1;
vtm.utc_offset = Qnil;