summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--parse.y2
-rw-r--r--test/ripper/test_sexp.rb8
-rw-r--r--version.h2
3 files changed, 10 insertions, 2 deletions
diff --git a/parse.y b/parse.y
index 3b3bd7a4ca..682fc28fcf 100644
--- a/parse.y
+++ b/parse.y
@@ -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
diff --git a/version.h b/version.h
index 6b71429bc1..d59d699b54 100644
--- a/version.h
+++ b/version.h
@@ -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