Skip to content

Commit 9c6d310

Browse files
committed
Use clearer names for variables in Time.at
1 parent 825d016 commit 9c6d310

File tree

1 file changed

+15
-15
lines changed
  • src/main/ruby/truffleruby/core

1 file changed

+15
-15
lines changed

src/main/ruby/truffleruby/core/time.rb

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,11 @@ def _dump(limit = nil)
300300
private :_dump
301301

302302
class << self
303-
def at(sec, usec=undefined, unit=undefined, **kwargs)
303+
def at(sec, sub_sec=undefined, unit=undefined, **kwargs)
304304
# **kwargs is used here because 'in' is a ruby keyword
305305
offset = kwargs[:in] ? Truffle::Type.coerce_to_utc_offset(kwargs[:in]) : nil
306306

307-
result = if Primitive.undefined?(usec)
307+
result = if Primitive.undefined?(sub_sec)
308308
if Primitive.object_kind_of?(sec, Time)
309309
copy = allocate
310310
copy.send(:initialize_copy, sec)
@@ -321,11 +321,11 @@ def at(sec, usec=undefined, unit=undefined, **kwargs)
321321
return result
322322
end
323323

324-
if Primitive.object_kind_of?(sec, Time) && Primitive.object_kind_of?(usec, Integer)
324+
if Primitive.object_kind_of?(sec, Time) && Primitive.object_kind_of?(sub_sec, Integer)
325325
raise TypeError, "can't convert Time into an exact number"
326326
end
327327

328-
second_arg_scale =
328+
sub_sec_scale =
329329
if Primitive.undefined?(unit) || :microsecond == unit || :usec == unit
330330
1_000
331331
elsif :millisecond == unit
@@ -336,31 +336,31 @@ def at(sec, usec=undefined, unit=undefined, **kwargs)
336336
raise ArgumentError, "unexpected unit: #{unit}"
337337
end
338338

339-
if Primitive.undefined?(usec) && Primitive.object_kind_of?(sec, Rational)
339+
if Primitive.undefined?(sub_sec) && Primitive.object_kind_of?(sec, Rational)
340340
rational = Truffle::Type.coerce_to_exact_num(sec)
341341
seconds, fractional_seconds = rational.divmod(1)
342342
nano_fractional_seconds = fractional_seconds * 1_000_000_000
343343

344344
time = Primitive.time_at self, seconds, nano_fractional_seconds.to_i
345345
time = Primitive.time_localtime(time, offset) if offset
346346
return time
347-
elsif Primitive.undefined?(usec)
348-
usec = 0
347+
elsif Primitive.undefined?(sub_sec)
348+
sub_sec = 0
349349
end
350350

351-
s = Truffle::Type.coerce_to_exact_num(sec)
352-
u = Truffle::Type.coerce_to_exact_num(usec)
351+
sec = Truffle::Type.coerce_to_exact_num(sec)
352+
sub_sec = Truffle::Type.coerce_to_exact_num(sub_sec)
353353

354-
sec = s.to_i
355-
nsec_frac = s % 1.0
354+
seconds = sec.to_i
355+
sec_frac = sec % 1.0
356356

357-
sec -= 1 if s < 0 && nsec_frac > 0
358-
nsec = (nsec_frac * 1_000_000_000 + 0.5).to_i + (u * second_arg_scale).to_i
357+
seconds -= 1 if sec < 0 && sec_frac > 0
358+
nsec = (sec_frac * 1_000_000_000 + 0.5).to_i + (sub_sec * sub_sec_scale).to_i
359359

360-
sec += nsec / 1_000_000_000
360+
seconds += nsec / 1_000_000_000
361361
nsec %= 1_000_000_000
362362

363-
time = Primitive.time_at self, sec, nsec
363+
time = Primitive.time_at self, seconds, nsec
364364
time = Primitive.time_localtime(time, offset) if offset
365365
time
366366
end

0 commit comments

Comments
 (0)