admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Time#(asctime|ctime) according to ISO Ruby

Browse Source 
- A leading charactor for day is space.
- Time zone does not included.

Before this patch:

  Time.gm(1982,3,4,5,6,7).asctime  #=> "Thu Mar 04 05:06:07 UTC 1982"

After this patch:

  Time.gm(1982,3,4,5,6,7).asctime  #=> "Thu Mar  4 05:06:07 1982"
This commit is contained in:
KOBAYASHI Shuji
2019-05-13 19:46:26 +09:00
parent b145ed9de5
commit a2616db4dc
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-time/src/time.c
+1 -2
View File
@@ -576,10 +576,9 @@ mrb_time_asctime(mrb_state *mrb, mrb_value self)
#else
char buf[256];
len = snprintf(buf, sizeof(buf), "%s %s %02d %02d:%02d:%02d %s%d",
len = snprintf(buf, sizeof(buf), "%s %s %2d %02d:%02d:%02d %.4d",
wday_names[d->tm_wday], mon_names[d->tm_mon], d->tm_mday,
d->tm_hour, d->tm_min, d->tm_sec,
tm->timezone == MRB_TIMEZONE_UTC ? "UTC " : "",
d->tm_year + 1900);
#endif
return mrb_str_new(mrb, buf, len);
mrbgems/mruby-time/test/time.rb
+10 -10
View File
@@ -58,8 +58,8 @@ assert('Time.now', '15.2.19.6.5') do
end
assert('Time.utc', '15.2.19.6.6') do
t = Time.utc(2134)
assert_operator(2134, :eql?, t.year)
t = Time.utc(2034)
assert_operator(2034, :eql?, t.year)
assert_operator( 1, :eql?, t.month)
assert_operator( 1, :eql?, t.day)
assert_operator( 0, :eql?, t.hour)
@@ -72,7 +72,7 @@ assert('Time#+', '15.2.19.7.1') do
t1 = Time.at(1300000000.0)
t2 = t1.+(60)
assert_equal(t2.utc.asctime, "Sun Mar 13 07:07:40 UTC 2011")
assert_equal(t2.utc.asctime, "Sun Mar 13 07:07:40 2011")
assert_raise(FloatDomainError) { Time.at(0) + Float::NAN }
assert_raise(FloatDomainError) { Time.at(0) + Float::INFINITY }
@@ -83,7 +83,7 @@ assert('Time#-', '15.2.19.7.2') do
t1 = Time.at(1300000000.0)
t2 = t1.-(60)
assert_equal(t2.utc.asctime, "Sun Mar 13 07:05:40 UTC 2011")
assert_equal(t2.utc.asctime, "Sun Mar 13 07:05:40 2011")
assert_raise(FloatDomainError) { Time.at(0) - Float::NAN }
assert_raise(FloatDomainError) { Time.at(0) - Float::INFINITY }
@@ -102,11 +102,11 @@ assert('Time#<=>', '15.2.19.7.3') do
end
assert('Time#asctime', '15.2.19.7.4') do
assert_equal("Sun Mar 13 07:06:40 UTC 2011", Time.at(1300000000.0).utc.asctime)
assert_equal("Thu Mar 4 05:06:07 1982", Time.gm(1982,3,4,5,6,7).asctime)
end
assert('Time#ctime', '15.2.19.7.5') do
assert_equal("Sun Mar 13 07:06:40 UTC 2011", Time.at(1300000000.0).utc.ctime)
assert_equal("Thu Oct 24 15:26:47 2013", Time.gm(2013,10,24,15,26,47).ctime)
end
assert('Time#day', '15.2.19.7.6') do
@@ -118,7 +118,7 @@ assert('Time#dst?', '15.2.19.7.7') do
end
assert('Time#getgm', '15.2.19.7.8') do
assert_equal("Sun Mar 13 07:06:40 UTC 2011", Time.at(1300000000.0).getgm.asctime)
assert_equal("Sun Mar 13 07:06:40 2011", Time.at(1300000000.0).getgm.asctime)
end
assert('Time#getlocal', '15.2.19.7.9') do
@@ -131,7 +131,7 @@ assert('Time#getlocal', '15.2.19.7.9') do
end
assert('Time#getutc', '15.2.19.7.10') do
assert_equal("Sun Mar 13 07:06:40 UTC 2011", Time.at(1300000000.0).getutc.asctime)
assert_equal("Sun Mar 13 07:06:40 2011", Time.at(1300000000.0).getutc.asctime)
end
assert('Time#gmt?', '15.2.19.7.11') do
@@ -235,11 +235,11 @@ end
# Not ISO specified
assert('Time#to_s') do
assert_equal("Sun Mar 13 07:06:40 UTC 2011", Time.at(1300000000.0).utc.to_s)
assert_equal("Sun Mar 13 07:06:40 2011", Time.at(1300000000.0).utc.to_s)
end
assert('Time#inspect') do
assert_equal("Sun Mar 13 07:06:40 UTC 2011", Time.at(1300000000.0).utc.inspect)
assert_equal("Sun Mar 13 07:06:40 2011", Time.at(1300000000.0).utc.inspect)
end
assert('day of week methods') do