1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

parse.y: lex_state macros

Browse Source 
* parse.y (parser_yylex): use IS_lex_state() and IS_lex_state_for()
  instead of direct comparison.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40634 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-05-10 14:56:37 +00:00
parent 980bf275fa
commit 0542f05b32
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
parse.y
View File

@ -8006,11 +8006,11 @@ parser_yylex(struct parser_params *parser)
if (kw) { if (kw) {
enum lex_state_e state = lex_state; enum lex_state_e state = lex_state;
lex_state = kw->state; lex_state = kw->state;
if (state == EXPR_FNAME) { if (IS_lex_state_for(state, EXPR_FNAME)) {
set_yylval_name(rb_intern(kw->name)); set_yylval_name(rb_intern(kw->name));
return kw->id[0]; return kw->id[0];
} }
if (lex_state == EXPR_BEG) { if (IS_lex_state(EXPR_BEG)) {
command_start = TRUE; command_start = TRUE;
} }
if (kw->id[0] == keyword_do) { if (kw->id[0] == keyword_do) {
@ -8020,13 +8020,13 @@ parser_yylex(struct parser_params *parser)
return keyword_do_LAMBDA; return keyword_do_LAMBDA;
} }
if (COND_P()) return keyword_do_cond; if (COND_P()) return keyword_do_cond;
if (CMDARG_P() && state != EXPR_CMDARG) if (CMDARG_P() && !IS_lex_state_for(state, EXPR_CMDARG))
return keyword_do_block; return keyword_do_block;
if (state & (EXPR_BEG | EXPR_ENDARG)) if (IS_lex_state_for(state, (EXPR_BEG | EXPR_ENDARG)))
return keyword_do_block; return keyword_do_block;
return keyword_do; return keyword_do;
} }
if (state & (EXPR_BEG | EXPR_VALUE)) if (IS_lex_state_for(state, (EXPR_BEG | EXPR_VALUE)))
return kw->id[0]; return kw->id[0];
else { else {
if (kw->id[0] != kw->id[1]) if (kw->id[0] != kw->id[1])