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
9409a2ff
Commit
9409a2ff
authored
Aug 03, 2018
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename ambiguous function names.
`mrb_iv_p` -> `mrb_iv_name_sym_p` `mrb_iv_check` -> `mrb_iv_name_sym_check`
parent
5e469d2b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
include/mruby/variable.h
include/mruby/variable.h
+2
-2
src/class.c
src/class.c
+2
-2
src/kernel.c
src/kernel.c
+4
-4
src/variable.c
src/variable.c
+3
-3
No files found.
include/mruby/variable.h
View file @
9409a2ff
...
...
@@ -40,8 +40,8 @@ MRB_API void mrb_const_set(mrb_state*, mrb_value, mrb_sym, mrb_value);
MRB_API
mrb_bool
mrb_const_defined
(
mrb_state
*
,
mrb_value
,
mrb_sym
);
MRB_API
void
mrb_const_remove
(
mrb_state
*
,
mrb_value
,
mrb_sym
);
MRB_API
mrb_bool
mrb_iv_p
(
mrb_state
*
mrb
,
mrb_sym
sym
);
MRB_API
void
mrb_iv_check
(
mrb_state
*
mrb
,
mrb_sym
sym
);
MRB_API
mrb_bool
mrb_iv_
name_sym_
p
(
mrb_state
*
mrb
,
mrb_sym
sym
);
MRB_API
void
mrb_iv_
name_sym_
check
(
mrb_state
*
mrb
,
mrb_sym
sym
);
MRB_API
mrb_value
mrb_obj_iv_get
(
mrb_state
*
mrb
,
struct
RObject
*
obj
,
mrb_sym
sym
);
MRB_API
void
mrb_obj_iv_set
(
mrb_state
*
mrb
,
struct
RObject
*
obj
,
mrb_sym
sym
,
mrb_value
v
);
MRB_API
mrb_bool
mrb_obj_iv_defined
(
mrb_state
*
mrb
,
struct
RObject
*
obj
,
mrb_sym
sym
);
...
...
src/class.c
View file @
9409a2ff
...
...
@@ -1480,7 +1480,7 @@ mrb_mod_attr_reader(mrb_state *mrb, mrb_value mod)
mrb_str_cat_lit
(
mrb
,
str
,
"@"
);
mrb_str_cat_str
(
mrb
,
str
,
name
);
sym
=
mrb_intern_str
(
mrb
,
str
);
mrb_iv_check
(
mrb
,
sym
);
mrb_iv_
name_sym_
check
(
mrb
,
sym
);
name
=
mrb_symbol_value
(
sym
);
p
=
mrb_proc_new_cfunc_with_env
(
mrb
,
attr_reader
,
1
,
&
name
);
MRB_METHOD_FROM_PROC
(
m
,
p
);
...
...
@@ -1525,7 +1525,7 @@ mrb_mod_attr_writer(mrb_state *mrb, mrb_value mod)
mrb_str_cat_lit
(
mrb
,
str
,
"@"
);
mrb_str_cat_str
(
mrb
,
str
,
name
);
sym
=
mrb_intern_str
(
mrb
,
str
);
mrb_iv_check
(
mrb
,
sym
);
mrb_iv_
name_sym_
check
(
mrb
,
sym
);
attr
=
mrb_symbol_value
(
sym
);
/* prepare method name (name=) */
...
...
src/kernel.c
View file @
9409a2ff
...
...
@@ -575,7 +575,7 @@ mrb_obj_ivar_defined(mrb_state *mrb, mrb_value self)
mrb_sym
sym
;
mrb_get_args
(
mrb
,
"n"
,
&
sym
);
mrb_iv_check
(
mrb
,
sym
);
mrb_iv_
name_sym_
check
(
mrb
,
sym
);
return
mrb_bool_value
(
mrb_iv_defined
(
mrb
,
self
,
sym
));
}
...
...
@@ -605,7 +605,7 @@ mrb_obj_ivar_get(mrb_state *mrb, mrb_value self)
mrb_sym
iv_name
;
mrb_get_args
(
mrb
,
"n"
,
&
iv_name
);
mrb_iv_check
(
mrb
,
iv_name
);
mrb_iv_
name_sym_
check
(
mrb
,
iv_name
);
return
mrb_iv_get
(
mrb
,
self
,
iv_name
);
}
...
...
@@ -636,7 +636,7 @@ mrb_obj_ivar_set(mrb_state *mrb, mrb_value self)
mrb_value
val
;
mrb_get_args
(
mrb
,
"no"
,
&
iv_name
,
&
val
);
mrb_iv_check
(
mrb
,
iv_name
);
mrb_iv_
name_sym_
check
(
mrb
,
iv_name
);
mrb_iv_set
(
mrb
,
self
,
iv_name
,
val
);
return
val
;
}
...
...
@@ -951,7 +951,7 @@ mrb_obj_remove_instance_variable(mrb_state *mrb, mrb_value self)
mrb_value
val
;
mrb_get_args
(
mrb
,
"n"
,
&
sym
);
mrb_iv_check
(
mrb
,
sym
);
mrb_iv_
name_sym_
check
(
mrb
,
sym
);
val
=
mrb_iv_remove
(
mrb
,
self
,
sym
);
if
(
mrb_undef_p
(
val
))
{
mrb_name_error
(
mrb
,
sym
,
"instance variable %S not defined"
,
mrb_sym2str
(
mrb
,
sym
));
...
...
src/variable.c
View file @
9409a2ff
...
...
@@ -393,7 +393,7 @@ mrb_iv_defined(mrb_state *mrb, mrb_value obj, mrb_sym sym)
#define identchar(c) (ISALNUM(c) || (c) == '_' || !ISASCII(c))
MRB_API
mrb_bool
mrb_iv_p
(
mrb_state
*
mrb
,
mrb_sym
iv_name
)
mrb_iv_
name_sym_
p
(
mrb_state
*
mrb
,
mrb_sym
iv_name
)
{
const
char
*
s
;
mrb_int
i
,
len
;
...
...
@@ -409,9 +409,9 @@ mrb_iv_p(mrb_state *mrb, mrb_sym iv_name)
}
MRB_API
void
mrb_iv_check
(
mrb_state
*
mrb
,
mrb_sym
iv_name
)
mrb_iv_
name_sym_
check
(
mrb_state
*
mrb
,
mrb_sym
iv_name
)
{
if
(
!
mrb_iv_p
(
mrb
,
iv_name
))
{
if
(
!
mrb_iv_
name_sym_
p
(
mrb
,
iv_name
))
{
mrb_name_error
(
mrb
,
iv_name
,
"'%S' is not allowed as an instance variable name"
,
mrb_sym2str
(
mrb
,
iv_name
));
}
}
...
...
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