ripper_ruby_parser 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e4ee66b4ce6abf5b0eeacd55fd137dd7217bf728bc59f1ad6bdf0b197011f86
-  data.tar.gz: a35a48bfa5178c5a9cec64017842246a4acb8b10a0c09fba2749de9aa650772c
+  metadata.gz: a110a987032924880be79cfbb79948e14f90868e8105055a0833284a6f939731
+  data.tar.gz: f38c7fa39cb0f1f6fc78cbe72956c77fe15fe74fe99507a3bd59d057618aed0a
 SHA512:
-  metadata.gz: 0574addabb87b0f843c2a72a3e5c03b6ffff2461a9f1fa551412ee706841a2baeb354c1decd3ca7c902e1e78c2c2b7c4a346784ebb6c5b1064211b4ca08b8039
-  data.tar.gz: cffd4a9f013b443e82b3b4d6149719b02119f182aafe86fc2984d81b131bc047bd1143ca5b06cd28dc32e71876cbb67452c9db47979a50d766e28ea7b7f590a2
+  metadata.gz: 7bf9631eb8941e2ed07ec265519ce8860f9d417cb224b2bbd1bbb8b32277374d76936be126c7893f73bcbcaa1414a25d4ca2280c9e0e701462cdbf5d34c3c77f
+  data.tar.gz: e517b02e7854fc644763932d8935dd5b145e2c7c4546874b419932a1d0f0d53b523cba356949f5b941e1fe6405c5b308cade8c42ba3d02078a8e7abe5df176a6

data/CHANGELOG.md

@@ -6,6 +6,12 @@ This project adheres to [Semantic Versioning 2.0.0][1].
 
 This document is formatted based on [Keep A CHANGELOG][2].
 
+## 1.10.0 / 2022-03-13
+
+* Handle shadow arguments ([#161])
+* Drop support for Ruby 2.5 ([#165])
+* Support running on Ruby 3.1([#180])
+
 ## 1.9.0 / 2021-08-10
 
 * Fix escape sequence handling in non-interpolating strings and word lists
@@ -226,6 +232,9 @@ This document is formatted based on [Keep A CHANGELOG][2].
 * Initial release
 
 <!-- Pull request links -->
+[#180]: https://github.com/mvz/ripper_ruby_parser/pull/180
+[#165]: https://github.com/mvz/ripper_ruby_parser/pull/165
+[#161]: https://github.com/mvz/ripper_ruby_parser/pull/161
 [#155]: https://github.com/mvz/ripper_ruby_parser/pull/155
 [#154]: https://github.com/mvz/ripper_ruby_parser/pull/154
 [#153]: https://github.com/mvz/ripper_ruby_parser/pull/153

data/README.md

@@ -10,8 +10,8 @@ Parse with Ripper, produce sexps that are compatible with RubyParser.
 
 * Drop-in replacement for RubyParser
 * Should handle 1.9 and later syntax gracefully
-* Requires Ruby 2.5 or higher
-* Compatible with RubyParser 3.17.0
+* Requires Ruby 2.6 or higher
+* Compatible with RubyParser 3.18.0
 
 ## Known incompatibilities
 
@@ -64,7 +64,7 @@ If you want to send pull requests or patches, please:
 
 (The MIT License)
 
-Copyright (c) 2012, 2014-2020 Matijs van Zuijlen
+Copyright (c) 2012, 2014-2022 Matijs van Zuijlen
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/ripper_ruby_parser/sexp_handlers/blocks.rb

@@ -14,6 +14,9 @@ module RipperRubyParser
         make_iter call, args, safe_unwrap_void_stmt(stmt)
       end
 
+      # NOTE: Argument forwarding is handled differently in Ruby 3.0 and 3.1
+      # 3.0: s(:params, nil, nil, s(:args_forward), nil, nil, nil, nil)
+      # 3.1: s(:params, nil, nil, nil, nil, nil, s(:args_forward), :&)
       def process_params(exp)
         _, normal, defaults, splat, rest, kwargs, doublesplat, block = exp.shift 8
 
@@ -40,10 +43,15 @@ module RipperRubyParser
       end
 
       def process_block_var(exp)
-        _, args, = exp.shift 3
+        _, args, shadowargs = exp.shift 3
 
         names = process(args)
 
+        if shadowargs
+          shadowargs = map_process_list(shadowargs).map { |item| item[1] }
+          names << s(:shadow, *shadowargs)
+        end
+
         convert_arguments names
       end
 
@@ -177,11 +185,18 @@ module RipperRubyParser
       def handle_double_splat(doublesplat)
         return [] unless doublesplat
 
-        [s(:dsplat, process(doublesplat))]
+        contents = process(doublesplat)
+        case contents.sexp_type
+        when :forward_args # Argument forwarding in Ruby 3.1
+          [contents]
+        else
+          [s(:dsplat, contents)]
+        end
       end
 
       def handle_block_argument(block)
         return [] unless block
+        return [] if block == :& # Part of argument forwarding in Ruby 3.1; ignore
 
         [process(block)]
       end

data/lib/ripper_ruby_parser/sexp_handlers/literals.rb

@@ -7,7 +7,7 @@ module RipperRubyParser
       # character literals
       def process_at_CHAR(exp)
         _, val, pos = exp.shift 3
-        with_position(pos, s(:str, fix_encoding(unescape(val[1..-1]))))
+        with_position(pos, s(:str, fix_encoding(unescape(val[1..]))))
       end
 
       def process_array(exp)

data/lib/ripper_ruby_parser/sexp_processor.rb

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

data/lib/ripper_ruby_parser/unescape.rb

@@ -131,7 +131,7 @@ module RipperRubyParser
     end
 
     def unescape_hex_char(bare)
-      hex_to_char(bare[1..-1])
+      hex_to_char(bare[1..])
     end
 
     def unescape_unicode_char(bare)

data/lib/ripper_ruby_parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RipperRubyParser
-  VERSION = "1.9.0"
+  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.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2022-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -43,6 +43,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.1
   type: :development
@@ -50,6 +53,9 @@ dependencies:
   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
@@ -100,74 +106,82 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: '1.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        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.11.0
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.17.0
+        version: '3.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.17.0
+        version: '3.18'
 - !ruby/object:Gem::Dependency
   name: sexp_processor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        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: 4.13.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.16'
 - !ruby/object:Gem::Dependency
@@ -221,6 +235,7 @@ 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"
@@ -231,14 +246,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Parse with Ripper, produce sexps that are compatible with RubyParser.