From 0542f05b321ef4f0d0083cc442ee1f347753f529 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 10 May 2013 14:56:37 +0000 Subject: [PATCH] parse.y: lex_state macros * 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 --- parse.y | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/parse.y b/parse.y index a83f85f1f4..0871e82688 100644 --- a/parse.y +++ b/parse.y @@ -8006,11 +8006,11 @@ parser_yylex(struct parser_params *parser) if (kw) { enum lex_state_e state = lex_state; lex_state = kw->state; - if (state == EXPR_FNAME) { + if (IS_lex_state_for(state, EXPR_FNAME)) { set_yylval_name(rb_intern(kw->name)); return kw->id[0]; } - if (lex_state == EXPR_BEG) { + if (IS_lex_state(EXPR_BEG)) { command_start = TRUE; } if (kw->id[0] == keyword_do) { @@ -8020,13 +8020,13 @@ parser_yylex(struct parser_params *parser) return keyword_do_LAMBDA; } 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; - if (state & (EXPR_BEG | EXPR_ENDARG)) + if (IS_lex_state_for(state, (EXPR_BEG | EXPR_ENDARG))) return keyword_do_block; return keyword_do; } - if (state & (EXPR_BEG | EXPR_VALUE)) + if (IS_lex_state_for(state, (EXPR_BEG | EXPR_VALUE))) return kw->id[0]; else { if (kw->id[0] != kw->id[1])