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.

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

* Bump 3.2 branch to 3.2.3 #993

Merged
merged 1 commit into from
Jan 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["3.0.6", "3.1.4", "3.2.2", "3.3.0", "jruby-9.2"]
ruby: ["3.0.6", "3.1.4", "3.2.3", "3.3.0", "jruby-9.2"]
test_command: ["bundle exec rake test"]
include:
- ruby: "head"
test_command: "bundle exec rake test || true"
- ruby: "truffleruby"
test_command: "bundle exec rake test || true"
- ruby: "3.2.2"
- ruby: "3.2.3"
test_command: "./ci/run_rubocop_specs || true"
- ruby: "3.3.0"
test_command: "./ci/run_rubocop_specs || true"
Expand Down
2 changes: 1 addition & 1 deletion lib/parser/current.rb
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def warn_syntax_deviation(feature, version)
CurrentRuby = Ruby31

when /^3\.2\./
current_version = '3.2.2'
current_version = '3.2.3'
if RUBY_VERSION != current_version
warn_syntax_deviation 'parser/ruby32', current_version
end
Expand Down
2 changes: 1 addition & 1 deletion lib/parser/lexer.rl
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,7 @@ class Parser::Lexer

if !@static_env.nil? && @static_env.declared?(tok)
fnext expr_endfn; fbreak;
elsif @version >= 33 && tok =~ /\A_[1-9]\z/
elsif @version >= 32 && tok =~ /\A_[1-9]\z/
fnext expr_endfn; fbreak;
else
fnext *arg_or_cmdarg(cmd_state); fbreak;
Expand Down
4 changes: 2 additions & 2 deletions test/test_parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10501,7 +10501,7 @@ def test_numparam_ruby_bug_19025
[:error, :unexpected_token, { :token => 'tDSTAR' }]
],
'p { [_1 **2] }',
%w[3.0 3.1 3.2])
%w[3.0 3.1])

assert_parses(
s(:numblock,
Expand All @@ -10512,7 +10512,7 @@ def test_numparam_ruby_bug_19025
s(:int, 2)))),
'p { [_1 **2] }',
%q{},
SINCE_3_3)
SINCE_3_2)
end

def test_endless_setter
Expand Down