diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-30 13:20:09 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-30 13:20:09 +0000 |
commit | 764fe09a4b29a4df1163e1dcb3952628db1f6974 (patch) | |
tree | 6385a25433450ed647a10c1747ee53e55f235ea5 | |
parent | e31f9b0aff2329544ce0798cccf34d381e34aa8a (diff) |
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
-rw-r--r-- | parse.y | 2 | ||||
-rw-r--r-- | test/ripper/test_sexp.rb | 8 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -4335,7 +4335,7 @@ sym : fname | 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 064c0f1536..d63464d5a7 100644 --- a/test/ripper/test_sexp.rb +++ b/test/ripper/test_sexp.rb @@ -132,4 +132,12 @@ eot 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 @@ -1,6 +1,6 @@ #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 |