kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 50409,51616,51617,51624: [Backport #10653] [Backport #11456]

Browse source 
parse.y: %-string cannot be a label

	* parse.y (parser_yylex): %-string cannot be a label even if
  terminated by single/double quotes.
	* parse.y: fix syntax error at do-block after a conditional
	  operator.  separate label-allowed and after-a-label states from
	  others as bit flags.  [ruby-dev:48790] [Bug #10653]

	* parse.y (IS_BEG): include labeled argument state, which was
	  EXPR_LABELARG.  [ruby-dev:49221] [Bug #11456]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-10-05 16:47:24 +00:00
parent 4758d6584e
commit df51beda2f
4 changed files with 79 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
Tue Oct 6 01:29:02 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (IS_BEG): include labeled argument state, which was
EXPR_LABELARG. [ruby-dev:49221] [Bug #11456]
Tue Oct 6 01:29:02 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y: fix syntax error at do-block after a conditional
operator. separate label-allowed and after-a-label states from
others as bit flags. [ruby-dev:48790] [Bug #10653]
Mon Oct 5 03:29:23 2015 Tanaka Akira <akr@fsij.org> Mon Oct 5 03:29:23 2015 Tanaka Akira <akr@fsij.org>
* enum.c (nmin_filter): Fix limit value. * enum.c (nmin_filter): Fix limit value.

82
parse.y
View file

@ -59,8 +59,8 @@ enum lex_state_bits {
EXPR_FNAME_bit, /* ignore newline, no reserved words. */ EXPR_FNAME_bit, /* ignore newline, no reserved words. */
EXPR_DOT_bit, /* right after `.' or `::', no reserved words. */ EXPR_DOT_bit, /* right after `.' or `::', no reserved words. */
EXPR_CLASS_bit, /* immediate after `class', no here document. */ EXPR_CLASS_bit, /* immediate after `class', no here document. */
EXPR_VALUE_bit, /* alike EXPR_BEG but label is disallowed. */ EXPR_LABEL_bit, /* flag bit, label is allowed. */
EXPR_LABELARG_bit, /* ignore significant, +/- is a sign. */ EXPR_LABELED_bit, /* flag bit, just after a label. */
EXPR_MAX_STATE EXPR_MAX_STATE
}; };
/* examine combinations */ /* examine combinations */
@ -76,14 +76,17 @@ enum lex_state_e {
DEF_EXPR(FNAME), DEF_EXPR(FNAME),
DEF_EXPR(DOT), DEF_EXPR(DOT),
DEF_EXPR(CLASS), DEF_EXPR(CLASS),
DEF_EXPR(VALUE), DEF_EXPR(LABEL),
DEF_EXPR(LABELARG), DEF_EXPR(LABELED),
EXPR_BEG_ANY = (EXPR_BEG | EXPR_VALUE | EXPR_MID | EXPR_CLASS | EXPR_LABELARG), EXPR_VALUE = EXPR_BEG,
EXPR_BEG_ANY = (EXPR_BEG | EXPR_MID | EXPR_CLASS),
EXPR_ARG_ANY = (EXPR_ARG | EXPR_CMDARG), EXPR_ARG_ANY = (EXPR_ARG | EXPR_CMDARG),
EXPR_END_ANY = (EXPR_END | EXPR_ENDARG | EXPR_ENDFN) EXPR_END_ANY = (EXPR_END | EXPR_ENDARG | EXPR_ENDFN)
}; };
#define IS_lex_state_for(x, ls) ((x) & (ls)) #define IS_lex_state_for(x, ls) ((x) & (ls))
#define IS_lex_state_all_for(x, ls) (((x) & (ls)) == (ls))
#define IS_lex_state(ls) IS_lex_state_for(lex_state, (ls)) #define IS_lex_state(ls) IS_lex_state_for(lex_state, (ls))
#define IS_lex_state_all(ls) IS_lex_state_all_for(lex_state, (ls))
#if PARSER_DEBUG #if PARSER_DEBUG
static const char *lex_state_name(enum lex_state_e state); static const char *lex_state_name(enum lex_state_e state);
@ -2357,24 +2360,14 @@ arg : lhs '=' arg
$$ = dispatch1(defined, $4); $$ = dispatch1(defined, $4);
%*/ %*/
} }
| arg '?' | arg '?' arg opt_nl ':' arg
{
$<val>$ = cond_stack;
cond_stack = 0;
COND_PUSH(1);
}
arg opt_nl ':'
{
cond_stack = $<val>3;
}
arg
{ {
/*%%%*/ /*%%%*/
value_expr($1); value_expr($1);
$$ = NEW_IF(cond($1), $4, $8); $$ = NEW_IF(cond($1), $3, $6);
fixpos($$, $1); fixpos($$, $1);
/*% /*%
$$ = dispatch3(ifop, $1, $4, $8); $$ = dispatch3(ifop, $1, $3, $6);
%*/ %*/
} }
| primary | primary
@ -3040,7 +3033,7 @@ primary : literal
| k_def singleton dot_or_colon {lex_state = EXPR_FNAME;} fname | k_def singleton dot_or_colon {lex_state = EXPR_FNAME;} fname
{ {
in_single++; in_single++;
lex_state = EXPR_ENDFN; /* force for args */ lex_state = EXPR_ENDFN|EXPR_LABEL; /* force for args */
local_push(0); local_push(0);
$<id>$ = current_arg; $<id>$ = current_arg;
current_arg = 0; current_arg = 0;
@ -4521,6 +4514,7 @@ f_arglist : '(' f_args rparen
| { | {
$<num>$ = parser->parser_in_kwarg; $<num>$ = parser->parser_in_kwarg;
parser->parser_in_kwarg = 1; parser->parser_in_kwarg = 1;
lex_state |= EXPR_LABEL; /* force for args */
} }
f_args term f_args term
{ {
@ -5701,8 +5695,10 @@ rb_parser_compile_file_path(volatile VALUE vparser, VALUE fname, VALUE file, int
#define STR_FUNC_QWORDS 0x08 #define STR_FUNC_QWORDS 0x08
#define STR_FUNC_SYMBOL 0x10 #define STR_FUNC_SYMBOL 0x10
#define STR_FUNC_INDENT 0x20 #define STR_FUNC_INDENT 0x20
#define STR_FUNC_LABEL 0x40
enum string_type { enum string_type {
str_label = STR_FUNC_LABEL,
str_squote = (0), str_squote = (0),
str_dquote = (STR_FUNC_EXPAND), str_dquote = (STR_FUNC_EXPAND),
str_xquote = (STR_FUNC_EXPAND), str_xquote = (STR_FUNC_EXPAND),
@ -7136,9 +7132,11 @@ parser_prepare(struct parser_params *parser)
#define IS_ARG() IS_lex_state(EXPR_ARG_ANY) #define IS_ARG() IS_lex_state(EXPR_ARG_ANY)
#define IS_END() IS_lex_state(EXPR_END_ANY) #define IS_END() IS_lex_state(EXPR_END_ANY)
#define IS_BEG() IS_lex_state(EXPR_BEG_ANY) #define IS_BEG() (IS_lex_state(EXPR_BEG_ANY) || IS_lex_state_all(EXPR_ARG|EXPR_LABELED))
#define IS_SPCARG(c) (IS_ARG() && space_seen && !ISSPACE(c)) #define IS_SPCARG(c) (IS_ARG() && space_seen && !ISSPACE(c))
#define IS_LABEL_POSSIBLE() ((IS_lex_state(EXPR_BEG | EXPR_ENDFN) && !cmd_state) || IS_ARG()) #define IS_LABEL_POSSIBLE() (\
(IS_lex_state(EXPR_LABEL|EXPR_ENDFN) && !cmd_state) || \
IS_ARG())
#define IS_LABEL_SUFFIX(n) (peek_n(':',(n)) && !peek_n(':', (n)+1)) #define IS_LABEL_SUFFIX(n) (peek_n(':',(n)) && !peek_n(':', (n)+1))
#define IS_AFTER_OPERATOR() IS_lex_state(EXPR_FNAME | EXPR_DOT) #define IS_AFTER_OPERATOR() IS_lex_state(EXPR_FNAME | EXPR_DOT)
@ -7809,7 +7807,7 @@ parse_ident(struct parser_params *parser, int c, int cmd_state)
if (IS_LABEL_POSSIBLE()) { if (IS_LABEL_POSSIBLE()) {
if (IS_LABEL_SUFFIX(0)) { if (IS_LABEL_SUFFIX(0)) {
lex_state = EXPR_LABELARG; lex_state = EXPR_ARG|EXPR_LABELED;
nextc(); nextc();
set_yylval_name(TOK_INTERN()); set_yylval_name(TOK_INTERN());
return tLABEL; return tLABEL;
@ -7843,11 +7841,11 @@ parse_ident(struct parser_params *parser, int c, int cmd_state)
return keyword_do_block; return keyword_do_block;
return keyword_do; return keyword_do;
} }
if (IS_lex_state_for(state, (EXPR_BEG | EXPR_VALUE | EXPR_LABELARG))) if (IS_lex_state_for(state, (EXPR_BEG | EXPR_LABELED)))
return kw->id[0]; return kw->id[0];
else { else {
if (kw->id[0] != kw->id[1]) if (kw->id[0] != kw->id[1])
lex_state = EXPR_BEG; lex_state = EXPR_BEG | EXPR_LABEL;
return kw->id[1]; return kw->id[1];
} }
} }
@ -7878,6 +7876,7 @@ parser_yylex(struct parser_params *parser)
register int c; register int c;
int space_seen = 0; int space_seen = 0;
int cmd_state; int cmd_state;
int label;
enum lex_state_e last_state; enum lex_state_e last_state;
#ifdef RIPPER #ifdef RIPPER
int fallthru = FALSE; int fallthru = FALSE;
@ -7894,7 +7893,7 @@ parser_yylex(struct parser_params *parser)
} }
else { else {
token = parse_string(lex_strterm); token = parse_string(lex_strterm);
if (token == tSTRING_END && (peek_n('\'', -1) || peek_n('"', -1))) { if ((token == tSTRING_END) && (lex_strterm->nd_func & STR_FUNC_LABEL)) {
if (((IS_lex_state(EXPR_BEG | EXPR_ENDFN) && !COND_P()) || IS_ARG()) && if (((IS_lex_state(EXPR_BEG | EXPR_ENDFN) && !COND_P()) || IS_ARG()) &&
IS_LABEL_SUFFIX(0)) { IS_LABEL_SUFFIX(0)) {
nextc(); nextc();
@ -7904,7 +7903,7 @@ parser_yylex(struct parser_params *parser)
if (token == tSTRING_END || token == tREGEXP_END || token == tLABEL_END) { if (token == tSTRING_END || token == tREGEXP_END || token == tLABEL_END) {
rb_gc_force_recycle((VALUE)lex_strterm); rb_gc_force_recycle((VALUE)lex_strterm);
lex_strterm = 0; lex_strterm = 0;
lex_state = token == tLABEL_END ? EXPR_LABELARG : EXPR_END; lex_state = token == tLABEL_END ? EXPR_BEG|EXPR_LABEL : EXPR_END;
} }
} }
return token; return token;
@ -7954,14 +7953,16 @@ parser_yylex(struct parser_params *parser)
#endif #endif
/* fall through */ /* fall through */
case '\n': case '\n':
if (IS_lex_state(EXPR_BEG | EXPR_VALUE | EXPR_CLASS | EXPR_FNAME | EXPR_DOT | EXPR_LABELARG)) { c = (IS_lex_state(EXPR_BEG|EXPR_CLASS|EXPR_FNAME|EXPR_DOT) &&
!IS_lex_state(EXPR_LABELED));
if (c || IS_lex_state_all(EXPR_ARG|EXPR_LABELED)) {
#ifdef RIPPER #ifdef RIPPER
if (!fallthru) { if (!fallthru) {
ripper_dispatch_scan_event(parser, tIGNORED_NL); ripper_dispatch_scan_event(parser, tIGNORED_NL);
} }
fallthru = FALSE; fallthru = FALSE;
#endif #endif
if (IS_lex_state(EXPR_LABELARG) && parser->parser_in_kwarg) { if (!c && parser->parser_in_kwarg) {
goto normal_newline; goto normal_newline;
} }
goto retry; goto retry;
@ -8175,7 +8176,8 @@ parser_yylex(struct parser_params *parser)
return '>'; return '>';
case '"': case '"':
lex_strterm = NEW_STRTERM(str_dquote, '"', 0); label = (IS_LABEL_POSSIBLE() ? str_label : 0);
lex_strterm = NEW_STRTERM(str_dquote | label, '"', 0);
return tSTRING_BEG; return tSTRING_BEG;
case '`': case '`':
@ -8194,7 +8196,8 @@ parser_yylex(struct parser_params *parser)
return tXSTRING_BEG; return tXSTRING_BEG;
case '\'': case '\'':
lex_strterm = NEW_STRTERM(str_squote, '\'', 0); label = (IS_LABEL_POSSIBLE() ? str_label : 0);
lex_strterm = NEW_STRTERM(str_squote | label, '\'', 0);
return tSTRING_BEG; return tSTRING_BEG;
case '?': case '?':
@ -8247,7 +8250,7 @@ parser_yylex(struct parser_params *parser)
lex_state = EXPR_BEG; lex_state = EXPR_BEG;
return tOP_ASGN; return tOP_ASGN;
} }
lex_state = IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG; lex_state = IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG|EXPR_LABEL;
pushback(c); pushback(c);
return '|'; return '|';
@ -8377,7 +8380,7 @@ parser_yylex(struct parser_params *parser)
return tSYMBEG; return tSYMBEG;
case '/': case '/':
if (IS_lex_state(EXPR_BEG_ANY)) { if (IS_BEG()) {
lex_strterm = NEW_STRTERM(str_regexp, '/', 0); lex_strterm = NEW_STRTERM(str_regexp, '/', 0);
return tREGEXP_BEG; return tREGEXP_BEG;
} }
@ -8412,7 +8415,7 @@ parser_yylex(struct parser_params *parser)
return ';'; return ';';
case ',': case ',':
lex_state = EXPR_BEG; lex_state = EXPR_BEG|EXPR_LABEL;
return ','; return ',';
case '~': case '~':
@ -8437,7 +8440,7 @@ parser_yylex(struct parser_params *parser)
paren_nest++; paren_nest++;
COND_PUSH(0); COND_PUSH(0);
CMDARG_PUSH(0); CMDARG_PUSH(0);
lex_state = EXPR_BEG; lex_state = EXPR_BEG|EXPR_LABEL;
return c; return c;
case '[': case '[':
@ -8452,15 +8455,16 @@ parser_yylex(struct parser_params *parser)
return tAREF; return tAREF;
} }
pushback(c); pushback(c);
lex_state |= EXPR_LABEL;
return '['; return '[';
} }
else if (IS_BEG()) { else if (IS_BEG()) {
c = tLBRACK; c = tLBRACK;
} }
else if (IS_ARG() && space_seen) { else if (IS_ARG() && (space_seen || IS_lex_state(EXPR_LABELED))) {
c = tLBRACK; c = tLBRACK;
} }
lex_state = EXPR_BEG; lex_state = EXPR_BEG|EXPR_LABEL;
COND_PUSH(0); COND_PUSH(0);
CMDARG_PUSH(0); CMDARG_PUSH(0);
return c; return c;
@ -8475,7 +8479,9 @@ parser_yylex(struct parser_params *parser)
CMDARG_PUSH(0); CMDARG_PUSH(0);
return tLAMBEG; return tLAMBEG;
} }
if (IS_ARG() || IS_lex_state(EXPR_END | EXPR_ENDFN)) if (IS_lex_state(EXPR_LABELED))
c = tLBRACE; /* hash */
else if (IS_lex_state(EXPR_ARG_ANY | EXPR_END | EXPR_ENDFN))
c = '{'; /* block (primary) */ c = '{'; /* block (primary) */
else if (IS_lex_state(EXPR_ENDARG)) else if (IS_lex_state(EXPR_ENDARG))
c = tLBRACE_ARG; /* block (expr) */ c = tLBRACE_ARG; /* block (expr) */
@ -8484,6 +8490,7 @@ parser_yylex(struct parser_params *parser)
COND_PUSH(0); COND_PUSH(0);
CMDARG_PUSH(0); CMDARG_PUSH(0);
lex_state = EXPR_BEG; lex_state = EXPR_BEG;
if (c != tLBRACE_ARG) lex_state |= EXPR_LABEL;
if (c != tLBRACE) command_start = TRUE; if (c != tLBRACE) command_start = TRUE;
return c; return c;
@ -8977,7 +8984,6 @@ lex_state_name(enum lex_state_e state)
static const char names[][12] = { static const char names[][12] = {
"EXPR_BEG", "EXPR_END", "EXPR_ENDARG", "EXPR_ENDFN", "EXPR_ARG", "EXPR_BEG", "EXPR_END", "EXPR_ENDARG", "EXPR_ENDFN", "EXPR_ARG",
"EXPR_CMDARG", "EXPR_MID", "EXPR_FNAME", "EXPR_DOT", "EXPR_CLASS", "EXPR_CMDARG", "EXPR_MID", "EXPR_FNAME", "EXPR_DOT", "EXPR_CLASS",
"EXPR_VALUE",
}; };
if ((unsigned)state & ~(~0u << EXPR_MAX_STATE)) if ((unsigned)state & ~(~0u << EXPR_MAX_STATE))

21
test/ruby/test_syntax.rb
View file

@ -295,6 +295,27 @@ WARN
assert_not_label(:foo, 'class Foo < not_label:foo; end', bug6347) assert_not_label(:foo, 'class Foo < not_label:foo; end', bug6347)
end end
def test_no_label_with_percent
assert_syntax_error('{%"a": 1}', /unexpected ':'/)
assert_syntax_error("{%'a': 1}", /unexpected ':'/)
assert_syntax_error('{%Q"a": 1}', /unexpected ':'/)
assert_syntax_error("{%Q'a': 1}", /unexpected ':'/)
assert_syntax_error('{%q"a": 1}', /unexpected ':'/)
assert_syntax_error("{%q'a': 1}", /unexpected ':'/)
end
def test_block_after_cond
bug10653 = '[ruby-dev:48790] [Bug #10653]'
assert_valid_syntax("false ? raise {} : tap {}", bug10653)
assert_valid_syntax("false ? raise do end : tap do end", bug10653)
end
def test_paren_after_label
bug11456 = '[ruby-dev:49221] [Bug #11456]'
assert_valid_syntax("{foo: (1 rescue 0)}", bug11456)
assert_valid_syntax("{foo: /=/}", bug11456)
end
def test_duplicated_arg def test_duplicated_arg
assert_syntax_error("def foo(a, a) end", /duplicated argument name/) assert_syntax_error("def foo(a, a) end", /duplicated argument name/)
assert_nothing_raised { def foo(_, _) end } assert_nothing_raised { def foo(_, _) end }

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.2.4" #define RUBY_VERSION "2.2.4"
#define RUBY_RELEASE_DATE "2015-10-05" #define RUBY_RELEASE_DATE "2015-10-06"
#define RUBY_PATCHLEVEL 179 #define RUBY_PATCHLEVEL 180
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 10 #define RUBY_RELEASE_MONTH 10
#define RUBY_RELEASE_DAY 5 #define RUBY_RELEASE_DAY 6
#include "ruby/version.h" #include "ruby/version.h"