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
468cc34c
Commit
468cc34c
authored
Jul 18, 2017
by
Christopher Aue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed Module#to_s and #name for #const_set modules
parent
52aafcd0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
8 deletions
+43
-8
mrbgems/mruby-class-ext/test/module.rb
mrbgems/mruby-class-ext/test/module.rb
+20
-6
src/class.c
src/class.c
+3
-0
test/t/module.rb
test/t/module.rb
+20
-2
No files found.
mrbgems/mruby-class-ext/test/module.rb
View file @
468cc34c
assert
'Module#name'
do
module
A
class
B
module
Outer
class
Inner
;
end
const_set
:SetInner
,
Class
.
new
end
assert_equal
'Outer'
,
Outer
.
name
assert_equal
'Outer::Inner'
,
Outer
::
Inner
.
name
assert_equal
'Outer::SetInner'
,
Outer
::
SetInner
.
name
outer
=
Module
.
new
do
const_set
:SetInner
,
Class
.
new
end
Object
.
const_set
:SetOuter
,
outer
assert_equal
'SetOuter'
,
SetOuter
.
name
assert_equal
'SetOuter::SetInner'
,
SetOuter
::
SetInner
.
name
mod
=
Module
.
new
cls
=
Class
.
new
assert_nil
A
::
B
.
singleton_class
.
name
assert_equal
'Fixnum'
,
Fixnum
.
name
assert_equal
'A::B'
,
A
::
B
.
name
assert_nil
mod
.
name
assert_nil
cls
.
name
end
src/class.c
View file @
468cc34c
...
...
@@ -2178,6 +2178,9 @@ mrb_mod_const_set(mrb_state *mrb, mrb_value mod)
mrb_get_args
(
mrb
,
"no"
,
&
id
,
&
value
);
check_const_name_sym
(
mrb
,
id
);
if
(
mrb_type
(
value
)
==
MRB_TT_CLASS
||
mrb_type
(
value
)
==
MRB_TT_MODULE
)
{
setup_class
(
mrb
,
mrb_class_ptr
(
mod
),
mrb_class_ptr
(
value
),
id
);
}
mrb_const_set
(
mrb
,
mod
,
id
,
value
);
return
value
;
}
...
...
test/t/module.rb
View file @
468cc34c
...
...
@@ -787,10 +787,28 @@ end
# @!endgroup prepend
assert
(
'Module#to_s'
)
do
module
Test4to_sModules
module
Outer
class
Inner
;
end
const_set
:SetInner
,
Class
.
new
end
assert_equal
'Outer'
,
Outer
.
to_s
assert_equal
'Outer::Inner'
,
Outer
::
Inner
.
to_s
assert_equal
'Outer::SetInner'
,
Outer
::
SetInner
.
to_s
outer
=
Module
.
new
do
const_set
:SetInner
,
Class
.
new
end
Object
.
const_set
:SetOuter
,
outer
assert_equal
'SetOuter'
,
SetOuter
.
to_s
assert_equal
'SetOuter::SetInner'
,
SetOuter
::
SetInner
.
to_s
mod
=
Module
.
new
cls
=
Class
.
new
assert_equal
'Test4to_sModules'
,
Test4to_sModules
.
to_s
assert_equal
"#<Module:0x"
,
mod
.
to_s
[
0
,
11
]
assert_equal
"#<Class:0x"
,
cls
.
to_s
[
0
,
10
]
end
assert
(
'Module#inspect'
)
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