diff --git a/.travis.yml b/.travis.yml index 9f3c119fd..a134d2052 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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 diff --git a/lib/parser/current.rb b/lib/parser/current.rb index 4eb62bbef..8927a6fe5 100644 --- a/lib/parser/current.rb +++ b/lib/parser/current.rb @@ -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 @@ -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 @@ -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 diff --git a/lib/parser/ruby25.y b/lib/parser/ruby25.y index 4d9613780..62bb6a308 100644 --- a/lib/parser/ruby25.y +++ b/lib/parser/ruby25.y @@ -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])