ruby-changes:55637
From: usa <ko1@a...>
Date: Tue, 30 Apr 2019 22:50:32 +0900 (JST)
Subject: [ruby-changes:55637] usa:764fe09a4b (ruby_2_5): merge revision(s) 67270: [Backport #15670]
https://git.ruby-lang.org/ruby.git/commit/?id=764fe09a4b From 764fe09a4b29a4df1163e1dcb3952628db1f6974 Mon Sep 17 00:00:00 2001 From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Tue, 30 Apr 2019 13:20:09 +0000 Subject: merge revision(s) 67270: [Backport #15670] dsym should be treated as string [ruby-core:91852] [Bug #15670] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67707 b2dd03c8-39d4-4d8f-98ff-823fe69b080e diff --git a/parse.y b/parse.y index 3b3bd7a..682fc28 100644 --- a/parse.y +++ b/parse.y @@ -4335,7 +4335,7 @@ sym : fname https://github.com/ruby/ruby/blob/trunk/parse.y#L4335 | tCVAR ; -dsym : tSYMBEG xstring_contents tSTRING_END +dsym : tSYMBEG string_contents tSTRING_END { SET_LEX_STATE(EXPR_END|EXPR_ENDARG); /*%%%*/ diff --git a/test/ripper/test_sexp.rb b/test/ripper/test_sexp.rb index 064c0f1..d63464d 100644 --- a/test/ripper/test_sexp.rb +++ b/test/ripper/test_sexp.rb @@ -132,4 +132,12 @@ eot https://github.com/ruby/ruby/blob/trunk/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 diff --git a/version.h b/version.h index 6b71429..d59d699 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L1 #define RUBY_VERSION "2.5.6" #define RUBY_RELEASE_DATE "2019-04-30" -#define RUBY_PATCHLEVEL 164 +#define RUBY_PATCHLEVEL 165 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 4 -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/