[ruby-cvs:59197] nagachika:r52046 (ruby_2_2): merge revision(s) 50409, 51616, 51617, 51624: [Backport #10653] [Backport #11456]

[nagachika at ruby-lang.org]

nagachika	2015-10-06 01:47:24 +0900 (Tue, 06 Oct 2015)

  New Revision: 52046

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52046

  Log:
    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]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/parse.y
    branches/ruby_2_2/test/ruby/test_syntax.rb
    branches/ruby_2_2/version.h