зеркало из https://github.com/github/ruby.git
* parse.y (parser_yylex): fix for tLPAREN_ARG.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27417 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
cbaf61b276
Коммит
f0f87d6eeb
|
@ -1,3 +1,7 @@
|
||||||
|
Tue Apr 20 19:25:50 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* parse.y (parser_yylex): fix for tLPAREN_ARG.
|
||||||
|
|
||||||
Tue Apr 20 12:34:23 2010 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
|
Tue Apr 20 12:34:23 2010 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
|
||||||
|
|
||||||
* lib/cgi/{core, util}.rb (RFC822_DAYS, RFC822_MONTHS):
|
* lib/cgi/{core, util}.rb (RFC822_DAYS, RFC822_MONTHS):
|
||||||
|
|
12
parse.y
12
parse.y
|
@ -7272,10 +7272,8 @@ parser_yylex(struct parser_params *parser)
|
||||||
if (IS_BEG()) {
|
if (IS_BEG()) {
|
||||||
c = tLPAREN;
|
c = tLPAREN;
|
||||||
}
|
}
|
||||||
else if (space_seen) {
|
else if (IS_SPCARG(-1)) {
|
||||||
if (IS_ARG()) {
|
c = tLPAREN_ARG;
|
||||||
c = tLPAREN_ARG;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
paren_nest++;
|
paren_nest++;
|
||||||
COND_PUSH(0);
|
COND_PUSH(0);
|
||||||
|
@ -7687,9 +7685,9 @@ parser_yylex(struct parser_params *parser)
|
||||||
ID ident = TOK_INTERN(!ENC_SINGLE(mb));
|
ID ident = TOK_INTERN(!ENC_SINGLE(mb));
|
||||||
|
|
||||||
set_yylval_name(ident);
|
set_yylval_name(ident);
|
||||||
if (last_state != EXPR_DOT && is_local_id(ident) && lvar_defined(ident)) {
|
if (last_state != EXPR_DOT && last_state != EXPR_FNAME && is_local_id(ident)) {
|
||||||
lex_state = EXPR_VCALL;
|
lex_state = EXPR_VCALL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче