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

+ ruby28.y: support rescue modifier in endless method definition. #696

Merged
merged 1 commit into from May 22, 2020
Merged

+ ruby28.y: support rescue modifier in endless method definition. #696

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
34 changes: 34 additions & 0 deletions lib/parser/ruby28.y
View file
Open in desktop
Expand Up @@ -869,6 +869,23 @@ rule
result = @builder.def_endless_method(*val[0],
val[1], val[2], val[3])

@lexer.cmdarg.pop
@lexer.cond.pop
@static_env.unextend
@context.pop
@current_arg_stack.pop
}
| defn_head f_paren_args tEQL arg kRESCUE_MOD arg
{
rescue_body = @builder.rescue_body(val[4],
nil, nil, nil,
nil, val[5])

method_body = @builder.begin_body(val[3], [ rescue_body ])

result = @builder.def_endless_method(*val[0],
val[1], val[2], method_body)

@lexer.cmdarg.pop
@lexer.cond.pop
@static_env.unextend
Expand All @@ -880,6 +897,23 @@ rule
result = @builder.def_endless_singleton(*val[0],
val[1], val[2], val[3])

@lexer.cmdarg.pop
@lexer.cond.pop
@static_env.unextend
@context.pop
@current_arg_stack.pop
}
| defs_head f_paren_args tEQL arg kRESCUE_MOD arg
{
rescue_body = @builder.rescue_body(val[4],
nil, nil, nil,
nil, val[5])

method_body = @builder.begin_body(val[3], [ rescue_body ])

result = @builder.def_endless_singleton(*val[0],
val[1], val[2], method_body)

@lexer.cmdarg.pop
@lexer.cond.pop
@static_env.unextend
Expand Down
25 changes: 25 additions & 0 deletions test/test_parser.rb
View file
Open in desktop
Expand Up @@ -9520,6 +9520,31 @@ def test_endless_method_without_brackets
)
end

def test_endless_method_with_rescue_mod
assert_parses(
s(:def_e, :m,
s(:args),
s(:rescue,
s(:int, 1),
s(:resbody, nil, nil,
s(:int, 2)), nil)),
%q{def m() = 1 rescue 2},
%q{},
SINCE_2_8)

assert_parses(
s(:defs_e,
s(:self), :m,
s(:args),
s(:rescue,
s(:int, 1),
s(:resbody, nil, nil,
s(:int, 2)), nil)),
%q{def self.m() = 1 rescue 2},
%q{},
SINCE_2_8)
end

def test_rasgn
assert_parses(
s(:rasgn,
Expand Down