diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-20 03:09:57 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-20 03:09:57 +0000 |
commit | 85cb4ee236ee14ec00aebcd90130555ce909d3a2 (patch) | |
tree | 250423aadaf66280c77e34c259d08cb4110623df /parse.y | |
parent | 8a3201dae6addec4f5c7d8717f9a34851a4d3e75 (diff) |
* parse.y (parser_yylex): simplified with IS_ARG and IS_END.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27413 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -6658,10 +6658,9 @@ parser_yylex(struct parser_params *parser) case '<': c = nextc(); if (c == '<' && - lex_state != EXPR_END && lex_state != EXPR_DOT && - lex_state != EXPR_ENDARG && lex_state != EXPR_CLASS && + !IS_END() && (!IS_ARG() || space_seen)) { int token = heredoc_identifier(); if (token) return token; @@ -6737,7 +6736,7 @@ parser_yylex(struct parser_params *parser) return tSTRING_BEG; case '?': - if (lex_state == EXPR_END || lex_state == EXPR_ENDARG) { + if (IS_END()) { lex_state = EXPR_VALUE; return '?'; } @@ -7625,8 +7624,7 @@ parser_yylex(struct parser_params *parser) } if ((lex_state == EXPR_BEG && !cmd_state) || - lex_state == EXPR_ARG || - lex_state == EXPR_CMDARG) { + IS_ARG()) { if (peek(':') && !(lex_p + 1 < lex_pend && lex_p[1] == ':')) { lex_state = EXPR_BEG; nextc(); |