Project

General

Profile

« Previous | Next » 

Revision df51beda

Added by nagachika (Tomoyuki Chikanaga) over 8 years ago

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

    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