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
fb103c13
Commit
fb103c13
authored
Oct 07, 2019
by
KOBAYASHI Shuji
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement Ruby2.7's frozen strings from `Module#name`
parent
b7a8d538
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
7 deletions
+16
-7
mrbgems/mruby-class-ext/test/module.rb
mrbgems/mruby-class-ext/test/module.rb
+13
-5
src/class.c
src/class.c
+2
-1
src/variable.c
src/variable.c
+1
-1
No files found.
mrbgems/mruby-class-ext/test/module.rb
View file @
fb103c13
def
assert_module_name
(
exp
,
mod
)
assert
"assert_module_name"
do
act
=
mod
.
__send__
(
:name
)
assert_equal
exp
,
act
assert_predicate
act
,
:frozen?
end
end
assert
'Module#<'
do
a
=
Class
.
new
b
=
Class
.
new
(
a
)
...
...
@@ -58,17 +66,17 @@ assert 'Module#name' do
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
assert_
module_name
'Outer'
,
Outer
assert_
module_name
'Outer::Inner'
,
Outer
::
Inner
assert_
module_name
'Outer::SetInner'
,
Outer
::
SetInner
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
assert_
module_name
'SetOuter'
,
SetOuter
assert_
module_name
'SetOuter::SetInner'
,
SetOuter
::
SetInner
mod
=
Module
.
new
cls
=
Class
.
new
...
...
src/class.c
View file @
fb103c13
...
...
@@ -76,6 +76,7 @@ mrb_class_name_class(mrb_state *mrb, struct RClass *outer, struct RClass *c, mrb
name
=
mrb_str_dup
(
mrb
,
name
);
mrb_str_cat_cstr
(
mrb
,
name
,
"::"
);
mrb_str_cat_cstr
(
mrb
,
name
,
mrb_sym_name
(
mrb
,
id
));
MRB_SET_FROZEN_FLAG
(
mrb_obj_ptr
(
name
));
}
mrb_obj_iv_set_force
(
mrb
,
(
struct
RObject
*
)
c
,
nsym
,
name
);
}
...
...
@@ -1712,7 +1713,7 @@ mrb_class_path(mrb_state *mrb, struct RClass *c)
/* toplevel class/module */
return
mrb_sym_str
(
mrb
,
mrb_symbol
(
path
));
}
return
mrb_str_dup
(
mrb
,
path
)
;
return
path
;
}
MRB_API
struct
RClass
*
...
...
src/variable.c
View file @
fb103c13
...
...
@@ -1123,7 +1123,7 @@ mrb_class_find_path(mrb_state *mrb, struct RClass *c)
iv_del
(
mrb
,
c
->
iv
,
mrb_intern_lit
(
mrb
,
"__outer__"
),
NULL
);
iv_put
(
mrb
,
c
->
iv
,
mrb_intern_lit
(
mrb
,
"__classname__"
),
path
);
mrb_field_write_barrier_value
(
mrb
,
(
struct
RBasic
*
)
c
,
path
);
path
=
mrb_str_dup
(
mrb
,
path
);
MRB_SET_FROZEN_FLAG
(
mrb_obj_ptr
(
path
)
);
}
return
path
;
}
...
...
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