Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

- ruby31.y: fix preparing the state for one-line patterns without braces #864

Merged
merged 1 commit into from Aug 2, 2022
Merged

- ruby31.y: fix preparing the state for one-line patterns without braces #864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/parser/ruby31.y
View file
Open in desktop
Expand Up @@ -359,13 +359,15 @@ rule
@lexer.state = :expr_beg
@lexer.command_start = false
@pattern_variables.push
@pattern_hash_keys.push

result = @context.in_kwarg
@context.in_kwarg = true
}
p_top_expr_body
{
@pattern_variables.pop
@pattern_hash_keys.pop
@context.in_kwarg = val[2]
result = @builder.match_pattern(val[0], val[1], val[3])
}
Expand All @@ -374,13 +376,15 @@ rule
@lexer.state = :expr_beg
@lexer.command_start = false
@pattern_variables.push
@pattern_hash_keys.push

result = @context.in_kwarg
@context.in_kwarg = true
}
p_top_expr_body
{
@pattern_variables.pop
@pattern_hash_keys.pop
@context.in_kwarg = val[2]
result = @builder.match_pattern_p(val[0], val[1], val[3])
}
Expand Down
4 changes: 4 additions & 0 deletions lib/parser/ruby32.y
View file
Open in desktop
Expand Up @@ -359,13 +359,15 @@ rule
@lexer.state = :expr_beg
@lexer.command_start = false
@pattern_variables.push
@pattern_hash_keys.push

result = @context.in_kwarg
@context.in_kwarg = true
}
p_top_expr_body
{
@pattern_variables.pop
@pattern_hash_keys.pop
@context.in_kwarg = val[2]
result = @builder.match_pattern(val[0], val[1], val[3])
}
Expand All @@ -374,13 +376,15 @@ rule
@lexer.state = :expr_beg
@lexer.command_start = false
@pattern_variables.push
@pattern_hash_keys.push

result = @context.in_kwarg
@context.in_kwarg = true
}
p_top_expr_body
{
@pattern_variables.pop
@pattern_hash_keys.pop
@context.in_kwarg = val[2]
result = @builder.match_pattern_p(val[0], val[1], val[3])
}
Expand Down
34 changes: 34 additions & 0 deletions test/test_parser.rb
View file
Open in desktop
Expand Up @@ -9621,6 +9621,40 @@ def test_pattern_matching_single_line_allowed_omission_of_parentheses
%q{~~~~~~~~~~~~ expression (match_pattern_p)
| ~~ operator (match_pattern_p)},
SINCE_3_1)

assert_parses(
s(:begin,
s(:match_pattern_p,
s(:hash,
s(:pair,
s(:sym, :key),
s(:sym, :value))),
s(:hash_pattern,
s(:pair,
s(:sym, :key),
s(:match_var, :value)))),
s(:lvar, :value)),
%q{{key: :value} in key: value; value},
%q{~~~~~~~~~~~~~~~~~~~~~~~~~~~ expression (match_pattern_p)
| ~~ operator (match_pattern_p)},
SINCE_3_1)

assert_parses(
s(:begin,
s(:match_pattern,
s(:hash,
s(:pair,
s(:sym, :key),
s(:sym, :value))),
s(:hash_pattern,
s(:pair,
s(:sym, :key),
s(:match_var, :value)))),
s(:lvar, :value)),
%q{{key: :value} => key: value; value},
%q{~~~~~~~~~~~~~~~~~~~~~~~~~~~ expression (match_pattern)
| ~~ operator (match_pattern)},
SINCE_3_1)
end

def test_ruby_bug_pattern_matching_restore_in_kwarg_flag
Expand Down