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
b941e918
Unverified
Commit
b941e918
authored
May 16, 2020
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use more `MRB_QSYM()`.
parent
312f54b5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
26 deletions
+26
-26
mrbgems/mruby-compiler/core/parse.y
mrbgems/mruby-compiler/core/parse.y
+25
-25
mrbgems/mruby-method/src/method.c
mrbgems/mruby-method/src/method.c
+1
-1
No files found.
mrbgems/mruby-compiler/core/parse.y
View file @
b941e918
...
@@ -2085,7 +2085,7 @@ arg : lhs '=' arg_rhs
...
@@ -2085,7 +2085,7 @@ arg : lhs '=' arg_rhs
}
}
| primary_value '[' opt_call_args ']' tOP_ASGN arg_rhs
| primary_value '[' opt_call_args ']' tOP_ASGN arg_rhs
{
{
$$ = new_op_asgn(p, new_call(p, $1,
intern_lit("[]"
), $3, '.'), $5, $6);
$$ = new_op_asgn(p, new_call(p, $1,
MRB_QSYM(aref
), $3, '.'), $5, $6);
}
}
| primary_value call_op tIDENTIFIER tOP_ASGN arg_rhs
| primary_value call_op tIDENTIFIER tOP_ASGN arg_rhs
{
{
...
@@ -2295,9 +2295,9 @@ paren_args : '(' opt_call_args ')'
...
@@ -2295,9 +2295,9 @@ paren_args : '(' opt_call_args ')'
new_block_arg(p, new_lvar(p, b)));
new_block_arg(p, new_lvar(p, b)));
}
}
#else
#else
mrb_sym r =
mrb_intern_lit(p->mrb, "*"
);
mrb_sym r =
MRB_QSYM(mul
);
mrb_sym k =
mrb_intern_lit(p->mrb, "**"
);
mrb_sym k =
MRB_QSYM(pow
);
mrb_sym b =
mrb_intern_lit(p->mrb, "&"
);
mrb_sym b =
MRB_QSYM(and
);
if (local_var_p(p, r) && local_var_p(p, k) && local_var_p(p, b)) {
if (local_var_p(p, r) && local_var_p(p, k) && local_var_p(p, b)) {
$$ = cons(list2(new_splat(p, new_lvar(p, r)),
$$ = cons(list2(new_splat(p, new_lvar(p, r)),
new_kw_hash(p, list1(cons(new_kw_rest_args(p, 0), new_lvar(p, k))))),
new_kw_hash(p, list1(cons(new_kw_rest_args(p, 0), new_lvar(p, k))))),
...
@@ -3026,7 +3026,7 @@ method_call : operation paren_args
...
@@ -3026,7 +3026,7 @@ method_call : operation paren_args
}
}
| primary_value '[' opt_call_args ']'
| primary_value '[' opt_call_args ']'
{
{
$$ = new_call(p, $1,
intern_lit("[]"
), $3, '.');
$$ = new_call(p, $1,
MRB_QSYM(aref
), $3, '.');
}
}
;
;
...
@@ -3409,15 +3409,15 @@ f_arglist : '(' f_args rparen
...
@@ -3409,15 +3409,15 @@ f_arglist : '(' f_args rparen
{
{
#if 1
#if 1
/* til real keyword args implemented */
/* til real keyword args implemented */
mrb_sym r =
mrb_intern_lit(p->mrb, "*"
);
mrb_sym r =
MRB_QSYM(mul
);
mrb_sym b =
mrb_intern_lit(p->mrb, "&"
);
mrb_sym b =
MRB_QSYM(and
);
local_add_f(p, r);
local_add_f(p, r);
$$ = new_args(p, 0, 0, r, 0,
$$ = new_args(p, 0, 0, r, 0,
new_args_tail(p, 0, 0, b));
new_args_tail(p, 0, 0, b));
#else
#else
mrb_sym r =
mrb_intern_lit(p->mrb, "*"
);
mrb_sym r =
MRB_QSYM(mul
);
mrb_sym k =
mrb_intern_lit(p->mrb, "**"
);
mrb_sym k =
MRB_QSYM(pow
);
mrb_sym b =
mrb_intern_lit(p->mrb, "&"
);
mrb_sym b =
MRB_QSYM(and
);
local_add_f(p, r); local_add_f(p, k);
local_add_f(p, r); local_add_f(p, k);
$$ = new_args(p, 0, 0, r, 0,
$$ = new_args(p, 0, 0, r, 0,
new_args_tail(p, 0, new_kw_rest_args(p, nsym(k)), b));
new_args_tail(p, 0, new_kw_rest_args(p, nsym(k)), b));
...
@@ -3580,7 +3580,7 @@ f_args : f_arg ',' f_optarg ',' f_rest_arg opt_args_tail
...
@@ -3580,7 +3580,7 @@ f_args : f_arg ',' f_optarg ',' f_rest_arg opt_args_tail
}
}
| /* none */
| /* none */
{
{
local_add_f(p,
intern_lit("&"
));
local_add_f(p,
MRB_QSYM(and
));
$$ = new_args(p, 0, 0, 0, 0, 0);
$$ = new_args(p, 0, 0, 0, 0, 0);
}
}
;
;
...
@@ -3704,7 +3704,7 @@ f_rest_arg : restarg_mark tIDENTIFIER
...
@@ -3704,7 +3704,7 @@ f_rest_arg : restarg_mark tIDENTIFIER
}
}
| restarg_mark
| restarg_mark
{
{
local_add_f(p,
intern_lit("*"
));
local_add_f(p,
MRB_QSYM(and
));
$$ = -1;
$$ = -1;
}
}
;
;
...
@@ -4961,7 +4961,7 @@ parser_yylex(parser_state *p)
...
@@ -4961,7 +4961,7 @@ parser_yylex(parser_state *p)
case '*':
case '*':
if ((c = nextc(p)) == '*') {
if ((c = nextc(p)) == '*') {
if ((c = nextc(p)) == '=') {
if ((c = nextc(p)) == '=') {
pylval.id =
intern_lit("**"
);
pylval.id =
MRB_QSYM(pow
);
p->lstate = EXPR_BEG;
p->lstate = EXPR_BEG;
return tOP_ASGN;
return tOP_ASGN;
}
}
...
@@ -4979,7 +4979,7 @@ parser_yylex(parser_state *p)
...
@@ -4979,7 +4979,7 @@ parser_yylex(parser_state *p)
}
}
else {
else {
if (c == '=') {
if (c == '=') {
pylval.id =
intern_lit("*"
);
pylval.id =
MRB_QSYM(mul
);
p->lstate = EXPR_BEG;
p->lstate = EXPR_BEG;
return tOP_ASGN;
return tOP_ASGN;
}
}
...
@@ -5095,7 +5095,7 @@ parser_yylex(parser_state *p)
...
@@ -5095,7 +5095,7 @@ parser_yylex(parser_state *p)
}
}
if (c == '<') {
if (c == '<') {
if ((c = nextc(p)) == '=') {
if ((c = nextc(p)) == '=') {
pylval.id =
intern_lit("<<"
);
pylval.id =
MRB_QSYM(lshift
);
p->lstate = EXPR_BEG;
p->lstate = EXPR_BEG;
return tOP_ASGN;
return tOP_ASGN;
}
}
...
@@ -5117,7 +5117,7 @@ parser_yylex(parser_state *p)
...
@@ -5117,7 +5117,7 @@ parser_yylex(parser_state *p)
}
}
if (c == '>') {
if (c == '>') {
if ((c = nextc(p)) == '=') {
if ((c = nextc(p)) == '=') {
pylval.id =
intern_lit(">>"
);
pylval.id =
MRB_QSYM(rshift
);
p->lstate = EXPR_BEG;
p->lstate = EXPR_BEG;
return tOP_ASGN;
return tOP_ASGN;
}
}
...
@@ -5225,7 +5225,7 @@ parser_yylex(parser_state *p)
...
@@ -5225,7 +5225,7 @@ parser_yylex(parser_state *p)
if ((c = nextc(p)) == '&') {
if ((c = nextc(p)) == '&') {
p->lstate = EXPR_BEG;
p->lstate = EXPR_BEG;
if ((c = nextc(p)) == '=') {
if ((c = nextc(p)) == '=') {
pylval.id =
intern_lit("&&"
);
pylval.id =
MRB_QSYM(andand
);
p->lstate = EXPR_BEG;
p->lstate = EXPR_BEG;
return tOP_ASGN;
return tOP_ASGN;
}
}
...
@@ -5237,7 +5237,7 @@ parser_yylex(parser_state *p)
...
@@ -5237,7 +5237,7 @@ parser_yylex(parser_state *p)
return tANDDOT;
return tANDDOT;
}
}
else if (c == '=') {
else if (c == '=') {
pylval.id =
intern_lit("&"
);
pylval.id =
MRB_QSYM(and
);
p->lstate = EXPR_BEG;
p->lstate = EXPR_BEG;
return tOP_ASGN;
return tOP_ASGN;
}
}
...
@@ -5264,7 +5264,7 @@ parser_yylex(parser_state *p)
...
@@ -5264,7 +5264,7 @@ parser_yylex(parser_state *p)
if ((c = nextc(p)) == '|') {
if ((c = nextc(p)) == '|') {
p->lstate = EXPR_BEG;
p->lstate = EXPR_BEG;
if ((c = nextc(p)) == '=') {
if ((c = nextc(p)) == '=') {
pylval.id =
intern_lit("||"
);
pylval.id =
MRB_QSYM(oror
);
p->lstate = EXPR_BEG;
p->lstate = EXPR_BEG;
return tOP_ASGN;
return tOP_ASGN;
}
}
...
@@ -5272,7 +5272,7 @@ parser_yylex(parser_state *p)
...
@@ -5272,7 +5272,7 @@ parser_yylex(parser_state *p)
return tOROP;
return tOROP;
}
}
if (c == '=') {
if (c == '=') {
pylval.id =
intern_lit("|"
);
pylval.id =
MRB_QSYM(or
);
p->lstate = EXPR_BEG;
p->lstate = EXPR_BEG;
return tOP_ASGN;
return tOP_ASGN;
}
}
...
@@ -5296,7 +5296,7 @@ parser_yylex(parser_state *p)
...
@@ -5296,7 +5296,7 @@ parser_yylex(parser_state *p)
return '+';
return '+';
}
}
if (c == '=') {
if (c == '=') {
pylval.id =
intern_lit("+"
);
pylval.id =
MRB_QSYM(add
);
p->lstate = EXPR_BEG;
p->lstate = EXPR_BEG;
return tOP_ASGN;
return tOP_ASGN;
}
}
...
@@ -5324,7 +5324,7 @@ parser_yylex(parser_state *p)
...
@@ -5324,7 +5324,7 @@ parser_yylex(parser_state *p)
return '-';
return '-';
}
}
if (c == '=') {
if (c == '=') {
pylval.id =
intern_lit("-"
);
pylval.id =
MRB_QSYM(sub
);
p->lstate = EXPR_BEG;
p->lstate = EXPR_BEG;
return tOP_ASGN;
return tOP_ASGN;
}
}
...
@@ -5644,7 +5644,7 @@ parser_yylex(parser_state *p)
...
@@ -5644,7 +5644,7 @@ parser_yylex(parser_state *p)
return tREGEXP_BEG;
return tREGEXP_BEG;
}
}
if ((c = nextc(p)) == '=') {
if ((c = nextc(p)) == '=') {
pylval.id =
intern_lit("/"
);
pylval.id =
MRB_QSYM(div
);
p->lstate = EXPR_BEG;
p->lstate = EXPR_BEG;
return tOP_ASGN;
return tOP_ASGN;
}
}
...
@@ -5663,7 +5663,7 @@ parser_yylex(parser_state *p)
...
@@ -5663,7 +5663,7 @@ parser_yylex(parser_state *p)
case '^':
case '^':
if ((c = nextc(p)) == '=') {
if ((c = nextc(p)) == '=') {
pylval.id =
intern_lit("^"
);
pylval.id =
MRB_QSYM(xor
);
p->lstate = EXPR_BEG;
p->lstate = EXPR_BEG;
return tOP_ASGN;
return tOP_ASGN;
}
}
...
@@ -5840,7 +5840,7 @@ parser_yylex(parser_state *p)
...
@@ -5840,7 +5840,7 @@ parser_yylex(parser_state *p)
}
}
}
}
if ((c = nextc(p)) == '=') {
if ((c = nextc(p)) == '=') {
pylval.id =
intern_lit("%"
);
pylval.id =
MRB_QSYM(mod
);
p->lstate = EXPR_BEG;
p->lstate = EXPR_BEG;
return tOP_ASGN;
return tOP_ASGN;
}
}
...
...
mrbgems/mruby-method/src/method.c
View file @
b941e918
...
@@ -322,7 +322,7 @@ mrb_search_method_owner(mrb_state *mrb, struct RClass *c, mrb_value obj, mrb_sym
...
@@ -322,7 +322,7 @@ mrb_search_method_owner(mrb_state *mrb, struct RClass *c, mrb_value obj, mrb_sym
if
(
unbound
)
{
if
(
unbound
)
{
goto
name_error
;
goto
name_error
;
}
}
if
(
!
mrb_respond_to
(
mrb
,
obj
,
mrb_intern_lit
(
mrb
,
"respond_to_missing?"
)))
{
if
(
!
mrb_respond_to
(
mrb
,
obj
,
MRB_QSYM
(
respond_to_missing_p
)))
{
goto
name_error
;
goto
name_error
;
}
}
ret
=
mrb_funcall
(
mrb
,
obj
,
"respond_to_missing?"
,
2
,
mrb_symbol_value
(
name
),
mrb_true_value
());
ret
=
mrb_funcall
(
mrb
,
obj
,
"respond_to_missing?"
,
2
,
mrb_symbol_value
(
name
),
mrb_true_value
());
...
...
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