Skip to content

Commit

Permalink
+ ruby34.y: allow circular argument references
Browse files Browse the repository at this point in the history 
This track upstream commit ruby/ruby@cbc83c4
  • Loading branch information
@Earlopain
Earlopain committed Dec 20, 2024
1 parent d230989 commit 9779799
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 25 deletions.
18 changes: 0 additions & 18 deletions lib/parser/ruby34.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,12 @@ preclow
rule

program: {
@current_arg_stack.push(nil)
@max_numparam_stack.push(static: true)
}
top_compstmt
{
result = val[1]

@current_arg_stack.pop
@max_numparam_stack.pop
}

Expand Down Expand Up @@ -270,7 +268,6 @@ rule
val[1], val[2], val[3])

local_pop
@current_arg_stack.pop
@context.in_def = ctx.in_def
}
| defs_head f_opt_paren_args tEQL endless_command
Expand All @@ -282,7 +279,6 @@ rule
val[1], val[2], val[3])

local_pop
@current_arg_stack.pop
@context.in_def = ctx.in_def
}
| backref tOP_ASGN command_rhs
Expand Down Expand Up @@ -362,7 +358,6 @@ rule
def_name: fname
{
local_push
@current_arg_stack.push(nil)

result = [ val[0], @context.dup ]
@context.in_def = true
Expand Down Expand Up @@ -911,7 +906,6 @@ rule
val[1], val[2], val[3])

local_pop
@current_arg_stack.pop
@context.in_def = ctx.in_def
}
| defs_head f_opt_paren_args tEQL endless_arg
Expand All @@ -923,7 +917,6 @@ rule
val[1], val[2], val[3])

local_pop
@current_arg_stack.pop
@context.in_def = ctx.in_def
}
| primary
Expand Down Expand Up @@ -1382,7 +1375,6 @@ rule
val[2], val[3])
local_pop
@current_arg_stack.pop
@context.in_def = ctx.in_def
}
| defs_head f_arglist bodystmt kEND
Expand All @@ -1392,7 +1384,6 @@ rule
val[2], val[3])
local_pop
@current_arg_stack.pop
@context.in_def = ctx.in_def
}
| kBREAK
Expand Down Expand Up @@ -1655,14 +1646,12 @@ opt_block_args_tail:
block_param_def: tPIPE opt_bv_decl tPIPE
{
@max_numparam_stack.has_ordinary_params!
@current_arg_stack.set(nil)
@context.in_argdef = false
result = @builder.args(val[0], val[1], val[2])
}
| tPIPE block_param opt_bv_decl tPIPE
{
@max_numparam_stack.has_ordinary_params!
@current_arg_stack.set(nil)
@context.in_argdef = false
result = @builder.args(val[0], val[1].concat(val[2]), val[3])
}
Expand Down Expand Up @@ -2848,13 +2837,11 @@ f_opt_paren_args: f_paren_args
f_arg_asgn: f_norm_arg
{
@current_arg_stack.set(val[0][0])
result = val[0]
}
f_arg_item: f_arg_asgn
{
@current_arg_stack.set(0)
result = @builder.arg(val[0])
}
| tLPAREN f_margs rparen
Expand All @@ -2879,21 +2866,18 @@ f_opt_paren_args: f_paren_args
@max_numparam_stack.has_ordinary_params!
@current_arg_stack.set(val[0][0])
@context.in_argdef = false
result = val[0]
}
f_kw: f_label arg_value
{
@current_arg_stack.set(nil)
@context.in_argdef = true
result = @builder.kwoptarg(val[0], val[1])
}
| f_label
{
@current_arg_stack.set(nil)
@context.in_argdef = true
result = @builder.kwarg(val[0])
}
Expand Down Expand Up @@ -2949,14 +2933,12 @@ f_opt_paren_args: f_paren_args
f_opt: f_arg_asgn f_eq arg_value
{
@current_arg_stack.set(0)
@context.in_argdef = true
result = @builder.optarg(val[0], val[1], val[2])
}
f_block_opt: f_arg_asgn f_eq primary_value
{
@current_arg_stack.set(0)
@context.in_argdef = true
result = @builder.optarg(val[0], val[1], val[2])
}
Expand Down
28 changes: 21 additions & 7 deletions test/test_parser.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7946,45 +7946,45 @@ def test_circular_argument_reference_error
[:error, :circular_argument_reference, { :var_name => 'foo' }],
%q{def m(foo = foo) end},
%q{ ^^^ location},
SINCE_2_7)
SINCE_2_7 - SINCE_3_4)

assert_diagnoses(
[:error, :circular_argument_reference, { :var_name => 'foo' }],
%q{def m(foo: foo) end},
%q{ ^^^ location},
SINCE_2_7)
SINCE_2_7 - SINCE_3_4)

assert_diagnoses(
[:error, :circular_argument_reference, { :var_name => 'foo' }],
%q{m { |foo = foo| } },
%q{ ^^^ location},
SINCE_2_7)
SINCE_2_7 - SINCE_3_4)

assert_diagnoses(
[:error, :circular_argument_reference, { :var_name => 'foo' }],
%q{m { |foo: foo| } },
%q{ ^^^ location},
SINCE_2_7)
SINCE_2_7 - SINCE_3_4)

# Traversing

assert_diagnoses(
[:error, :circular_argument_reference, { :var_name => 'foo' }],
%q{def m(foo = class << foo; end) end},
%q{ ^^^ location},
SINCE_2_7)
SINCE_2_7 - SINCE_3_4)

assert_diagnoses(
[:error, :circular_argument_reference, { :var_name => 'foo' }],
%q{def m(foo = def foo.m; end); end},
%q{ ^^^ location},
SINCE_2_7)
SINCE_2_7 - SINCE_3_4)

assert_diagnoses(
[:error, :circular_argument_reference, { :var_name => 'foo' }],
%q{m { |foo = proc { 1 + foo }| } },
%q{ ^^^ location},
SINCE_2_7)
SINCE_2_7 - SINCE_3_4)

# Valid cases

Expand All @@ -8003,6 +8003,20 @@ def test_circular_argument_reference_error
end
end

def test_circular_argument_reference_error_since_34
[
%q{def m(foo = foo) end},
%q{def m(foo: foo) end},
%q{m { |foo = foo| } },
%q{m { |foo: foo| } },
%q{def m(foo = class << foo; end) end},
%q{def m(foo = def foo.m; end); end},
%q{m { |foo = proc { 1 + foo }| } },
].each do |code|
refute_diagnoses(code, SINCE_3_4)
end
end

def test_forward_args_legacy
Parser::Builders::Default.emit_forward_arg = false
assert_parses(
Expand Down

0 comments on commit 9779799

Please sign in to comment.