From b7c90baf074156456e2ba5216c492e8b79b8bc3c Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 18 Apr 2016 17:12:34 +0000 Subject: merge revision(s) 53753,54131: [Backport #8851] lex.c.blt: update * lex.c.blt: follows r52429, not removing casts to int. * defs/keywords (alias, undef): symbol literals are allowed. * parse.y (parse_percent): should parse symbol literals for alias and undef. [ruby-dev:47681] [Bug #8851] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++ defs/keywords | 4 +-- defs/lex.c.src | 4 +-- lex.c.blt | 82 ++++++++++++++++++++++++------------------------ parse.y | 12 ++++--- test/ruby/test_syntax.rb | 24 ++++++++++++++ version.h | 6 ++-- 7 files changed, 86 insertions(+), 53 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6759e2b017..62557cb002 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Apr 19 01:53:32 2016 Nobuyoshi Nakada + + * defs/keywords (alias, undef): symbol literals are allowed. + + * parse.y (parse_percent): should parse symbol literals for alias + and undef. [ruby-dev:47681] [Bug #8851] + Mon Apr 18 18:05:29 2016 Nobuyoshi Nakada * struct.c (struct_make_members_list, rb_struct_s_def): member diff --git a/defs/keywords b/defs/keywords index 20044a420c..e0d931cd1f 100644 --- a/defs/keywords +++ b/defs/keywords @@ -13,7 +13,7 @@ __LINE__, {keyword__LINE__, keyword__LINE__}, EXPR_END __FILE__, {keyword__FILE__, keyword__FILE__}, EXPR_END BEGIN, {keyword_BEGIN, keyword_BEGIN}, EXPR_END END, {keyword_END, keyword_END}, EXPR_END -alias, {keyword_alias, keyword_alias}, EXPR_FNAME +alias, {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM and, {keyword_and, keyword_and}, EXPR_VALUE begin, {keyword_begin, keyword_begin}, EXPR_BEG break, {keyword_break, keyword_break}, EXPR_MID @@ -43,7 +43,7 @@ self, {keyword_self, keyword_self}, EXPR_END super, {keyword_super, keyword_super}, EXPR_ARG then, {keyword_then, keyword_then}, EXPR_BEG true, {keyword_true, keyword_true}, EXPR_END -undef, {keyword_undef, keyword_undef}, EXPR_FNAME +undef, {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM unless, {keyword_unless, modifier_unless}, EXPR_VALUE until, {keyword_until, modifier_until}, EXPR_VALUE when, {keyword_when, keyword_when}, EXPR_VALUE diff --git a/defs/lex.c.src b/defs/lex.c.src index 20044a420c..e0d931cd1f 100644 --- a/defs/lex.c.src +++ b/defs/lex.c.src @@ -13,7 +13,7 @@ __LINE__, {keyword__LINE__, keyword__LINE__}, EXPR_END __FILE__, {keyword__FILE__, keyword__FILE__}, EXPR_END BEGIN, {keyword_BEGIN, keyword_BEGIN}, EXPR_END END, {keyword_END, keyword_END}, EXPR_END -alias, {keyword_alias, keyword_alias}, EXPR_FNAME +alias, {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM and, {keyword_and, keyword_and}, EXPR_VALUE begin, {keyword_begin, keyword_begin}, EXPR_BEG break, {keyword_break, keyword_break}, EXPR_MID @@ -43,7 +43,7 @@ self, {keyword_self, keyword_self}, EXPR_END super, {keyword_super, keyword_super}, EXPR_ARG then, {keyword_then, keyword_then}, EXPR_BEG true, {keyword_true, keyword_true}, EXPR_END -undef, {keyword_undef, keyword_undef}, EXPR_FNAME +undef, {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM unless, {keyword_unless, modifier_unless}, EXPR_VALUE until, {keyword_until, modifier_until}, EXPR_VALUE when, {keyword_when, keyword_when}, EXPR_VALUE diff --git a/lex.c.blt b/lex.c.blt index 45789fc952..7d8dd5b6e7 100644 --- a/lex.c.blt +++ b/lex.c.blt @@ -203,88 +203,88 @@ rb_reserved_word (str, len) { {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, #line 19 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str8), {keyword_break, keyword_break}, EXPR_MID}, + {(int)offsetof(struct stringpool_t, stringpool_str8), {keyword_break, keyword_break}, EXPR_MID}, #line 25 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str9), {keyword_else, keyword_else}, EXPR_BEG}, + {(int)offsetof(struct stringpool_t, stringpool_str9), {keyword_else, keyword_else}, EXPR_BEG}, #line 35 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str10), {keyword_nil, keyword_nil}, EXPR_END}, + {(int)offsetof(struct stringpool_t, stringpool_str10), {keyword_nil, keyword_nil}, EXPR_END}, #line 28 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str11), {keyword_ensure, keyword_ensure}, EXPR_BEG}, + {(int)offsetof(struct stringpool_t, stringpool_str11), {keyword_ensure, keyword_ensure}, EXPR_BEG}, #line 27 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str12), {keyword_end, keyword_end}, EXPR_END}, + {(int)offsetof(struct stringpool_t, stringpool_str12), {keyword_end, keyword_end}, EXPR_END}, #line 44 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str13), {keyword_then, keyword_then}, EXPR_BEG}, + {(int)offsetof(struct stringpool_t, stringpool_str13), {keyword_then, keyword_then}, EXPR_BEG}, #line 36 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str14), {keyword_not, keyword_not}, EXPR_ARG}, + {(int)offsetof(struct stringpool_t, stringpool_str14), {keyword_not, keyword_not}, EXPR_ARG}, #line 29 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str15), {keyword_false, keyword_false}, EXPR_END}, + {(int)offsetof(struct stringpool_t, stringpool_str15), {keyword_false, keyword_false}, EXPR_END}, #line 42 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str16), {keyword_self, keyword_self}, EXPR_END}, + {(int)offsetof(struct stringpool_t, stringpool_str16), {keyword_self, keyword_self}, EXPR_END}, #line 26 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str17), {keyword_elsif, keyword_elsif}, EXPR_VALUE}, + {(int)offsetof(struct stringpool_t, stringpool_str17), {keyword_elsif, keyword_elsif}, EXPR_VALUE}, #line 39 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str18), {keyword_rescue, modifier_rescue}, EXPR_MID}, + {(int)offsetof(struct stringpool_t, stringpool_str18), {keyword_rescue, modifier_rescue}, EXPR_MID}, #line 45 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str19), {keyword_true, keyword_true}, EXPR_END}, + {(int)offsetof(struct stringpool_t, stringpool_str19), {keyword_true, keyword_true}, EXPR_END}, #line 48 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str20), {keyword_until, modifier_until}, EXPR_VALUE}, + {(int)offsetof(struct stringpool_t, stringpool_str20), {keyword_until, modifier_until}, EXPR_VALUE}, #line 47 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str21), {keyword_unless, modifier_unless}, EXPR_VALUE}, + {(int)offsetof(struct stringpool_t, stringpool_str21), {keyword_unless, modifier_unless}, EXPR_VALUE}, #line 41 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str22), {keyword_return, keyword_return}, EXPR_MID}, + {(int)offsetof(struct stringpool_t, stringpool_str22), {keyword_return, keyword_return}, EXPR_MID}, #line 22 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str23), {keyword_def, keyword_def}, EXPR_FNAME}, + {(int)offsetof(struct stringpool_t, stringpool_str23), {keyword_def, keyword_def}, EXPR_FNAME}, #line 17 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str24), {keyword_and, keyword_and}, EXPR_VALUE}, + {(int)offsetof(struct stringpool_t, stringpool_str24), {keyword_and, keyword_and}, EXPR_VALUE}, #line 24 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str25), {keyword_do, keyword_do}, EXPR_BEG}, + {(int)offsetof(struct stringpool_t, stringpool_str25), {keyword_do, keyword_do}, EXPR_BEG}, #line 51 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str26), {keyword_yield, keyword_yield}, EXPR_ARG}, + {(int)offsetof(struct stringpool_t, stringpool_str26), {keyword_yield, keyword_yield}, EXPR_ARG}, #line 30 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str27), {keyword_for, keyword_for}, EXPR_VALUE}, + {(int)offsetof(struct stringpool_t, stringpool_str27), {keyword_for, keyword_for}, EXPR_VALUE}, #line 46 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str28), {keyword_undef, keyword_undef}, EXPR_FNAME}, + {(int)offsetof(struct stringpool_t, stringpool_str28), {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM}, #line 37 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str29), {keyword_or, keyword_or}, EXPR_VALUE}, + {(int)offsetof(struct stringpool_t, stringpool_str29), {keyword_or, keyword_or}, EXPR_VALUE}, #line 32 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str30), {keyword_in, keyword_in}, EXPR_VALUE}, + {(int)offsetof(struct stringpool_t, stringpool_str30), {keyword_in, keyword_in}, EXPR_VALUE}, #line 49 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str31), {keyword_when, keyword_when}, EXPR_VALUE}, + {(int)offsetof(struct stringpool_t, stringpool_str31), {keyword_when, keyword_when}, EXPR_VALUE}, #line 40 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str32), {keyword_retry, keyword_retry}, EXPR_END}, + {(int)offsetof(struct stringpool_t, stringpool_str32), {keyword_retry, keyword_retry}, EXPR_END}, #line 31 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str33), {keyword_if, modifier_if}, EXPR_VALUE}, + {(int)offsetof(struct stringpool_t, stringpool_str33), {keyword_if, modifier_if}, EXPR_VALUE}, #line 20 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str34), {keyword_case, keyword_case}, EXPR_VALUE}, + {(int)offsetof(struct stringpool_t, stringpool_str34), {keyword_case, keyword_case}, EXPR_VALUE}, #line 38 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str35), {keyword_redo, keyword_redo}, EXPR_END}, + {(int)offsetof(struct stringpool_t, stringpool_str35), {keyword_redo, keyword_redo}, EXPR_END}, #line 34 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str36), {keyword_next, keyword_next}, EXPR_MID}, + {(int)offsetof(struct stringpool_t, stringpool_str36), {keyword_next, keyword_next}, EXPR_MID}, #line 43 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str37), {keyword_super, keyword_super}, EXPR_ARG}, + {(int)offsetof(struct stringpool_t, stringpool_str37), {keyword_super, keyword_super}, EXPR_ARG}, #line 33 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str38), {keyword_module, keyword_module}, EXPR_VALUE}, + {(int)offsetof(struct stringpool_t, stringpool_str38), {keyword_module, keyword_module}, EXPR_VALUE}, #line 18 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str39), {keyword_begin, keyword_begin}, EXPR_BEG}, + {(int)offsetof(struct stringpool_t, stringpool_str39), {keyword_begin, keyword_begin}, EXPR_BEG}, #line 12 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str40), {keyword__LINE__, keyword__LINE__}, EXPR_END}, + {(int)offsetof(struct stringpool_t, stringpool_str40), {keyword__LINE__, keyword__LINE__}, EXPR_END}, #line 13 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str41), {keyword__FILE__, keyword__FILE__}, EXPR_END}, + {(int)offsetof(struct stringpool_t, stringpool_str41), {keyword__FILE__, keyword__FILE__}, EXPR_END}, #line 11 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str42), {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END}, + {(int)offsetof(struct stringpool_t, stringpool_str42), {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END}, #line 15 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str43), {keyword_END, keyword_END}, EXPR_END}, + {(int)offsetof(struct stringpool_t, stringpool_str43), {keyword_END, keyword_END}, EXPR_END}, #line 16 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str44), {keyword_alias, keyword_alias}, EXPR_FNAME}, + {(int)offsetof(struct stringpool_t, stringpool_str44), {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM}, #line 14 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str45), {keyword_BEGIN, keyword_BEGIN}, EXPR_END}, + {(int)offsetof(struct stringpool_t, stringpool_str45), {keyword_BEGIN, keyword_BEGIN}, EXPR_END}, #line 23 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str46), {keyword_defined, keyword_defined}, EXPR_ARG}, + {(int)offsetof(struct stringpool_t, stringpool_str46), {keyword_defined, keyword_defined}, EXPR_ARG}, #line 21 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str47), {keyword_class, keyword_class}, EXPR_CLASS}, + {(int)offsetof(struct stringpool_t, stringpool_str47), {keyword_class, keyword_class}, EXPR_CLASS}, {-1}, {-1}, #line 50 "defs/keywords" - {offsetof(struct stringpool_t, stringpool_str50), {keyword_while, modifier_while}, EXPR_VALUE} + {(int)offsetof(struct stringpool_t, stringpool_str50), {keyword_while, modifier_while}, EXPR_VALUE} }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) diff --git a/parse.y b/parse.y index 0ffcaf68d9..ee796a4eb4 100644 --- a/parse.y +++ b/parse.y @@ -73,6 +73,7 @@ enum lex_state_bits { EXPR_CLASS_bit, /* immediate after `class', no here document. */ EXPR_LABEL_bit, /* flag bit, label is allowed. */ EXPR_LABELED_bit, /* flag bit, just after a label. */ + EXPR_FITEM_bit, /* symbol literal as FNAME. */ EXPR_MAX_STATE }; /* examine combinations */ @@ -90,6 +91,7 @@ enum lex_state_e { DEF_EXPR(CLASS), DEF_EXPR(LABEL), DEF_EXPR(LABELED), + DEF_EXPR(FITEM), EXPR_VALUE = EXPR_BEG, EXPR_BEG_ANY = (EXPR_BEG | EXPR_MID | EXPR_CLASS), EXPR_ARG_ANY = (EXPR_ARG | EXPR_CMDARG), @@ -1131,7 +1133,7 @@ stmt_or_begin : stmt %*/ } -stmt : keyword_alias fitem {SET_LEX_STATE(EXPR_FNAME);} fitem +stmt : keyword_alias fitem {SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);} fitem { /*%%%*/ $$ = NEW_ALIAS($2, $4); @@ -1967,7 +1969,7 @@ undef_list : fitem $$ = rb_ary_new3(1, $1); %*/ } - | undef_list ',' {SET_LEX_STATE(EXPR_FNAME);} fitem + | undef_list ',' {SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);} fitem { /*%%%*/ $$ = block_append($1, NEW_UNDEF($4)); @@ -7790,7 +7792,7 @@ parse_percent(struct parser_params *parser, const int space_seen, const enum lex case 's': lex_strterm = NEW_STRTERM(str_ssym, term, paren); - SET_LEX_STATE(EXPR_FNAME); + SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM); return tSYMBEG; default: @@ -7803,7 +7805,7 @@ parse_percent(struct parser_params *parser, const int space_seen, const enum lex SET_LEX_STATE(EXPR_BEG); return tOP_ASGN; } - if (IS_SPCARG(c)) { + if (IS_SPCARG(c) || (IS_lex_state(EXPR_FITEM) && c == 's')) { goto quotation; } SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG); @@ -9212,7 +9214,7 @@ id_is_var_gen(struct parser_params *parser, ID id) static const char lex_state_names[][13] = { "EXPR_BEG", "EXPR_END", "EXPR_ENDARG", "EXPR_ENDFN", "EXPR_ARG", "EXPR_CMDARG", "EXPR_MID", "EXPR_FNAME", "EXPR_DOT", "EXPR_CLASS", - "EXPR_LABEL", "EXPR_LABELED", + "EXPR_LABEL", "EXPR_LABELED","EXPR_FITEM", }; static VALUE diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 9f3bd0dab3..50c3e7e6b5 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -781,6 +781,30 @@ eom end end + def test_alias_symbol + bug8851 = '[ruby-dev:47681] [Bug #8851]' + formats = ['%s', ":'%s'", ':"%s"', '%%s(%s)'] + all_assertions(bug8851) do |all| + formats.product(formats) do |form1, form2| + all.for(code = "alias #{form1 % 'a'} #{form2 % 'p'}") do + assert_valid_syntax(code) + end + end + end + end + + def test_undef_symbol + bug8851 = '[ruby-dev:47681] [Bug #8851]' + formats = ['%s', ":'%s'", ':"%s"', '%%s(%s)'] + all_assertions(bug8851) do |all| + formats.product(formats) do |form1, form2| + all.for(code = "undef #{form1 % 'a'}, #{form2 % 'p'}") do + assert_valid_syntax(code) + end + end + end + end + private def not_label(x) @result = x; @not_label ||= nil end diff --git a/version.h b/version.h index 2c2a8a48fb..6fec9955ad 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.3.0" -#define RUBY_RELEASE_DATE "2016-04-18" -#define RUBY_PATCHLEVEL 93 +#define RUBY_RELEASE_DATE "2016-04-19" +#define RUBY_PATCHLEVEL 94 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 18 +#define RUBY_RELEASE_DAY 19 #include "ruby/version.h" -- cgit v1.2.3