1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/prism] Handle implicit rest in array pattern for parser gem

Browse Source 
https://github.com/ruby/prism/commit/d3722d6660
This commit is contained in:
Kevin Newton 2024-01-27 15:25:04 -05:00 committed by git
parent 8a027d111f
commit e256d44f98
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/prism/translation/parser/compiler.rb
View File

@ -80,10 +80,14 @@ module Prism
# foo => [bar] # foo => [bar]
# ^^^^^ # ^^^^^
def visit_array_pattern_node(node) def visit_array_pattern_node(node)
elements = [*node.requireds]
elements << node.rest if !node.rest.nil? && !node.rest.is_a?(ImplicitRestNode)
elements.concat(node.posts)
if node.constant if node.constant
builder.const_pattern(visit(node.constant), token(node.opening_loc), builder.array_pattern(nil, visit_all([*node.requireds, *node.rest, *node.posts]), nil), token(node.closing_loc)) builder.const_pattern(visit(node.constant), token(node.opening_loc), builder.array_pattern(nil, visit_all(elements), nil), token(node.closing_loc))
else else
builder.array_pattern(token(node.opening_loc), visit_all([*node.requireds, *node.rest, *node.posts]), token(node.closing_loc)) builder.array_pattern(token(node.opening_loc), visit_all(elements), token(node.closing_loc))
end end
end end
@ -603,10 +607,14 @@ module Prism
# foo => [*, bar, *] # foo => [*, bar, *]
# ^^^^^^^^^^^ # ^^^^^^^^^^^
def visit_find_pattern_node(node) def visit_find_pattern_node(node)
elements = [*node.requireds]
elements << node.rest if !node.rest.nil? && !node.rest.is_a?(ImplicitRestNode)
elements.concat(node.posts)
if node.constant if node.constant
builder.const_pattern(visit(node.constant), token(node.opening_loc), builder.find_pattern(nil, visit_all([node.left, *node.requireds, node.right]), nil), token(node.closing_loc)) builder.const_pattern(visit(node.constant), token(node.opening_loc), builder.find_pattern(nil, visit_all(elements), nil), token(node.closing_loc))
else else
builder.find_pattern(token(node.opening_loc), visit_all([node.left, *node.requireds, node.right]), token(node.closing_loc)) builder.find_pattern(token(node.opening_loc), visit_all(elements), token(node.closing_loc))
end end
end end
@ -1098,11 +1106,13 @@ module Prism
# foo, bar = baz # foo, bar = baz
# ^^^^^^^^ # ^^^^^^^^
def visit_multi_target_node(node) def visit_multi_target_node(node)
node = node.copy(rest: nil) if node.rest.is_a?(ImplicitRestNode) elements = [*node.lefts]
elements << node.rest if !node.rest.nil? && !node.rest.is_a?(ImplicitRestNode)
elements.concat(node.rights)
builder.multi_lhs( builder.multi_lhs(
token(node.lparen_loc), token(node.lparen_loc),
visit_all([*node.lefts, *node.rest, *node.rights]), visit_all(elements),
token(node.rparen_loc) token(node.rparen_loc)
) )
end end
@ -1110,12 +1120,14 @@ module Prism
# foo, bar = baz # foo, bar = baz
# ^^^^^^^^^^^^^^ # ^^^^^^^^^^^^^^
def visit_multi_write_node(node) def visit_multi_write_node(node)
node = node.copy(rest: nil) if node.rest.is_a?(ImplicitRestNode) elements = [*node.lefts]
elements << node.rest if !node.rest.nil? && !node.rest.is_a?(ImplicitRestNode)
elements.concat(node.rights)
builder.multi_assign( builder.multi_assign(
builder.multi_lhs( builder.multi_lhs(
token(node.lparen_loc), token(node.lparen_loc),
visit_all([*node.lefts, *node.rest, *node.rights]), visit_all(elements),
token(node.rparen_loc) token(node.rparen_loc)
), ),
token(node.operator_loc), token(node.operator_loc),