ripper_ruby_parser 1.7.2 → 1.8.0

data/lib/ripper_ruby_parser/sexp_handlers/string_literals.rb

@@ -135,8 +135,25 @@ module RipperRubyParser
 
         list = merge_raw_string_literals list
         list = map_process_list list
+        parts = unpack_dstr list
+        merge_initial_string_literals(parts)
+      end
+
+      def merge_raw_string_literals(list)
+        chunks = list.chunk { |it| it.sexp_type == :@tstring_content }
+        chunks.flat_map do |is_simple, items|
+          if is_simple && items.count > 1
+            head = items.first
+            contents = items.map { |it| it[1] }.join
+            [s(:@tstring_content, contents, head[2], head[3])]
+          else
+            items
+          end
+        end
+      end
 
-        parts = list.flat_map do |item|
+      def unpack_dstr(list)
+        list.flat_map do |item|
           type, val, *rest = item
           if type == :dstr
             if val.empty?
@@ -148,7 +165,9 @@ module RipperRubyParser
             [item]
           end
         end
+      end
 
+      def merge_initial_string_literals(parts)
         string = ""
         while parts.first&.sexp_type == :str
           str = parts.shift
@@ -159,19 +178,6 @@ module RipperRubyParser
         return line, string, parts
       end
 
-      def merge_raw_string_literals(list)
-        chunks = list.chunk { |it| it.sexp_type == :@tstring_content }
-        chunks.flat_map do |is_simple, items|
-          if is_simple && items.count > 1
-            head = items.first
-            contents = items.map { |it| it[1] }.join
-            [s(:@tstring_content, contents, head[2], head[3])]
-          else
-            items
-          end
-        end
-      end
-
       def character_flags_to_numerical(flags)
         numflags = 0
 
@@ -196,7 +202,7 @@ module RipperRubyParser
       end
 
       def handle_symbol_content(node)
-        if node.sexp_type == :'@kw'
+        if node.sexp_type == :@kw
           symbol, position = extract_node_symbol_with_position(node)
           with_position(position, s(:lit, symbol))
         else

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)
@@ -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

@@ -95,7 +95,7 @@ module RipperRubyParser
         when "\n"
           ""
         else
-          '\\\\'
+          "\\\\"
         end
       end
     end
@@ -107,24 +107,48 @@ module RipperRubyParser
       when SINGLE_LETTER_ESCAPES_REGEXP
         SINGLE_LETTER_ESCAPES[bare]
       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..-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

data/lib/ripper_ruby_parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RipperRubyParser
-  VERSION = "1.7.2"
+  VERSION = "1.8.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.8.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.6'
+- !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 +66,113 @@ 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.15.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.14.1
+        version: 3.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.14.1
+        version: 3.16.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: sexp_processor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.13.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.16'
   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: 4.13.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.16'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        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 +182,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 +200,14 @@ 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
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -155,45 +217,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.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.15
+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: []