1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify default values of Time.at [Bug #18293]

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2021-11-09 15:12:02 +09:00
parent cc33d07f46
commit 83bdc2f00c
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
time.c
View File

@ -2678,13 +2678,13 @@ get_scale(VALUE unit)
} }
static VALUE static VALUE
time_s_at(rb_execution_context_t *ec, VALUE klass, VALUE time, VALUE subsec, VALUE unit, VALUE zone, VALUE nosubsec, VALUE nounit) time_s_at(rb_execution_context_t *ec, VALUE klass, VALUE time, VALUE subsec, VALUE unit, VALUE zone)
{ {
VALUE t; VALUE t;
wideval_t timew; wideval_t timew;
if (!RTEST(nosubsec)) { if (!NIL_P(subsec)) {
int scale = !RTEST(nounit) ? get_scale(unit) : 1000000; int scale = get_scale(unit);
time = num_exact(time); time = num_exact(time);
t = num_exact(subsec); t = num_exact(subsec);
timew = wadd(rb_time_magnify(v2w(time)), wmulquoll(v2w(t), TIME_SCALE, scale)); timew = wadd(rb_time_magnify(v2w(time)), wmulquoll(v2w(t), TIME_SCALE, scale));

4
timev.rb
View File

@ -267,8 +267,8 @@ class Time
# :include: doc/time/nsec.rdoc # :include: doc/time/nsec.rdoc
# :include: doc/time/in.rdoc # :include: doc/time/in.rdoc
# #
def self.at(time, subsec = (nosubsec = true), unit = (nounit = true), in: nil) def self.at(time, subsec = nil, unit = :microsecond, in: nil)
__builtin.time_s_at(time, subsec, unit, __builtin.arg!(:in), nosubsec, nounit) __builtin.time_s_at(time, subsec, unit, __builtin.arg!(:in))
end end
# Returns a new \Time object based the on given arguments. # Returns a new \Time object based the on given arguments.