parser 2.5.3.0 → 2.6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77bd0a20c41d5920ff53bc78caad94a0c2fc7d713ae9e6c2eeaf25e007b4eb87
-  data.tar.gz: e172d0fc395b41eefe2a4e2e522c62729ba7ba6ccbcf7c4caffe9a3d644d09dc
+  metadata.gz: c4603be64062f43f204650161874219f6a1250d81dd11705ca39482e7b70e968
+  data.tar.gz: 4ac43b4edcd13c7ac53d801533492999a5786138f485c9d06b9fa5329635790a
 SHA512:
-  metadata.gz: 07a1e0b7f53363979ca9a9a4601982adc897f82d7aad0dde87219c9510e4dd2f81a0b1d2bdb9c74ca60ea46f44a36c515caa7f009876dbbb2ab0f38046e4ab8e
-  data.tar.gz: cf89632cc8124a50e6d0964a527738f2deb98978f7caa66609d04e438c5daafafa30ba5cfd9b30a18f50b32e9319f6c478178267465eaa6385e222b1bf831dc3
+  metadata.gz: 770c2d3e8eca4f64081b10d6053e9576ec795fdb0605b5282dfd0b312fa2de71e04478177a3458a2e0fa36d1f484654f72b642658df91fa997388bff0ef07af3
+  data.tar.gz: 81fecd3087121fbee6e26dfc09d9cabc5449f237379e514dc88852fd85d1dd6f6189435fca1817409341b4eb505c6016afefb85e48c4170f930223480a85e8de

data/.travis.yml

@@ -1,21 +1,45 @@
 dist: trusty
 language: ruby
-rvm:
- - 2.0.0
- - 2.2.9
- - 2.3.6
- - 2.4.3
- - 2.5.0
- - ruby-head
- - jruby-9.1.15.0
- - rbx-2
 matrix:
- allow_failures:
-  - rvm: ruby-head
-  - rvm: rbx-2
+  include:
+    - name: 2.0.0 / Parser tests
+      rvm: 2.0.0
+      script: bundle exec rake test_cov
+    - name: 2.2.10 / Parser tests
+      rvm: 2.2.10
+      script: bundle exec rake test_cov
+    - name: 2.3.8 / Parser tests
+      rvm: 2.3.8
+      script: bundle exec rake test_cov
+    - name: 2.4.5 / Parser tests
+      rvm: 2.4.5
+      script: bundle exec rake test_cov
+    - name: 2.5.3 / Parser tests
+      rvm: 2.5.3
+      script: bundle exec rake test_cov
+    - name: 2.6.0 / Parser tests
+      rvm: 2.6.0
+      script: bundle exec rake test_cov
+    - name: ruby-head / Parser tests
+      rvm: ruby-head
+      script: bundle exec rake test_cov
+    - name: jruby-9.1.15.0 / Parser tests
+      rvm: jruby-9.1.15.0
+      script: bundle exec rake test_cov
+    - name: rbx-2 / Parser tests
+      rvm: rbx-2
+      script: bundle exec rake test_cov
+    - name: 2.5.3 / Rubocop tests
+      rvm: 2.5.3
+      script: ./ci/run_rubocop_specs
+    - name: 2.6.0 / Rubocop tests
+      rvm: 2.6.0
+      script: ./ci/run_rubocop_specs
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: rbx-2
+    - script: ./ci/run_rubocop_specs
 before_install:
- - gem install bundler
- - bundle --version
- - gem --version
-script:
- - bundle exec rake test_cov
+  - gem install bundler
+  - bundle --version
+  - gem --version

data/CHANGELOG.md

@@ -1,8 +1,17 @@
 Changelog
 =========
 
