Skip to content

Commit 717ae46

Browse files
committed
* upstream sync
1 parent b3316a9 commit 717ae46

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

lib/parser/rubynext.y

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2299,11 +2299,12 @@ opt_block_args_tail:
22992299
p_var_ref: tCARET tIDENTIFIER
23002300
{
23012301
name = val[1][0]
2302+
lvar = @builder.accessible(@builder.ident(val[1]))
2303+
23022304
unless static_env.declared?(name)
23032305
diagnostic :error, :undefined_lvar, { :name => name }, val[1]
23042306
end
23052307
2306-
lvar = @builder.accessible(@builder.ident(val[1]))
23072308
result = @builder.pin(val[0], lvar)
23082309
}
23092310

test/test_parser.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6989,7 +6989,7 @@ def test_return_in_sclass_since_34
69896989
%q{class << foo; return; end},
69906990
%q{ ^^^^^^ location},
69916991
SINCE_3_4)
6992-
6992+
69936993
assert_diagnoses(
69946994
[:error, :invalid_return, {}],
69956995
%q{class A; class << self; return; end; end},
@@ -9678,7 +9678,7 @@ def test_pattern_matching_numbered_parameter
96789678
[:error, :reserved_for_numparam, { :name => '_1' }],
96799679
%q{case 0; in _1; end},
96809680
%q{ ^^ location},
9681-
SINCE_3_0)
9681+
SINCE_3_0 - %w(next))
96829682

96839683
assert_diagnoses(
96849684
[:error, :undefined_lvar, { :name => '_1' }],

0 commit comments

Comments
 (0)