nagachika	2015-12-23 05:59:30 +0900 (Wed, 23 Dec 2015)

  New Revision: 53257

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

  Log:
    merge revision(s) 53092,53093: [Backport #11812] [Backport #11833]
    
    * parse.y (parse_percent): Allow %-literals in labeled arg as
      r51624 did for parentheses.
      Fixes [ruby-core:72084] [Bug #11812].
    
    * test/ruby/test_syntax.rb: fix typo in test

  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
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 53256)
+++ ruby_2_2/ChangeLog	(revision 53257)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Wed Dec 23 05:52:06 2015  Yuki Yugui Sonoda  <yugui@y...>
+
+	* test/ruby/test_syntax.rb: fix typo in test
+
+Wed Dec 23 05:52:06 2015  Yuki Yugui Sonoda  <yugui@y...>
+
+	* parse.y (parse_percent): Allow %-literals in labeled arg as
+	  r51624 did for parentheses.
+	  Fixes [ruby-core:72084] [Bug #11812].
+
 Mon Dec 21 05:05:54 2015  SHIBATA Hiroshi  <hsbt@r...>
 
 	* cont.c: fix a double word typo.
Index: ruby_2_2/parse.y
===================================================================
--- ruby_2_2/parse.y	(revision 53256)
+++ ruby_2_2/parse.y	(revision 53257)
@@ -7485,7 +7485,7 @@ parse_percent(struct parser_params *pars https://github.com/ruby/ruby/blob/trunk/ruby_2_2/parse.y#L7485
 {
     register int c;
 
-    if (IS_lex_state(EXPR_BEG_ANY)) {
+    if (IS_BEG()) {
 	int term;
 	int paren;
 
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 53256)
+++ ruby_2_2/version.h	(revision 53257)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2015-12-23"
-#define RUBY_PATCHLEVEL 233
+#define RUBY_PATCHLEVEL 234
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 12
Index: ruby_2_2/test/ruby/test_syntax.rb
===================================================================
--- ruby_2_2/test/ruby/test_syntax.rb	(revision 53256)
+++ ruby_2_2/test/ruby/test_syntax.rb	(revision 53257)
@@ -326,6 +326,12 @@ WARN https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_syntax.rb#L326
     assert_valid_syntax("{foo: /=/}", bug11456)
   end
 
+  def test_percent_string_after_label
+    bug11812 = '[ruby-core:72084]'
+    assert_valid_syntax('{label:%w(*)}', bug11812)
+    assert_valid_syntax('{label: %w(*)}', bug11812)
+  end
+
   def test_duplicated_arg
     assert_syntax_error("def foo(a, a) end", /duplicated argument name/)
     assert_nothing_raised { def foo(_, _) end }

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53092-53093


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/