-Not released (2018-10-29)
--------------------------
+v2.6.0.0 (2019-01-16)
+---------------------
+
+API modifications:
+ * 2.6.0 was released, unmark is as -dev. (#538) (Ilya Bylich)
+
+Bugs fixed:
+ * Fix parsing of "\\\n" escaped sequences in various literals. (#539) (Ilya Bylich)
+
+v2.5.3.0 (2018-10-29)
+---------------------
 
 Bugs fixed:
  * lexer.rl: Fix parsing of 'm :key => m do; m() do end; end'. (#526) (Ilya Bylich)

data/ci/run_rubocop_specs

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -eux
+
+bundle install
+rake generate
+
+git clone https://github.com/rubocop-hq/rubocop.git --depth=1
+cd rubocop
+export BUNDLE_GEMFILE=Gemfile
+echo "gem 'parser', path: '../'" > Gemfile.local
+
+bundle install
+bundle exec rake spec

data/lib/parser/current.rb

@@ -66,7 +66,7 @@ module Parser
     CurrentRuby = Ruby25
 
   when /^2\.6\./
-    current_version = '2.6.0-dev'
+    current_version = '2.6.0'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby26', current_version
     end

data/lib/parser/lexer.rl

@@ -894,27 +894,27 @@ class Parser::Lexer
       end
     else
       # It does not. So this is an actual escape sequence, yay!
-      if current_literal.regexp?
+      if current_literal.squiggly_heredoc? && escaped_char == "\n".freeze
+        # Squiggly heredocs like
+        #   <<~-HERE
+        #     1\
+        #     2
+        #   HERE
+        # treat '\' as a line continuation, but still dedent the body, so the heredoc above becomes "12\n".
+        # This information is emitted as is, without escaping,
+        # later this escape sequence (\\\n) gets handled manually in the Lexer::Dedenter
+        current_literal.extend_string(tok, @ts, @te)
+      elsif current_literal.supports_line_continuation_via_slash? && escaped_char == "\n".freeze
+        # Heredocs, regexp and a few other types of literals support line
+        # continuation via \\\n sequence. The code like
+        #   "a\
+        #   b"
+        # must be parsed as "ab"
+        current_literal.extend_string(tok.gsub("\\\n".freeze, ''.freeze), @ts, @te)
+      elsif current_literal.regexp?
         # Regular expressions should include escape sequences in their
-        # escaped form. On the other hand, escaped newlines are removed.
+        # escaped form. On the other hand, escaped newlines are removed (in cases like "\\C-\\\n\\M-x")
         current_literal.extend_string(tok.gsub("\\\n".freeze, ''.freeze), @ts, @te)
-      elsif current_literal.heredoc? && escaped_char == "\n".freeze
-        if current_literal.squiggly_heredoc?
-          # Squiggly heredocs like
-          #   <<~-HERE
-          #     1\
-          #     2
-          #   HERE
-          # treat '\' as a line continuation, but still dedent the body, so the heredoc above becomes "12\n".
-          # This information is emitted as is, without escaping,
-          # later this escape sequence (\\n) gets handled manually in the Lexer::Dedenter
-          current_literal.extend_string(tok, @ts, @te)
-        else
-          # Plain heredocs also parse \\n as a line continuation,
-          # but they don't need to know that there was originally a newline in the
-          # code, so we escape it and emit as "  1  2\n"
-          current_literal.extend_string(tok.gsub("\\\n".freeze, ''.freeze), @ts, @te)
-        end
       else
         current_literal.extend_string(@escape || tok, @ts, @te)
       end

data/lib/parser/lexer/literal.rb

@@ -227,6 +227,10 @@ module Parser
       end
     end
 
+    def supports_line_continuation_via_slash?
+      !words? && @interpolate
+    end
+
     protected
 
     def delimiter?(delimiter)

data/lib/parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parser
-  VERSION = '2.5.3.0'
+  VERSION = '2.6.0.0'
 end

data/parser.gemspec

@@ -12,7 +12,6 @@ Gem::Specification.new do |spec|
   spec.summary       = spec.description
   spec.homepage      = 'https://github.com/whitequark/parser'
   spec.license       = 'MIT'
-  spec.has_rdoc      = 'yard'
 
   spec.files         = `git ls-files`.split + %w(
                           lib/parser/lexer.rb

data/test/test_parser.rb

@@ -7052,4 +7052,36 @@ class TestParser < Minitest::Test
       %q{},
       ALL_VERSIONS)
   end
+
+  def test_parser_slash_slash_n_escaping_in_literals
+    [
+      ["'",             "'",       s(:dstr, s(:str, "a\\\n"), s(:str, "b"))  ],
+      ["<<-'HERE'\n",   "\nHERE",  s(:dstr, s(:str, "a\\\n"), s(:str, "b\n"))],
+      ["%q{",           "}",       s(:dstr, s(:str, "a\\\n"), s(:str, "b"))  ],
+      ['"',             '"',       s(:str, "ab")                             ],
+      ["<<-\"HERE\"\n", "\nHERE",  s(:str, "ab\n")                           ],
+      ["%{",            "}",       s(:str, "ab")                             ],
+      ["%Q{",           "}",       s(:str, "ab")                             ],
+      ["%w{",           "}",       s(:array, s(:str, "a\nb"))                ],
+      ["%W{",           "}",       s(:array, s(:str, "a\nb"))                ],
+      ["%i{",           "}",       s(:array, s(:sym, :"a\nb"))               ],
+      ["%I{",           "}",       s(:array, s(:sym, :"a\nb"))               ],
+      [":'",            "'",       s(:dsym, s(:str, "a\\\n"), s(:str, "b"))  ],
+      ["%s{",           "}",       s(:dsym, s(:str, "a\\\n"), s(:str, "b"))  ],
+      [':"',            '"',       s(:sym, :ab)                              ],
+      ['/',             '/',       s(:regexp, s(:str, "ab"), s(:regopt))     ],
+      ['%r{',           '}',       s(:regexp, s(:str, "ab"), s(:regopt))     ],
+      ['%x{',           '}',       s(:xstr, s(:str, "ab"))                   ],
+      ['`',             '`',       s(:xstr, s(:str, "ab"))                   ],
+      ["<<-`HERE`\n",   "\nHERE",  s(:xstr, s(:str, "ab\n"))                 ],
+    ].each do |literal_s, literal_e, expected|
+      source = literal_s + "a\\\nb" + literal_e
+
+      assert_parses(
+        expected,
+        source,
+        %q{},
+        SINCE_2_0)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.5.3.0
+  version: 2.6.0.0
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -170,6 +170,7 @@ files:
 - Rakefile
 - bin/ruby-parse
 - bin/ruby-rewrite
+- ci/run_rubocop_specs
 - doc/AST_FORMAT.md
 - doc/CUSTOMIZATION.md
 - doc/INTERNALS.md