naruse	2019-03-28 12:26:50 +0900 (Thu, 28 Mar 2019)

  New Revision: 67352

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

  Log:
    merge revision(s) 67270: [Backport #15670]
    
    dsym should be treated as string [ruby-core:91852] [Bug #15670]

  Modified directories:
    branches/ruby_2_6/
  Modified files:
    branches/ruby_2_6/parse.y
    branches/ruby_2_6/test/ripper/test_sexp.rb
    branches/ruby_2_6/version.h
Index: ruby_2_6/parse.y
===================================================================
--- ruby_2_6/parse.y	(revision 67351)
+++ ruby_2_6/parse.y	(revision 67352)
@@ -3763,7 +3763,7 @@ sym		: fname https://github.com/ruby/ruby/blob/trunk/ruby_2_6/parse.y#L3763
 		| tCVAR
 		;
 
-dsym		: tSYMBEG xstring_contents tSTRING_END
+dsym		: tSYMBEG string_contents tSTRING_END
 		    {
 			SET_LEX_STATE(EXPR_END);
 		    /*%%%*/
Index: ruby_2_6/test/ripper/test_sexp.rb
===================================================================
--- ruby_2_6/test/ripper/test_sexp.rb	(revision 67351)
+++ ruby_2_6/test/ripper/test_sexp.rb	(revision 67352)
@@ -132,4 +132,12 @@ eot https://github.com/ruby/ruby/blob/trunk/ruby_2_6/test/ripper/test_sexp.rb#L132
       end
     end
   end
+
+  def test_dsym
+    bug15670 = '[ruby-core:91852]'
+    _, (_, _, s) = Ripper.sexp_raw(%q{:"sym"})
+    assert_equal([:dyna_symbol, [:string_add, [:string_content], [:@tstring_content, "sym", [1, 2]]]],
+                 s,
+                 bug15670)
+  end
 end if ripper_test
Index: ruby_2_6/version.h
===================================================================
--- ruby_2_6/version.h	(revision 67351)
+++ ruby_2_6/version.h	(revision 67352)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/version.h#L1
 #define RUBY_VERSION "2.6.3"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 49
+#define RUBY_PATCHLEVEL 50
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_6
===================================================================
--- ruby_2_6	(revision 67351)
+++ ruby_2_6	(revision 67352)

Property changes on: ruby_2_6
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r67270

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