summaryrefslogtreecommitdiff
path: root/time.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-28 14:08:33 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-28 14:08:33 (GMT)
commitab73b30539bab0473eb9997f0d37ea00449eb9d3 (patch)
tree682a3904da3798c2198ae6d38bc17e4f6145d251 /time.c
parentbdfc701b85b3109d5954ff05fc61ec3e0bbb58e3 (diff)
Time.at in: tz
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r--time.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/time.c b/time.c
index 2b7c836..9e0d541 100644
--- a/time.c
+++ b/time.c
@@ -2686,7 +2686,7 @@ get_scale(VALUE unit)
* can be an Integer, Float, Rational, or other Numeric.
* non-portable feature allows the offset to be negative on some systems.
*
- * If +tz+ argument is given, the result is in that timezone or UTC offset, or
+ * If +in+ argument is given, the result is in that timezone or UTC offset, or
* if a numeric argument is given, the result is in local time.
*
* Time.at(0) #=> 1969-12-31 18:00:00 -0600
@@ -2701,13 +2701,19 @@ get_scale(VALUE unit)
static VALUE
time_s_at(int argc, VALUE *argv, VALUE klass)
{
- VALUE time, t, unit = Qundef, zone = Qnil;
+ VALUE time, t, unit = Qundef, zone = Qundef, opts;
wideval_t timew;
- if (argc > 1 && rb_obj_respond_to(argv[argc-1], id_utc_to_local, Qfalse)) {
- zone = argv[--argc];
+ argc = rb_scan_args(argc, argv, "12:", &time, &t, &unit, &opts);
+ if (!NIL_P(opts)) {
+ ID ids[1];
+ VALUE vals[numberof(ids)];
+
+ CONST_ID(ids[0], "in");
+ rb_get_kwargs(opts, ids, 0, 1, vals);
+ zone = vals[0];
}
- if (rb_scan_args(argc, argv, "12", &time, &t, &unit) >= 2) {
+ if (argc >= 2) {
int scale = argc == 3 ? get_scale(unit) : 1000000;
time = num_exact(time);
t = num_exact(t);
@@ -2725,7 +2731,7 @@ time_s_at(int argc, VALUE *argv, VALUE klass)
timew = rb_time_magnify(v2w(num_exact(time)));
t = time_new_timew(klass, timew);
}
- if (!NIL_P(zone)) {
+ if (zone != Qundef) {
time_zonelocal(t, zone);
}