ripper_ruby_parser 1.7.2 → 1.10.0

data/lib/ripper_ruby_parser/sexp_processor.rb

@@ -11,8 +11,7 @@ module RipperRubyParser
   class SexpProcessor < ::SexpProcessor
     include Unescape
 
-    attr_reader :filename
-    attr_reader :extra_compatible
+    attr_reader :filename, :extra_compatible
 
     def initialize(filename: nil, extra_compatible: nil)
       super()
@@ -68,15 +67,7 @@ module RipperRubyParser
       statements = map_unwrap_begin_list map_process_list statements
       line = statements.first.line
       statements = reject_void_stmt statements
-      case statements.count
-      when 0
-        s(:void_stmt).line(line)
-      when 1
-        statements.first
-      else
-        first = statements.shift
-        s(:block, *unwrap_block(first), *statements)
-      end
+      wrap_in_block(statements, line)
     end
 
     def process_var_ref(exp)
@@ -125,11 +116,7 @@ module RipperRubyParser
     def process_paren(exp)
       _, body = exp.shift 2
       result = process body
-      if result.sexp_type == :void_stmt
-        s(:nil)
-      else
-        result
-      end
+      convert_void_stmt_to_nil_symbol result
     end
 
     def process_comment(exp)
@@ -208,7 +195,7 @@ module RipperRubyParser
 
     def process_at_backref(exp)
       _, str, pos = exp.shift 3
-      name = str[1..-1]
+      name = str[1..]
       with_position pos do
         if /[0-9]/.match?(name)
           s(:nth_ref, name.to_i)
@@ -234,7 +221,7 @@ module RipperRubyParser
     def class_or_module_body(exp)
       body = process(exp)
 
-      return body if body.empty?
+      return [] if body.sexp_type == :void_stmt
 
       unwrap_block body
     end

data/lib/ripper_ruby_parser/unescape.rb

@@ -37,25 +37,34 @@ module RipperRubyParser
     SINGLE_LETTER_ESCAPES_REGEXP =
       Regexp.new("^[#{SINGLE_LETTER_ESCAPES.keys.join}]$")
 
-    def simple_unescape(string)
+    DELIMITER_PAIRS = {
+      "(" => "()",
+      "<" => "<>",
+      "[" => "[]",
+      "{" => "{}"
+    }.freeze
+
+    def simple_unescape(string, delimiter)
+      delimiters = delimiter_regexp_pattern(delimiter)
       string.gsub(/
                   \\ # a backslash
                   (  # followed by a
-                   '   | # single quote or
-                   \\    # backslash
+                    #{delimiters} | # delimiter or
+                    \\              # backslash
                   )/x) do
                     Regexp.last_match[1]
                   end
     end
 
-    def simple_unescape_wordlist_word(string)
+    def simple_unescape_wordlist_word(string, delimiter)
+      delimiters = delimiter_regexp_pattern(delimiter)
       string.gsub(/
                   \\ # a backslash
                   (  # followed by a
-                    '   | # single quote or
-                    \\  | # backslash or
-                    [ ] | # space or
-                    \n    # newline
+                    #{delimiters} | # delimiter or
+                    \\            | # backslash or
+                    [ ]           | # space or
+                    \n              # newline
                   )
                   /x) do
                     Regexp.last_match[1]
@@ -63,12 +72,14 @@ module RipperRubyParser
     end
 
     def unescape(string)
+      string = string.dup if string.frozen?
+      string.force_encoding("ASCII-8BIT")
       string.gsub(ESCAPE_SEQUENCE_REGEXP) do
         bare = Regexp.last_match[1]
         if bare == "\n"
           ""
         else
-          unescaped_value(bare)
+          unescaped_value(bare).force_encoding("ASCII-8BIT")
         end
       end
     end
@@ -95,7 +106,7 @@ module RipperRubyParser
         when "\n"
           ""
         else
-          '\\\\'
+          "\\\\"
         end
       end
     end
@@ -105,26 +116,50 @@ module RipperRubyParser
     def unescaped_value(bare)
       case bare
       when SINGLE_LETTER_ESCAPES_REGEXP
