ruby-changes:73387
From: nagachika <ko1@a...>
Date: Sat, 3 Sep 2022 15:19:01 +0900 (JST)
Subject: [ruby-changes:73387] ffd3d83ea8 (ruby_3_1): merge revision(s) 08b6aacc1a14440e0f1644a05238559c6c585e38: [Backport #18739]
https://git.ruby-lang.org/ruby.git/commit/?id=ffd3d83ea8 From ffd3d83ea8ccf111061a0f03036e5a093bb03674 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Sat, 3 Sep 2022 15:18:43 +0900 Subject: merge revision(s) 08b6aacc1a14440e0f1644a05238559c6c585e38: [Backport #18739] Fix the wrong index of the previous component [Bug #18739] --- parse.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- parse.y | 2 +- version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parse.y b/parse.y index 17c7b38e4c..4e05bfd672 100644 --- a/parse.y +++ b/parse.y @@ -1783,7 +1783,7 @@ expr : command_call https://github.com/ruby/ruby/blob/trunk/parse.y#L1783 p_top_expr_body { pop_pvtbl(p, $<tbl>3); - p->ctxt.in_kwarg = $<ctxt>1.in_kwarg; + p->ctxt.in_kwarg = $<ctxt>2.in_kwarg; /*%%%*/ $$ = NEW_CASE3($1, NEW_IN($4, NEW_TRUE(&@4), NEW_FALSE(&@4), &@4), &@$); /*% %*/ diff --git a/version.h b/version.h index 1e4c579494..11e4e6ede9 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 42 +#define RUBY_PATCHLEVEL 43 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 9 -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/