summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2021-03-02 12:00:29 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2021-03-02 12:00:29 +0000
commitf56a213a99655616a21ace3b354aa868ca2dff70 (patch)
tree3ce5fc3430b87123937b537d98a311f7011407e6
parent0fe5d0f60df11203be9a5ace1ead2895759f456a (diff)
merge revision(s) e39f7e64: [Backport #16760]
parse.y: fix segv with Ripper#yydebug * parse.y (parser_token_value_print): in ripper, ID values are wrapped in NODE_RIPPER at set_yylval_name(), so print the Symbol wrapped together. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 2 +- test/ripper/test_ripper.rb | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--parse.y2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/parse.y b/parse.y
index 5d16920c20..b0738737cd 100644
--- a/parse.y
+++ b/parse.y
@@ -9139,7 +9139,7 @@ parser_token_value_print(struct parser_params *p, enum yytokentype type, const Y
#ifndef RIPPER
v = rb_id2str(valp->id);
#else
- v = valp->val;
+ v = valp->node->nd_rval;
#endif
rb_parser_printf(p, "%"PRIsVALUE, v);
break;
diff --git a/version.h b/version.h
index a827dae432..4dd12053c2 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.6.7"
#define RUBY_RELEASE_DATE "2021-03-02"
-#define RUBY_PATCHLEVEL 171
+#define RUBY_PATCHLEVEL 172
#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 3