From ec523c0f8e9eaedcfb892b8e64394efbce9777d8 Mon Sep 17 00:00:00 2001 From: Ilya Bylich Date: Mon, 21 Feb 2022 18:49:26 +0300 Subject: [PATCH 1/6] Update changelog. --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fba27299..24b6399c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ Changelog ========= -Not released (2022-02-21) -------------------------- +v3.1.1.0 (2022-02-21) +--------------------- API modifications: * Bump 3.1 branch to 3.1.1 (Koichi ITO) From 934bd0013622d2eceffd58dcfc63feba6844d7f4 Mon Sep 17 00:00:00 2001 From: Vladimir Dementyev Date: Tue, 5 Apr 2022 14:24:55 +0300 Subject: [PATCH 2/6] Upgrade Github Actions test workflow (#849) --- .github/workflows/test.yml | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a1ad14ea4..e7b223f91 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,25 +27,15 @@ jobs: - ruby: "3.1.1" test_command: "./ci/run_rubocop_specs || true" steps: - - uses: actions/checkout@v2 - - uses: actions/cache@v1 - with: - path: /home/runner/bundle - key: bundle-${{ matrix.ruby }}-${{ hashFiles('../Gemfile') }}-${{ hashFiles('**/*.gemspec') }} - restore-keys: | - bundle-${{ matrix.ruby }}- - - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby }} + - uses: actions/checkout@v3 - name: Install Ragel run: | sudo apt-get update sudo apt-get install ragel - - name: Bundle install - run: | - bundle config path /home/runner/bundle - bundle install - bundle update + - uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + bundler-cache: true - name: Run tests run: | ${{ matrix.test_command }} From 1d275fc21227f538a2dda74a54939cd55b1c9200 Mon Sep 17 00:00:00 2001 From: Vladimir Dementyev Date: Tue, 5 Apr 2022 15:07:50 +0300 Subject: [PATCH 3/6] - ruby32.y: fix using p_kwnorest in f_no_kwarg (#848) --- lib/parser/ruby32.y | 7 +++++-- test/parse_helper.rb | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/parser/ruby32.y b/lib/parser/ruby32.y index 2139469b4..feb697e0d 100644 --- a/lib/parser/ruby32.y +++ b/lib/parser/ruby32.y @@ -2252,11 +2252,14 @@ opt_block_args_tail: p_kwnorest: kwrest_mark kNIL { - result = [ @builder.match_nil_pattern(val[0], val[1]) ] + result = val } p_any_kwrest: p_kwrest | p_kwnorest + { + result = [ @builder.match_nil_pattern(val[0][0], val[0][1]) ] + } p_value: p_primitive | p_primitive tDOT2 p_primitive @@ -2969,7 +2972,7 @@ f_opt_paren_args: f_paren_args f_no_kwarg: p_kwnorest { - result = [ @builder.kwnilarg(val[0], val[1]) ] + result = [ @builder.kwnilarg(val[0][0], val[0][1]) ] } f_kwrest: kwrest_mark tIDENTIFIER diff --git a/test/parse_helper.rb b/test/parse_helper.rb index 3ff50e4e3..54afa1ea8 100644 --- a/test/parse_helper.rb +++ b/test/parse_helper.rb @@ -7,7 +7,7 @@ module ParseHelper require 'parser/macruby' require 'parser/rubymotion' - ALL_VERSIONS = %w(1.8 1.9 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 3.0 3.1 mac ios) + ALL_VERSIONS = %w(1.8 1.9 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 3.0 3.1 3.2 mac ios) def setup @diagnostics = [] From ecdcfddc4e7b7506e862b39209cb415050105ba7 Mon Sep 17 00:00:00 2001 From: Koichi ITO Date: Wed, 13 Apr 2022 02:19:25 +0900 Subject: [PATCH 4/6] * Bump maintenance branches to 3.1.2, 3.0.4, 2.7.6, and 2.6.10 (#850) These Rubies has been released. - https://www.ruby-lang.org/en/news/2022/04/12/ruby-3-1-2-released/ - https://www.ruby-lang.org/en/news/2022/04/12/ruby-3-0-4-released/ - https://www.ruby-lang.org/en/news/2022/04/12/ruby-2-7-6-released/ - https://www.ruby-lang.org/en/news/2022/04/12/ruby-2-6-10-released/ ## Ruby 3.1 branch Bump 3.1 branch from 3.1.1 to 3.1.2 https://github.com/ruby/ruby/compare/v3_1_1...v3_1_2 There seems to be no change to the syntax. ## Ruby 3.0 branch Bump 3.0 branch from 3.0.3 to 3.0.4 https://github.com/ruby/ruby/compare/v3_0_3...v3_0_4 There seems to be no change to the syntax. ## Ruby 2.7 branch Bump 2.7 branch from 2.7.5 to 2.7.6 https://github.com/ruby/ruby/compare/v2_7_5...v2_7_6 There seems to be no change to the syntax. ## Ruby 2.6 branch Bump 2.6 branch from 2.6.9 to 2.6.10 https://github.com/ruby/ruby/compare/v2_6_9...v2_6_10 There seems to be no change to the syntax. --- .github/workflows/test.yml | 4 ++-- lib/parser/current.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e7b223f91..12c13d034 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,14 +17,14 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["2.6.9", "2.7.5", "3.0.3", "3.1.1", "jruby-9.2"] + ruby: ["2.6.10", "2.7.6", "3.0.4", "3.1.2", "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.1.1" + - ruby: "3.1.2" test_command: "./ci/run_rubocop_specs || true" steps: - uses: actions/checkout@v3 diff --git a/lib/parser/current.rb b/lib/parser/current.rb index 447a88ac6..45caf83b3 100644 --- a/lib/parser/current.rb +++ b/lib/parser/current.rb @@ -66,7 +66,7 @@ def warn_syntax_deviation(feature, version) CurrentRuby = Ruby25 when /^2\.6\./ - current_version = '2.6.9' + current_version = '2.6.10' if RUBY_VERSION != current_version warn_syntax_deviation 'parser/ruby26', current_version end @@ -75,7 +75,7 @@ def warn_syntax_deviation(feature, version) CurrentRuby = Ruby26 when /^2\.7\./ - current_version = '2.7.5' + current_version = '2.7.6' if RUBY_VERSION != current_version warn_syntax_deviation 'parser/ruby27', current_version end @@ -84,7 +84,7 @@ def warn_syntax_deviation(feature, version) CurrentRuby = Ruby27 when /^3\.0\./ - current_version = '3.0.3' + current_version = '3.0.4' if RUBY_VERSION != current_version warn_syntax_deviation 'parser/ruby30', current_version end @@ -93,7 +93,7 @@ def warn_syntax_deviation(feature, version) CurrentRuby = Ruby30 when /^3\.1\./ - current_version = '3.1.1' + current_version = '3.1.2' if RUBY_VERSION != current_version warn_syntax_deviation 'parser/ruby31', current_version end From c5f26c35cd6904bf6007245ab1e66416cadb8ccd Mon Sep 17 00:00:00 2001 From: Ilya Bylich Date: Tue, 12 Apr 2022 20:21:56 +0300 Subject: [PATCH 5/6] Bump version. --- lib/parser/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/parser/version.rb b/lib/parser/version.rb index f9366f65e..e436ba691 100644 --- a/lib/parser/version.rb +++ b/lib/parser/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Parser - VERSION = '3.1.1.0' + VERSION = '3.1.2.0' end From 4597f27f42163ee6aea441c7758c8e410e92770d Mon Sep 17 00:00:00 2001 From: Ilya Bylich Date: Tue, 12 Apr 2022 20:22:23 +0300 Subject: [PATCH 6/6] Update changelog. --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24b6399c7..1cf666273 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ Changelog ========= +Not released (2022-04-12) +------------------------- + +API modifications: + * Bump maintenance branches to 3.1.2, 3.0.4, 2.7.6, and 2.6.10 (#850) (Koichi ITO) + +Bugs fixed: + * ruby32.y: fix using p_kwnorest in f_no_kwarg (#848) (Vladimir Dementyev) + v3.1.1.0 (2022-02-21) ---------------------