kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

parse.y: ID for logop

Browse source 
* parse.y (logop): use ID instead of token values.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-04-05 00:12:43 +00:00
parent e550fa94d6
commit 733f6496e4
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
parse.y
View file

@ -416,8 +416,8 @@ static NODE *new_if_gen(struct parser_params*,NODE*,NODE*,NODE*);
#define new_if(cc,left,right) new_if_gen(parser, (cc), (left), (right)) #define new_if(cc,left,right) new_if_gen(parser, (cc), (left), (right))
#define new_unless(cc,left,right) new_if_gen(parser, (cc), (right), (left)) #define new_unless(cc,left,right) new_if_gen(parser, (cc), (right), (left))
static NODE *logop_gen(struct parser_params*,enum node_type,NODE*,NODE*); static NODE *logop_gen(struct parser_params*,enum node_type,NODE*,NODE*);
#define logop(type,node1,node2) \ #define logop(id,node1,node2) \
logop_gen(parser, (type)==tAND||(type)==(enum ruby_method_ids)tANDOP?NODE_AND:NODE_OR, \ logop_gen(parser, ((id)==idAND||(id)==idANDOP)?NODE_AND:NODE_OR, \
(node1), (node2)) (node1), (node2))
static NODE *newline_node(NODE*); static NODE *newline_node(NODE*);
@ -579,7 +579,7 @@ static int id_is_var_gen(struct parser_params *parser, ID id);
#define call_bin_op(recv,id,arg1) dispatch3(binary, (recv), STATIC_ID2SYM(id), (arg1)) #define call_bin_op(recv,id,arg1) dispatch3(binary, (recv), STATIC_ID2SYM(id), (arg1))
#define match_op(node1,node2) call_bin_op((node1), idEqTilde, (node2)) #define match_op(node1,node2) call_bin_op((node1), idEqTilde, (node2))
#define call_uni_op(recv,id) dispatch2(unary, STATIC_ID2SYM(id), (recv)) #define call_uni_op(recv,id) dispatch2(unary, STATIC_ID2SYM(id), (recv))
#define logop(type,node1,node2) call_bin_op((node1), TOKEN2ID(type), (node2)) #define logop(id,node1,node2) call_bin_op((node1), (id), (node2))
#define node_assign(node1, node2) dispatch2(assign, (node1), (node2)) #define node_assign(node1, node2) dispatch2(assign, (node1), (node2))
static VALUE new_qcall_gen(struct parser_params *parser, VALUE q, VALUE r, VALUE m, VALUE a); static VALUE new_qcall_gen(struct parser_params *parser, VALUE q, VALUE r, VALUE m, VALUE a);
#define new_qcall(q,r,m,a) new_qcall_gen(parser, (r), (q), (m), (a)) #define new_qcall(q,r,m,a) new_qcall_gen(parser, (r), (q), (m), (a))
@ -1452,11 +1452,11 @@ command_rhs : command_call %prec tOP_ASGN
expr : command_call expr : command_call
| expr keyword_and expr | expr keyword_and expr
{ {
$$ = logop(tAND, $1, $3); $$ = logop(idAND, $1, $3);
} }
| expr keyword_or expr | expr keyword_or expr
{ {
$$ = logop(tOR, $1, $3); $$ = logop(idOR, $1, $3);
} }
| keyword_not opt_nl expr | keyword_not opt_nl expr
{ {
@ -2203,11 +2203,11 @@ arg : lhs '=' arg_rhs
} }
| arg tANDOP arg | arg tANDOP arg
{ {
$$ = logop((enum ruby_method_ids)tANDOP, $1, $3); $$ = logop(idANDOP, $1, $3);
} }
| arg tOROP arg | arg tOROP arg
{ {
$$ = logop((enum ruby_method_ids)tOROP, $1, $3); $$ = logop(idOROP, $1, $3);
} }
| keyword_defined opt_nl {in_defined = 1;} arg | keyword_defined opt_nl {in_defined = 1;} arg
{ {