ripper_ruby_parser 1.6.0 → 1.8.0

data/lib/ripper_ruby_parser/unescape.rb

@@ -7,61 +7,66 @@ module RipperRubyParser
   module Unescape
     ESCAPE_SEQUENCE_REGEXP =
       /\\(
-        [0-7]{1,3}        | # octal character
-        x[0-9a-fA-F]{1,2} | # hex byte
-        u[0-9a-fA-F]+     | # unicode character
-        u{[0-9a-fA-F]{4}} | # unicode character
-        M-\\C-.           | # meta-ctrl
-        C-\\M-.           | # ctrl-meta
-        M-\\c.            | # meta-ctrl (shorthand)
-        c\\M-.            | # ctrl-meta (shorthand)
-        C-.               | # control (regular)
-        c.                | # control (shorthand)
-        M-.               | # meta
-        \n                | # line continuation
-        .                   # single-character
+        [0-7]{1,3}          | # octal character
+        x[0-9a-fA-F]{1,2}   | # hex byte
+        u[0-9a-fA-F]{4}     | # unicode character
+        u{[0-9a-fA-F]{4,6}} | # unicode character
+        M-\\C-.             | # meta-ctrl
+        C-\\M-.             | # ctrl-meta
+        M-\\c.              | # meta-ctrl (shorthand)
+        c\\M-.              | # ctrl-meta (shorthand)
+        C-.                 | # control (regular)
+        c.                  | # control (shorthand)
+        M-.                 | # meta
+        \n                  | # line break
+        .                     # other single character
       )/x.freeze
 
     SINGLE_LETTER_ESCAPES = {
-      'a' => "\a",
-      'b' => "\b",
-      'e' => "\e",
-      'f' => "\f",
-      'n' => "\n",
-      'r' => "\r",
-      's' => "\s",
-      't' => "\t",
-      'v' => "\v"
+      "a" => "\a",
+      "b" => "\b",
+      "e" => "\e",
+      "f" => "\f",
+      "n" => "\n",
+      "r" => "\r",
+      "s" => "\s",
+      "t" => "\t",
+      "v" => "\v"
     }.freeze
 
     SINGLE_LETTER_ESCAPES_REGEXP =
       Regexp.new("^[#{SINGLE_LETTER_ESCAPES.keys.join}]$")
 
     def simple_unescape(string)
-      string.gsub(/\\(
-        '   | # single quote
-        \\    # backslash
-      )/x) do
-        Regexp.last_match[1]
-      end
+      string.gsub(/
+                  \\ # a backslash
+                  (  # followed by a
+                   '   | # single quote or
+                   \\    # backslash
+                  )/x) do
+                    Regexp.last_match[1]
+                  end
     end
 
     def simple_unescape_wordlist_word(string)
-      string.gsub(/\\(
-        '   | # single quote
-        \\  | # backslash
-        [ ] | # space
-        \n    # newline
-      )/x) do
-        Regexp.last_match[1]
-      end
+      string.gsub(/
+                  \\ # a backslash
+                  (  # followed by a
+                    '   | # single quote or
+                    \\  | # backslash or
+                    [ ] | # space or
+                    \n    # newline
+                  )
+                  /x) do
+                    Regexp.last_match[1]
+                  end
     end
 
     def unescape(string)
       string.gsub(ESCAPE_SEQUENCE_REGEXP) do
         bare = Regexp.last_match[1]
         if bare == "\n"
-          ''
+          ""
         else
           unescaped_value(bare)
         end
@@ -88,9 +93,9 @@ module RipperRubyParser
         bare = Regexp.last_match[1]
         case bare
         when "\n"
-          ''
+          ""
         else
-          '\\\\'
+          "\\\\"
         end
       end
     end
@@ -102,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]) + bare[5..-1]
-      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.6.0'
+  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.6.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-12 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -30,59 +30,149 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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: '12.0'
+        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.13.1
+        version: 3.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.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
@@ -106,43 +195,19 @@ files:
 - lib/ripper_ruby_parser/sexp_handlers/method_calls.rb
 - lib/ripper_ruby_parser/sexp_handlers/methods.rb
 - lib/ripper_ruby_parser/sexp_handlers/operators.rb
+- lib/ripper_ruby_parser/sexp_handlers/string_literals.rb
 - lib/ripper_ruby_parser/sexp_processor.rb
 - 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_processor_test.rb
-- test/ripper_ruby_parser/version_test.rb
-- test/samples/assignment.rb
-- test/samples/comments.rb
-- test/samples/conditionals.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
@@ -152,43 +217,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-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_processor_test.rb
-- test/ripper_ruby_parser/version_test.rb
-- test/samples/assignment.rb
-- test/samples/comments.rb
-- test/samples/conditionals.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: []