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
2d520eaf
Commit
2d520eaf
authored
Jul 24, 2019
by
KOBAYASHI Shuji
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move `NilClass#to_h` to `mruby-object-ext` from `mruby-enum-ext`
parent
5779464e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
7 deletions
+19
-7
mrbgems/mruby-enum-ext/mrblib/enum.rb
mrbgems/mruby-enum-ext/mrblib/enum.rb
+0
-4
mrbgems/mruby-enum-ext/test/enum.rb
mrbgems/mruby-enum-ext/test/enum.rb
+0
-3
mrbgems/mruby-object-ext/src/object.c
mrbgems/mruby-object-ext/src/object.c
+15
-0
mrbgems/mruby-object-ext/test/nil.rb
mrbgems/mruby-object-ext/test/nil.rb
+4
-0
No files found.
mrbgems/mruby-enum-ext/mrblib/enum.rb
View file @
2d520eaf
...
@@ -811,10 +811,6 @@ module Enumerable
...
@@ -811,10 +811,6 @@ module Enumerable
h
h
end
end
def
nil
.
to_h
{}
end
def
uniq
(
&
block
)
def
uniq
(
&
block
)
hash
=
{}
hash
=
{}
if
block
if
block
...
...
mrbgems/mruby-enum-ext/test/enum.rb
View file @
2d520eaf
...
@@ -186,8 +186,5 @@ assert("Enumerable#to_h") do
...
@@ -186,8 +186,5 @@ assert("Enumerable#to_h") do
h
=
c
.
new
.
to_h
h
=
c
.
new
.
to_h
assert_equal
Hash
,
h
.
class
assert_equal
Hash
,
h
.
class
assert_equal
h0
,
h
assert_equal
h0
,
h
# mruby-enum-ext also provides nil.to_h
assert_equal
Hash
.
new
,
nil
.
to_h
assert_equal
({
1
=>
4
,
3
=>
8
},
c
.
new
.
to_h
{
|
k
,
v
|
[
k
,
v
*
2
]})
assert_equal
({
1
=>
4
,
3
=>
8
},
c
.
new
.
to_h
{
|
k
,
v
|
[
k
,
v
*
2
]})
end
end
mrbgems/mruby-object-ext/src/object.c
View file @
2d520eaf
#include <mruby.h>
#include <mruby.h>
#include <mruby/array.h>
#include <mruby/array.h>
#include <mruby/class.h>
#include <mruby/class.h>
#include <mruby/hash.h>
#include <mruby/proc.h>
#include <mruby/proc.h>
/*
/*
...
@@ -31,6 +32,19 @@ nil_to_f(mrb_state *mrb, mrb_value obj)
...
@@ -31,6 +32,19 @@ nil_to_f(mrb_state *mrb, mrb_value obj)
}
}
#endif
#endif
/*
* call-seq:
* nil.to_h -> {}
*
* Always returns an empty hash.
*/
static
mrb_value
nil_to_h
(
mrb_state
*
mrb
,
mrb_value
obj
)
{
return
mrb_hash_new
(
mrb
);
}
/*
/*
* call-seq:
* call-seq:
* nil.to_i -> 0
* nil.to_i -> 0
...
@@ -117,6 +131,7 @@ mrb_mruby_object_ext_gem_init(mrb_state* mrb)
...
@@ -117,6 +131,7 @@ mrb_mruby_object_ext_gem_init(mrb_state* mrb)
#ifndef MRB_WITHOUT_FLOAT
#ifndef MRB_WITHOUT_FLOAT
mrb_define_method
(
mrb
,
n
,
"to_f"
,
nil_to_f
,
MRB_ARGS_NONE
());
mrb_define_method
(
mrb
,
n
,
"to_f"
,
nil_to_f
,
MRB_ARGS_NONE
());
#endif
#endif
mrb_define_method
(
mrb
,
n
,
"to_h"
,
nil_to_h
,
MRB_ARGS_NONE
());
mrb_define_method
(
mrb
,
n
,
"to_i"
,
nil_to_i
,
MRB_ARGS_NONE
());
mrb_define_method
(
mrb
,
n
,
"to_i"
,
nil_to_i
,
MRB_ARGS_NONE
());
mrb_define_method
(
mrb
,
mrb
->
kernel_module
,
"itself"
,
mrb_f_itself
,
MRB_ARGS_NONE
());
mrb_define_method
(
mrb
,
mrb
->
kernel_module
,
"itself"
,
mrb_f_itself
,
MRB_ARGS_NONE
());
...
...
mrbgems/mruby-object-ext/test/nil.rb
View file @
2d520eaf
...
@@ -7,6 +7,10 @@ assert('NilClass#to_f') do
...
@@ -7,6 +7,10 @@ assert('NilClass#to_f') do
assert_equal
0.0
,
nil
.
to_f
assert_equal
0.0
,
nil
.
to_f
end
end
assert
(
'NilClass#to_h'
)
do
assert_equal
Hash
.
new
,
nil
.
to_h
end
assert
(
'NilClass#to_i'
)
do
assert
(
'NilClass#to_i'
)
do
assert_equal
0
,
nil
.
to_i
assert_equal
0
,
nil
.
to_i
end
end
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