-        SINGLE_LETTER_ESCAPES[bare]
+        SINGLE_LETTER_ESCAPES[bare].dup
       when /^x/
-        hex_to_char(bare[1..-1])
-      when /^u\{/
-        hex_to_unicode_char(bare[2..-2])
+        unescape_hex_char bare
       when /^u/
-        hex_to_unicode_char(bare[1..4])
-      when /^(c|C-).$/
-        control(bare[-1].ord).chr
-      when /^M-.$/
-        meta(bare[-1].ord).chr
-      when /^(M-\\C-|C-\\M-|M-\\c|c\\M-).$/
-        meta(control(bare[-1].ord)).chr
+        unescape_unicode_char bare
+      when /^(c|C-|M-|M-\\C-|C-\\M-|M-\\c|c\\M-).$/
+        unescape_meta_control bare
       when /^[0-7]+/
-        bare.to_i(8).chr
+        unescape_octal bare
       else
         bare
       end
     end
 
+    def unescape_hex_char(bare)
+      hex_to_char(bare[1..])
+    end
+
+    def unescape_unicode_char(bare)
+      hex_chars = if bare.start_with? "u{"
+                    bare[2..-2]
+                  else
+                    bare[1..4]
+                  end
+      hex_to_unicode_char(hex_chars)
+    end
+
+    def unescape_meta_control(bare)
+      base_value = bare[-1].ord
+      value = case bare
+              when /^(c|C-).$/
+                control(base_value)
+              when /^M-.$/
+                meta(base_value)
+              when /^(M-\\C-|C-\\M-|M-\\c|c\\M-).$/
+                meta(control(base_value))
+              end
+      value.chr
+    end
+
+    def unescape_octal(bare)
+      bare.to_i(8).chr
+    end
+
     def hex_to_unicode_char(str)
       str.to_i(16).chr(Encoding::UTF_8)
     end
@@ -140,5 +175,11 @@ module RipperRubyParser
     def meta(val)
       val | 0b1000_0000
     end
+
+    def delimiter_regexp_pattern(delimiter)
+      delimiter = delimiter[-1]
+      delimiters = DELIMITER_PAIRS.fetch(delimiter, delimiter)
+      delimiters.each_char.map { |it| Regexp.escape it }.join(" | ")
+    end
   end
 end

data/lib/ripper_ruby_parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RipperRubyParser
-  VERSION = "1.7.2"
+  VERSION = "1.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ripper_ruby_parser
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.10.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2022-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -38,6 +38,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.6'
+- !ruby/object:Gem::Dependency
+  name: minitest-focus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,37 +86,121 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rake-manifest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-packaging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.14.1
+        version: '3.18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.18'
+- !ruby/object:Gem::Dependency
+  name: sexp_processor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.14.1
+        version: '4.16'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: |2
-      RipperRubyParser is a parser for Ruby based on Ripper that aims to be a
-      drop-in replacement for RubyParser.
+        version: 0.21.0
+description: |
+  RipperRubyParser is a parser for Ruby based on Ripper that aims to be a
+  drop-in replacement for RubyParser.
 email:
 - matijs@matijs.net
 executables: []
@@ -92,7 +210,6 @@ extra_rdoc_files:
 files:
 - CHANGELOG.md
 - README.md
-- Rakefile
 - lib/ripper_ruby_parser.rb
 - lib/ripper_ruby_parser/commenting_ripper_parser.rb
 - lib/ripper_ruby_parser/parser.rb
@@ -111,41 +228,15 @@ files:
 - lib/ripper_ruby_parser/syntax_error.rb
 - lib/ripper_ruby_parser/unescape.rb
 - lib/ripper_ruby_parser/version.rb
-- test/end_to_end/comments_test.rb
-- test/end_to_end/comparison_test.rb
-- test/end_to_end/lib_comparison_test.rb
-- test/end_to_end/line_numbering_test.rb
-- test/end_to_end/samples_comparison_test.rb
-- test/end_to_end/test_comparison_test.rb
-- test/pt_testcase/pt_test.rb
-- test/ripper_ruby_parser/commenting_ripper_parser_test.rb
-- test/ripper_ruby_parser/parser_test.rb
-- test/ripper_ruby_parser/sexp_handlers/assignment_test.rb
-- test/ripper_ruby_parser/sexp_handlers/blocks_test.rb
-- test/ripper_ruby_parser/sexp_handlers/conditionals_test.rb
-- test/ripper_ruby_parser/sexp_handlers/literals_test.rb
-- test/ripper_ruby_parser/sexp_handlers/loops_test.rb
-- test/ripper_ruby_parser/sexp_handlers/method_calls_test.rb
-- test/ripper_ruby_parser/sexp_handlers/methods_test.rb
-- test/ripper_ruby_parser/sexp_handlers/operators_test.rb
-- test/ripper_ruby_parser/sexp_handlers/string_literals_test.rb
-- test/ripper_ruby_parser/sexp_processor_test.rb
-- test/ripper_ruby_parser/version_test.rb
-- test/samples/assignment.rb
-- test/samples/comments.rb
-- test/samples/conditionals.rb
-- test/samples/lambdas.rb
-- test/samples/loops.rb
-- test/samples/misc.rb
-- test/samples/number.rb
-- test/samples/operators.rb
-- test/samples/strings.rb
-- test/test_helper.rb
 homepage: http://www.github.com/mvz/ripper_ruby_parser
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: http://www.github.com/mvz/ripper_ruby_parser
+  source_code_uri: https://github.com/mvz/ripper_ruby_parser
+  changelog_uri: https://github.com/mvz/ripper_ruby_parser/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -155,45 +246,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Parse with Ripper, produce sexps that are compatible with RubyParser.
-test_files:
-- test/end_to_end/comments_test.rb
-- test/end_to_end/comparison_test.rb
-- test/end_to_end/lib_comparison_test.rb
-- test/end_to_end/line_numbering_test.rb
-- test/end_to_end/samples_comparison_test.rb
-- test/end_to_end/test_comparison_test.rb
-- test/pt_testcase/pt_test.rb
-- test/ripper_ruby_parser/commenting_ripper_parser_test.rb
-- test/ripper_ruby_parser/parser_test.rb
-- test/ripper_ruby_parser/sexp_handlers/assignment_test.rb
-- test/ripper_ruby_parser/sexp_handlers/blocks_test.rb
-- test/ripper_ruby_parser/sexp_handlers/conditionals_test.rb
-- test/ripper_ruby_parser/sexp_handlers/literals_test.rb
-- test/ripper_ruby_parser/sexp_handlers/loops_test.rb
-- test/ripper_ruby_parser/sexp_handlers/method_calls_test.rb
-- test/ripper_ruby_parser/sexp_handlers/methods_test.rb
-- test/ripper_ruby_parser/sexp_handlers/operators_test.rb
-- test/ripper_ruby_parser/sexp_handlers/string_literals_test.rb
-- test/ripper_ruby_parser/sexp_processor_test.rb
-- test/ripper_ruby_parser/version_test.rb
-- test/samples/assignment.rb
-- test/samples/comments.rb
-- test/samples/conditionals.rb
-- test/samples/lambdas.rb
-- test/samples/loops.rb
-- test/samples/misc.rb
-- test/samples/number.rb
-- test/samples/operators.rb
-- test/samples/strings.rb
-- test/test_helper.rb
+test_files: []

data/Rakefile

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require "rake/clean"
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-namespace :test do
-  Rake::TestTask.new(:unit) do |t|
-    t.libs = ["lib"]
-    t.test_files = FileList["test/ripper_ruby_parser/**/*_test.rb"]
-    t.warning = true
-  end
-
-  Rake::TestTask.new(:end_to_end) do |t|
-    t.libs = ["lib"]
-    t.test_files = FileList["test/end_to_end/*_test.rb"]
-    t.warning = true
-  end
-
-  Rake::TestTask.new(:pt_testcase) do |t|
-    t.libs = ["lib"]
-    t.test_files = FileList["test/pt_testcase/*_test.rb"]
-    t.warning = true
-  end
-
-  desc "Run all three test suites"
-  task run: [:unit, :end_to_end, :pt_testcase]
-end
-
-desc "Alias to test:run"
-task test: "test:run"
-
-task default: :test

data/test/end_to_end/comments_test.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-require File.expand_path("../test_helper.rb", File.dirname(__FILE__))
-require "ruby_parser"
-
-describe "Using RipperRubyParser and RubyParser" do
-  let :newparser do
-    RipperRubyParser::Parser.new
-  end
-
-  let :oldparser do
-    RubyParser.for_current_ruby
-  end
-
-  describe "for a program with quite some comments" do
-    let :program do
-      <<-RUBY
-      # Foo
-      class Foo
-        # The foo
-        # method
-        def foo
-          bar # bar
-          # internal comment
-        end
-
-        def bar
-          baz
-        end
-      end
-      # Quux
-      module Qux
-        class Quux
-          def bar
-          end
-          def baz
-          end
-        end
-      end
-      RUBY
-    end
-
-    let :original do
-      oldparser.parse program
-    end
-
-    let :imitation do
-      newparser.parse program
-    end
-
-    it "gives the same result" do
-      _(imitation).must_equal original
-    end
-
-    it "gives the same result with comments" do
-      _(to_comments(imitation)).must_equal to_comments(original)
-    end
-  end
-end

data/test/end_to_end/comparison_test.rb

@@ -1,104 +0,0 @@
-# frozen_string_literal: true
-
-require File.expand_path("../test_helper.rb", File.dirname(__FILE__))
-require "ruby_parser"
-
-describe "Using RipperRubyParser and RubyParser" do
-  describe "for a simple well known program" do
-    let :program do
-      "puts 'Hello World'"
-    end
-
-    it "gives the same result with line numbers" do
-      _(program).must_be_parsed_as_before with_line_numbers: true
-    end
-  end
-
-  describe "for a more complex program" do
-    let :program do
-      <<-RUBY
-      module Quux
-        class Foo
-          def bar
-            baz = 3
-            qux baz
-          end
-          def qux it
-            if it == 3
-              [1,2,3].map {|i| 2*i}
-            end
-          end
-        end
-      end
-
-      Quux::Foo.new.bar
-      RUBY
-    end
-
-    it "gives the same result with line numbers" do
-      _(program).must_be_parsed_as_before with_line_numbers: true
-    end
-  end
-
-  describe "for an example with yield from Reek" do
-    let :program do
-      "def fred() yield(3) if block_given?; end"
-    end
-
-    it "gives the same result with line numbers" do
-      _(program).must_be_parsed_as_before with_line_numbers: true
-    end
-  end
-
-  describe "for an example with floats from Reek" do
-    let :program do
-      <<-RUBY
-        def total_envy
-          fred = @item
-          total = 0
-          total += fred.price
-          total += fred.tax
-          total *= 1.15
-        end
-      RUBY
-    end
-
-    it "gives the same result with line numbers" do
-      _(program).must_be_parsed_as_before with_line_numbers: true
-    end
-  end
-
-  describe "for an example with operators and explicit block parameter from Reek" do
-    let :program do
-      <<-RUBY
-        def parse(arg, argv, &error)
-          if !(val = arg) and (argv.empty? or /\\A-/ =~ (val = argv[0]))
-            return nil, block, nil
-          end
-          opt = (val = parse_arg(val, &error))[1]
-          val = conv_arg(*val)
-          if opt and !arg
-            argv.shift
-          else
-            val[0] = nil
-          end
-          val
-        end
-      RUBY
-    end
-
-    it "gives the same result with line numbers" do
-      _(program).must_be_parsed_as_before with_line_numbers: true
-    end
-  end
-
-  describe "for an example of a complex regular expression from Reek" do
-    let :program do
-      "/(\#{@types})\\s*(\\w+)\\s*\\(([^)]*)\\)/"
-    end
-
-    it "gives the same result with line numbers" do
-      _(program).must_be_parsed_as_before with_line_numbers: true
-    end
-  end
-end