diff options
author | Kazuki Tsujimoto <kazuki@callcc.net> | 2022-09-09 14:00:27 +0900 |
---|---|---|
committer | Kazuki Tsujimoto <kazuki@callcc.net> | 2022-09-09 14:00:27 +0900 |
commit | db0e0dad1171456253ebd899e7e878823923d3d8 (patch) | |
tree | b508300c459b536d0bb8e92ca5c0a9e32710de3a | |
parent | 59eadf3d25b0f53e7570f98f1801737af642f328 (diff) |
Fix unexpected "duplicated key name" error in paren-less one line pattern matching
[Bug #18990]
-rw-r--r-- | parse.y | 16 | ||||
-rw-r--r-- | test/ruby/test_pattern_matching.rb | 12 |
2 files changed, 24 insertions, 4 deletions
@@ -1774,14 +1774,18 @@ expr : command_call p->ctxt.in_kwarg = 1; $<tbl>$ = push_pvtbl(p); } + { + $<tbl>$ = push_pktbl(p); + } p_top_expr_body { + pop_pktbl(p, $<tbl>4); pop_pvtbl(p, $<tbl>3); p->ctxt.in_kwarg = $<ctxt>2.in_kwarg; /*%%%*/ - $$ = NEW_CASE3($1, NEW_IN($4, 0, 0, &@4), &@$); + $$ = NEW_CASE3($1, NEW_IN($5, 0, 0, &@5), &@$); /*% %*/ - /*% ripper: case!($1, in!($4, Qnil, Qnil)) %*/ + /*% ripper: case!($1, in!($5, Qnil, Qnil)) %*/ } | arg keyword_in { @@ -1792,14 +1796,18 @@ expr : command_call p->ctxt.in_kwarg = 1; $<tbl>$ = push_pvtbl(p); } + { + $<tbl>$ = push_pktbl(p); + } p_top_expr_body { + pop_pktbl(p, $<tbl>4); pop_pvtbl(p, $<tbl>3); p->ctxt.in_kwarg = $<ctxt>2.in_kwarg; /*%%%*/ - $$ = NEW_CASE3($1, NEW_IN($4, NEW_TRUE(&@4), NEW_FALSE(&@4), &@4), &@$); + $$ = NEW_CASE3($1, NEW_IN($5, NEW_TRUE(&@5), NEW_FALSE(&@5), &@5), &@$); /*% %*/ - /*% ripper: case!($1, in!($4, Qnil, Qnil)) %*/ + /*% ripper: case!($1, in!($5, Qnil, Qnil)) %*/ } | arg %prec tLBRACE_ARG ; diff --git a/test/ruby/test_pattern_matching.rb b/test/ruby/test_pattern_matching.rb index 36731e14f9..fbb934dc84 100644 --- a/test/ruby/test_pattern_matching.rb +++ b/test/ruby/test_pattern_matching.rb @@ -1570,6 +1570,18 @@ END assert_equal false, (1 in 2) end + def test_bug18990 + {a: 0} => a: + assert_equal 0, a + {a: 0} => a: + assert_equal 0, a + + {a: 0} in a: + assert_equal 0, a + {a: 0} in a: + assert_equal 0, a + end + ################################################################ def test_single_pattern_error_value_pattern |