Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
d8eff635
Unverified
Commit
d8eff635
authored
May 14, 2019
by
Yukihiro "Matz" Matsumoto
Committed by
GitHub
May 14, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4433 from shuujii/fix-Time-asctime-ctime-according-to-ISO-Ruby
Fix `Time#(asctime|ctime)` according to ISO Ruby
parents
b145ed9d
a2616db4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
12 deletions
+11
-12
mrbgems/mruby-time/src/time.c
mrbgems/mruby-time/src/time.c
+1
-2
mrbgems/mruby-time/test/time.rb
mrbgems/mruby-time/test/time.rb
+10
-10
No files found.
mrbgems/mruby-time/src/time.c
View file @
d8eff635
...
...
@@ -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 %.4
d"
,
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
View file @
d8eff635
...
...
@@ -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
(
2
1
34
)
assert_operator
(
2
1
34
,
:eql?
,
t
.
year
)
t
=
Time
.
utc
(
2
0
34
)
assert_operator
(
2
0
34
,
: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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment