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

[ruby/prism] Fix prism brace association for constant-like method/local calls

Browse Source 
https://github.com/ruby/prism/commit/8ca24f263e
This commit is contained in:
Adam Hess 2024-01-12 10:22:03 -08:00 committed by git
parent c68ce6f7f5
commit 13879fea69
3 changed files with 118 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
prism/prism.c
View File

@ -14315,7 +14315,8 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b
if ( if (
match1(parser, PM_TOKEN_PARENTHESIS_LEFT) || match1(parser, PM_TOKEN_PARENTHESIS_LEFT) ||
(accepts_command_call && (token_begins_expression_p(parser->current.type) || match3(parser, PM_TOKEN_UAMPERSAND, PM_TOKEN_USTAR, PM_TOKEN_USTAR_STAR))) || (accepts_command_call && (token_begins_expression_p(parser->current.type) || match3(parser, PM_TOKEN_UAMPERSAND, PM_TOKEN_USTAR, PM_TOKEN_USTAR_STAR))) ||
(pm_accepts_block_stack_p(parser) && match2(parser, PM_TOKEN_KEYWORD_DO, PM_TOKEN_BRACE_LEFT)) (pm_accepts_block_stack_p(parser) && match1(parser, PM_TOKEN_KEYWORD_DO)) ||
match1(parser, PM_TOKEN_BRACE_LEFT)
) { ) {
pm_arguments_t arguments = { 0 }; pm_arguments_t arguments = { 0 };
parse_arguments_list(parser, &arguments, true, accepts_command_call); parse_arguments_list(parser, &arguments, true, accepts_command_call);
@ -14439,7 +14440,8 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b
// a block, so we need to check for that here. // a block, so we need to check for that here.
if ( if (
(accepts_command_call && (token_begins_expression_p(parser->current.type) || match3(parser, PM_TOKEN_UAMPERSAND, PM_TOKEN_USTAR, PM_TOKEN_USTAR_STAR))) || (accepts_command_call && (token_begins_expression_p(parser->current.type) || match3(parser, PM_TOKEN_UAMPERSAND, PM_TOKEN_USTAR, PM_TOKEN_USTAR_STAR))) ||
(pm_accepts_block_stack_p(parser) && match2(parser, PM_TOKEN_KEYWORD_DO, PM_TOKEN_BRACE_LEFT)) (pm_accepts_block_stack_p(parser) && match1(parser, PM_TOKEN_KEYWORD_DO)) ||
match1(parser, PM_TOKEN_BRACE_LEFT)
) { ) {
pm_arguments_t arguments = { 0 }; pm_arguments_t arguments = { 0 };
parse_arguments_list(parser, &arguments, true, accepts_command_call); parse_arguments_list(parser, &arguments, true, accepts_command_call);

5
test/prism/fixtures/method_calls.txt
View File

@ -147,3 +147,8 @@ lst << A {}
"#{(v)}" "#{(v)}"
def f(*); p *; end def f(*); p *; end
foo 1, Bar { 1 }
foo = 1
foo {}

143
test/prism/snapshots/method_calls.txt
View File

@ -1,8 +1,8 @@
@ ProgramNode (location: (1,0)-(149,18)) @ ProgramNode (location: (1,0)-(154,6))
├── locals: [] ├── locals: [:foo]
└── statements: └── statements:
@ StatementsNode (location: (1,0)-(149,18)) @ StatementsNode (location: (1,0)-(154,6))
└── body: (length: 63) └── body: (length: 66)
├── @ CallNode (location: (1,0)-(1,14)) ├── @ CallNode (location: (1,0)-(1,14))
│ ├── flags: ∅ │ ├── flags: ∅
│ ├── receiver: │ ├── receiver:
@ -2304,48 +2304,109 @@
│ │ │ └── closing_loc: (147,5)-(147,6) = ")" │ │ │ └── closing_loc: (147,5)-(147,6) = ")"
│ │ └── closing_loc: (147,6)-(147,7) = "}" │ │ └── closing_loc: (147,6)-(147,7) = "}"
│ └── closing_loc: (147,7)-(147,8) = "\"" │ └── closing_loc: (147,7)-(147,8) = "\""
└── @ DefNode (location: (149,0)-(149,18)) ├── @ DefNode (location: (149,0)-(149,18))
├── name: :f │ ├── name: :f
├── name_loc: (149,4)-(149,5) = "f" │ ├── name_loc: (149,4)-(149,5) = "f"
├── receiver: ∅ │ ├── receiver: ∅
├── parameters: │ ├── parameters:
│ @ ParametersNode (location: (149,6)-(149,7)) │ │ @ ParametersNode (location: (149,6)-(149,7))
│ ├── requireds: (length: 0) │ │ ├── requireds: (length: 0)
│ ├── optionals: (length: 0) │ │ ├── optionals: (length: 0)
│ ├── rest: │ │ ├── rest:
│ │ @ RestParameterNode (location: (149,6)-(149,7)) │ │ │ @ RestParameterNode (location: (149,6)-(149,7))
│ │ ├── flags: ∅ │ │ │ ├── flags: ∅
│ │ ├── name: ∅ │ │ │ ├── name: ∅
│ │ ├── name_loc: ∅ │ │ │ ├── name_loc: ∅
│ │ └── operator_loc: (149,6)-(149,7) = "*" │ │ │ └── operator_loc: (149,6)-(149,7) = "*"
│ ├── posts: (length: 0) │ │ ├── posts: (length: 0)
│ ├── keywords: (length: 0) │ │ ├── keywords: (length: 0)
│ ├── keyword_rest: ∅ │ │ ├── keyword_rest: ∅
│ └── block: ∅ │ │ └── block: ∅
├── body: │ ├── body:
│ @ StatementsNode (location: (149,10)-(149,13)) │ │ @ StatementsNode (location: (149,10)-(149,13))
│ └── body: (length: 1) │ │ └── body: (length: 1)
│ └── @ CallNode (location: (149,10)-(149,13)) │ │ └── @ CallNode (location: (149,10)-(149,13))
│ │ ├── flags: ignore_visibility
│ │ ├── receiver: ∅
│ │ ├── call_operator_loc: ∅
│ │ ├── name: :p
│ │ ├── message_loc: (149,10)-(149,11) = "p"
│ │ ├── opening_loc: ∅
│ │ ├── arguments:
│ │ │ @ ArgumentsNode (location: (149,12)-(149,13))
│ │ │ ├── flags: ∅
│ │ │ └── arguments: (length: 1)
│ │ │ └── @ SplatNode (location: (149,12)-(149,13))
│ │ │ ├── operator_loc: (149,12)-(149,13) = "*"
│ │ │ └── expression: ∅
│ │ ├── closing_loc: ∅
│ │ └── block: ∅
│ ├── locals: [:*]
│ ├── locals_body_index: 1
│ ├── def_keyword_loc: (149,0)-(149,3) = "def"
│ ├── operator_loc: ∅
│ ├── lparen_loc: (149,5)-(149,6) = "("
│ ├── rparen_loc: (149,7)-(149,8) = ")"
│ ├── equal_loc: ∅
│ └── end_keyword_loc: (149,15)-(149,18) = "end"
├── @ CallNode (location: (151,0)-(151,16))
│ ├── flags: ignore_visibility │ ├── flags: ignore_visibility
│ ├── receiver: ∅ │ ├── receiver: ∅
│ ├── call_operator_loc: ∅ │ ├── call_operator_loc: ∅
│ ├── name: :p │ ├── name: :foo
│ ├── message_loc: (149,10)-(149,11) = "p" │ ├── message_loc: (151,0)-(151,3) = "foo"
│ ├── opening_loc: ∅ │ ├── opening_loc: ∅
│ ├── arguments: │ ├── arguments:
│ │ @ ArgumentsNode (location: (149,12)-(149,13)) │ │ @ ArgumentsNode (location: (151,4)-(151,16))
│ │ ├── flags: ∅ │ │ ├── flags: ∅
│ │ └── arguments: (length: 1) │ │ └── arguments: (length: 2)
│ │ └── @ SplatNode (location: (149,12)-(149,13)) │ │ ├── @ IntegerNode (location: (151,4)-(151,5))
│ │ ├── operator_loc: (149,12)-(149,13) = "*" │ │ │ └── flags: decimal
│ │ └── expression: ∅ │ │ └── @ CallNode (location: (151,7)-(151,16))
│ │ ├── flags: ignore_visibility
│ │ ├── receiver: ∅
│ │ ├── call_operator_loc: ∅
│ │ ├── name: :Bar
│ │ ├── message_loc: (151,7)-(151,10) = "Bar"
│ │ ├── opening_loc: ∅
│ │ ├── arguments: ∅
│ │ ├── closing_loc: ∅
│ │ └── block:
│ │ @ BlockNode (location: (151,11)-(151,16))
│ │ ├── locals: []
│ │ ├── locals_body_index: 0
│ │ ├── parameters: ∅
│ │ ├── body:
│ │ │ @ StatementsNode (location: (151,13)-(151,14))
│ │ │ └── body: (length: 1)
│ │ │ └── @ IntegerNode (location: (151,13)-(151,14))
│ │ │ └── flags: decimal
│ │ ├── opening_loc: (151,11)-(151,12) = "{"
│ │ └── closing_loc: (151,15)-(151,16) = "}"
│ ├── closing_loc: ∅ │ ├── closing_loc: ∅
│ └── block: ∅ │ └── block: ∅
├── locals: [:*] ├── @ LocalVariableWriteNode (location: (153,0)-(153,7))
├── locals_body_index: 1 │ ├── name: :foo
├── def_keyword_loc: (149,0)-(149,3) = "def" │ ├── depth: 0
├── operator_loc: ∅ │ ├── name_loc: (153,0)-(153,3) = "foo"
├── lparen_loc: (149,5)-(149,6) = "(" │ ├── value:
├── rparen_loc: (149,7)-(149,8) = ")" │ │ @ IntegerNode (location: (153,6)-(153,7))
├── equal_loc: ∅ │ │ └── flags: decimal
└── end_keyword_loc: (149,15)-(149,18) = "end" │ └── operator_loc: (153,4)-(153,5) = "="
└── @ CallNode (location: (154,0)-(154,6))
├── flags: ignore_visibility
├── receiver: ∅
├── call_operator_loc: ∅
├── name: :foo
├── message_loc: (154,0)-(154,3) = "foo"
├── opening_loc: ∅
├── arguments: ∅
├── closing_loc: ∅
└── block:
@ BlockNode (location: (154,4)-(154,6))
├── locals: []
├── locals_body_index: 0
├── parameters: ∅
├── body: ∅
├── opening_loc: (154,4)-(154,5) = "{"
└── closing_loc: (154,5)-(154,6) = "}"