Skip to content

Commit

Permalink
Bump maintenance branches to 2.6.3, 2.5.6, and 2.4.7
Browse files Browse the repository at this point in the history
These Rubies has been released.

- https://www.ruby-lang.org/en/news/2019/08/28/ruby-2-6-4-released/
- https://www.ruby-lang.org/en/news/2019/08/28/ruby-2-5-6-released/
- https://www.ruby-lang.org/en/news/2019/08/28/ruby-2-4-7-released/

## Ruby 2.6 branch

Bump 2.6 branch from 2.6.2 to 2.6.3
ruby/ruby@v2_6_3...v2_6_4

There seems to be no change to the syntax.

## Ruby 2.5 branch

Bump 2.5 branch from 2.5.5 to 2.5.6
ruby/ruby@v2_5_5...v2_5_6

There is the following change to the syntax:

```diff
-dsym	: tSYMBEG xstring_contents tSTRING_END
+dsym	: tSYMBEG string_contents tSTRING_END
```

This is a backport whitequark#560 to Ruby 2.5 branch.

cf. ruby/ruby@764fe09

## Ruby 2.4 branch

Bump 2.4 branch from 2.4.6 to 2.4.7
ruby/ruby@v2_4_6...v2_4_7

There seems to be no change to the syntax.
  • Loading branch information
koic committed Aug 30, 2019
1 parent ebed465 commit 3baeeaf
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
20 changes: 10 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ matrix:
- name: 2.3.8 / Parser tests
rvm: 2.3.8
script: bundle exec rake test_cov
- name: 2.4.6 / Parser tests
rvm: 2.4.6
- name: 2.4.7 / Parser tests
rvm: 2.4.7
script: bundle exec rake test_cov
- name: 2.5.5 / Parser tests
rvm: 2.5.5
- name: 2.5.6 / Parser tests
rvm: 2.5.6
script: bundle exec rake test_cov
- name: 2.6.3 / Parser tests
rvm: 2.6.3
- name: 2.6.4 / Parser tests
rvm: 2.6.4
script: bundle exec rake test_cov
- name: ruby-head / Parser tests
rvm: ruby-head
Expand All @@ -29,11 +29,11 @@ matrix:
- name: rbx-2 / Parser tests
rvm: rbx-2
script: bundle exec rake test_cov
- name: 2.5.5 / Rubocop tests
rvm: 2.5.5
- name: 2.5.6 / Rubocop tests
rvm: 2.5.6
script: ./ci/run_rubocop_specs
- name: 2.6.3 / Rubocop tests
rvm: 2.6.3
- name: 2.6.4 / Rubocop tests
rvm: 2.6.4
script: ./ci/run_rubocop_specs
allow_failures:
- rvm: ruby-head
Expand Down
6 changes: 3 additions & 3 deletions lib/parser/current.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def warn_syntax_deviation(feature, version)
CurrentRuby = Ruby23

when /^2\.4\./
current_version = '2.4.6'
current_version = '2.4.7'
if RUBY_VERSION != current_version
warn_syntax_deviation 'parser/ruby24', current_version
end
Expand All @@ -57,7 +57,7 @@ def warn_syntax_deviation(feature, version)
CurrentRuby = Ruby24

when /^2\.5\./
current_version = '2.5.5'
current_version = '2.5.6'
if RUBY_VERSION != current_version
warn_syntax_deviation 'parser/ruby25', current_version
end
Expand All @@ -66,7 +66,7 @@ def warn_syntax_deviation(feature, version)
CurrentRuby = Ruby25

when /^2\.6\./
current_version = '2.6.3'
current_version = '2.6.4'
if RUBY_VERSION != current_version
warn_syntax_deviation 'parser/ruby26', current_version
end
Expand Down
2 changes: 1 addition & 1 deletion lib/parser/ruby25.y
Original file line number Diff line number Diff line change
Expand Up @@ -1885,7 +1885,7 @@ regexp_contents: # nothing
result = @builder.symbol(val[0])
}
dsym: tSYMBEG xstring_contents tSTRING_END
dsym: tSYMBEG string_contents tSTRING_END
{
@lexer.state = :expr_end
result = @builder.symbol_compose(val[0], val[1], val[2])
Expand Down

0 comments on commit 3baeeaf

Please sign in to comment.