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

* parse.y (parser_yylex): allow reserved word to be keyword argument.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19771 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-10-14 00:36:52 +00:00
parent 20ed75a639
commit c196780964
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Tue Oct 14 08:28:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (parser_yylex): allow reserved word to be keyword argument.
Mon Oct 13 19:07:52 2008 NARUSE, Yui <naruse@ruby-lang.org> Mon Oct 13 19:07:52 2008 NARUSE, Yui <naruse@ruby-lang.org>
* parse.y (token_info_pop): show source filename. [ruby-dev:36710] * parse.y (token_info_pop): show source filename. [ruby-dev:36710]

20
parse.y
View File

@ -7523,6 +7523,16 @@ parser_yylex(struct parser_params *parser)
} }
} }
if ((lex_state == EXPR_BEG && !cmd_state) ||
lex_state == EXPR_ARG ||
lex_state == EXPR_CMDARG) {
if (peek(':') && !(lex_p + 1 < lex_pend && lex_p[1] == ':')) {
lex_state = EXPR_BEG;
nextc();
set_yylval_id(TOK_INTERN(!ENC_SINGLE(mb)));
return tLABEL;
}
}
if (mb == ENC_CODERANGE_7BIT && lex_state != EXPR_DOT) { if (mb == ENC_CODERANGE_7BIT && lex_state != EXPR_DOT) {
const struct kwtable *kw; const struct kwtable *kw;
@ -7559,16 +7569,6 @@ parser_yylex(struct parser_params *parser)
} }
} }
if ((lex_state == EXPR_BEG && !cmd_state) ||
lex_state == EXPR_ARG ||
lex_state == EXPR_CMDARG) {
if (peek(':') && !(lex_p + 1 < lex_pend && lex_p[1] == ':')) {
lex_state = EXPR_BEG;
nextc();
set_yylval_id(TOK_INTERN(!ENC_SINGLE(mb)));
return tLABEL;
}
}
if (IS_BEG() || if (IS_BEG() ||
lex_state == EXPR_DOT || lex_state == EXPR_DOT ||
IS_ARG()) { IS_ARG()) {