ruby-changes:45589
From: naruse <ko1@a...>
Date: Mon, 20 Feb 2017 19:59:15 +0900 (JST)
Subject: [ruby-changes:45589] naruse:r57662 (trunk): They are enum yytokentype, need cast
naruse 2017-02-20 19:59:09 +0900 (Mon, 20 Feb 2017) New Revision: 57662 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57662 Log: They are enum yytokentype, need cast Modified files: trunk/parse.y Index: parse.y =================================================================== --- parse.y (revision 57661) +++ parse.y (revision 57662) @@ -417,7 +417,7 @@ static NODE *new_if_gen(struct parser_pa https://github.com/ruby/ruby/blob/trunk/parse.y#L417 #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*); #define logop(type,node1,node2) \ - logop_gen(parser, (type)==tAND||(type)==tANDOP?NODE_AND:NODE_OR, \ + logop_gen(parser, (type)==tAND||(type)==(enum ruby_method_ids)tANDOP?NODE_AND:NODE_OR, \ (node1), (node2)) static NODE *newline_node(NODE*); @@ -2152,7 +2152,7 @@ arg : lhs '=' arg_rhs https://github.com/ruby/ruby/blob/trunk/parse.y#L2152 } | arg tGEQ arg { - $$ = call_bin_op($1, TOKEN2ID(tGEQ), $3); + $$ = call_bin_op($1, TOKEN2ID((enum ruby_method_ids)tGEQ), $3); } | arg '<' arg { @@ -2200,11 +2200,11 @@ arg : lhs '=' arg_rhs https://github.com/ruby/ruby/blob/trunk/parse.y#L2200 } | arg tANDOP arg { - $$ = logop(tANDOP, $1, $3); + $$ = logop((enum ruby_method_ids)tANDOP, $1, $3); } | arg tOROP arg { - $$ = logop(tOROP, $1, $3); + $$ = logop((enum ruby_method_ids)tOROP, $1, $3); } | keyword_defined opt_nl {in_defined = 1;} arg { @@ -7949,7 +7949,7 @@ parser_yylex(struct parser_params *parse https://github.com/ruby/ruby/blob/trunk/parse.y#L7949 c = tDSTAR; } else { - c = warn_balanced(tPOW, "**", "argument prefix"); + c = warn_balanced((enum ruby_method_ids)tPOW, "**", "argument prefix"); } } else { @@ -8073,7 +8073,7 @@ parser_yylex(struct parser_params *parse https://github.com/ruby/ruby/blob/trunk/parse.y#L8073 return tOP_ASGN; } pushback(c); - return warn_balanced(tLSHFT, "<<", "here document"); + return warn_balanced((enum ruby_method_ids)tLSHFT, "<<", "here document"); } pushback(c); return '<'; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/