ripper_ruby_parser 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 568f21d8800cba790d212bb45e96554f93a271da3d9bae483fbf101385906d8d
-  data.tar.gz: fa4393288ca29703405077d9da524a51cb0d7575c08b8dcabcc9be3bcbe5d6d0
+  metadata.gz: e017d6c1dff36a5f33a74676c9ff3d9d069ad2210bc8e8049b26ddff56d8961b
+  data.tar.gz: 76ba1cc8e225478f4679ed0b801c69387f5c350b57fda365a6316f42c0800bba
 SHA512:
-  metadata.gz: 5dcfda84f25d0351b0351e06eb231deaab73d6377991a6b1939dc9c4df268c8cfb0960c22ca50a0d3a5dec432a855ef2ddb8a66171b321855ae2732c1f2d5518
-  data.tar.gz: 7c68ec079fe840e6990d1555b1751639b46113f636fcc4e90429af4a3c36382f19ba6fbd6c3c0016271e1082412dd6f9001c7f8fb7c20858aec06d1d88a4af59
+  metadata.gz: c22fb29374df4cde3de294f1fd7f7e7b529b7a67d69522f5779ff2cb1ec83f8ea8acfdc6eb0750bf9246094989df59b586a1bb96ff3c7c6227aa51be49d8e121
+  data.tar.gz: 2d3988eebde86cc80dbcd8079941e00cd3edc4263a105590d608cb37622284cb96bf9cff923b8514d31fd8b4cddaaafdbab270f077d49f0326960c6645577f3b

data/CHANGELOG.md

@@ -6,6 +6,16 @@ This project adheres to [Semantic Versioning 2.0.0][1].
 
 This document is formatted based on [Keep A CHANGELOG][2].
 
+## 1.12.0 / 2025-10-25
+
+* Target compatibility with `ruby_parser` 3.21 ([#256] by [mvz])
+* Support Ruby 3.2 through 3.4, dropping support for Ruby 3.0 and 3.1
+  ([#255] and [#260] by [mvz])
+
+[#255]: https://github.com/mvz/ripper_ruby_parser/pull/255
+[#256]: https://github.com/mvz/ripper_ruby_parser/pull/256
+[#260]: https://github.com/mvz/ripper_ruby_parser/pull/260
+
 ## 1.11.0 / 2024-01-05
 
 * Support Ruby 3.0 through 3.3, dropping support for Ruby 2.6 and 2.7

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 3.0 or higher
-* Compatible with RubyParser 3.20.2
+* Requires Ruby 3.2 or higher
+* Compatible with RubyParser 3.21.0
 
 ## Known incompatibilities
 
@@ -22,6 +22,8 @@ RipperRubyParser has a few incompatibilities with RubyParser.
 * RipperRubyParser does not always match RubyParser's line numbering
 * RipperRubyParser dedents auto-dedenting heredocs
 * RipperRubyParser does not include postfix comments
+* With Ruby 3.4, RipperRubyParser parses variables assigned by regular
+  expressions as local variables
 
 ## Install
 
@@ -46,7 +48,7 @@ parser.parse "foo[bar] += baz qux"
 
 ## Requirements
 
-* Ruby 2.7 or higher
+* Ruby 3.2 or higher
 * `sexp_processor`
 
 ## Hacking and contributing
@@ -66,7 +68,7 @@ If you want to send pull requests or patches, please:
 
 (The MIT License)
 
-Copyright (c) 2012, 2014-2024 Matijs van Zuijlen
+Copyright (c) 2012, 2014-2025 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/commenting_ripper_parser.rb

@@ -70,15 +70,17 @@ module RipperRubyParser
     end
 
     def on_kw(tok)
-      result = super
-      case tok
-      when "class", "def", "module", "BEGIN", "begin", "END"
-        unless @in_symbol
+      super.tap do |result|
+        next if @in_symbol
+
+        case tok
+        when "class", "def", "module", "BEGIN", "begin", "END"
           @comment_stack.push [result, @comment]
           @comment = ""
+        when "end"
+          @comment = "" if @comment_stack.any?
         end
       end
-      result
     end
 
     def on_module(*args)
@@ -221,7 +223,7 @@ module RipperRubyParser
     end
 
     def on_tstring_content(content)
-      super(content) << @delimiter_stack.last
+      super << @delimiter_stack.last
     end
 
     def on_tstring_end(delimiter)
@@ -287,6 +289,7 @@ module RipperRubyParser
     end
 
     NUMBER_LITERAL_TYPES = [:@imaginary, :@int, :@float, :@rational].freeze
+    private_constant :NUMBER_LITERAL_TYPES
 
     def on_unary(operator, value)
       if !@space_before && operator == :-@ && NUMBER_LITERAL_TYPES.include?(value.first)
@@ -321,6 +324,21 @@ module RipperRubyParser
       super
     end
 
+    def on_case(*args)
+      @comment = ""
+      super
+    end
+
+    def on_ident(*args)
+      @comment = ""
+      super
+    end
+
+    def on_string_content(*args)
+      @comment = ""
+      super
+    end
+
     def on_BEGIN(*args)
       commentize("BEGIN", super)
     end
@@ -351,13 +369,15 @@ module RipperRubyParser
     end
 
     def commentize(name, exp, target_loc = nil)
+      raise "Non-empty comment in progress: #{@comment}" unless @comment.empty?
+
       if target_loc
         (_, kw, loc), comment = @comment_stack.pop until (loc <=> target_loc) == -1
       else
         (_, kw, loc), comment = @comment_stack.pop
       end
 
-      warn "Comment stack mismatch: expected #{kw} to equal #{name}" unless kw == name
+      raise "Comment stack mismatch: expected #{kw} to equal #{name}" unless kw == name
 
       @comment = ""
       exp.push loc

data/lib/ripper_ruby_parser/sexp_handlers/assignment.rb

@@ -155,6 +155,7 @@ module RipperRubyParser
         "||": :op_asgn_or,
         "&&": :op_asgn_and
       }.freeze
+      private_constant :OPERATOR_ASSIGNMENT_MAP
 
       def create_regular_operator_assignment_sub_type(lvalue, value, operator)
         value = unwrap_begin(value)
@@ -198,6 +199,8 @@ module RipperRubyParser
         cvar: :cvasgn
       }.freeze
 
+      private_constant :ASSIGNMENT_SUB_TYPE_MAP, :ASSIGNMENT_IN_METHOD_SUB_TYPE_MAP
+
       def create_assignment_sub_type(lvalue, value)
         lvalue_type, lvalue_value = lvalue
         s(map_assignment_lvalue_type(lvalue_type), lvalue_value, value)

data/lib/ripper_ruby_parser/sexp_handlers/blocks.rb

@@ -215,7 +215,8 @@ module RipperRubyParser
       end
 
       LVAR_MATCHER = Sexp::Matcher.new(:lvar, Sexp._)
-      NUMBERED_PARAMS = (1..9).map { |it| :"_#{it}" }.freeze
+      NUMBERED_PARAMS = (1..9).map { |num| :"_#{num}" }.freeze
+      private_constant :LVAR_MATCHER, :NUMBERED_PARAMS
 
       def make_iter(call, args, stmt)
         args[-1] = nil if args && args.last == s(:excessed_comma)
@@ -230,7 +231,7 @@ module RipperRubyParser
       end
 
       def count_numbered_lvars(stmt)
-        lvar_names = (LVAR_MATCHER / stmt).map { |it| it[1] }
+        lvar_names = (LVAR_MATCHER / stmt).map { |match| match[1] }
         (NUMBERED_PARAMS & lvar_names).length
       end
     end

data/lib/ripper_ruby_parser/sexp_handlers/methods.rb

@@ -101,6 +101,7 @@ module RipperRubyParser
         dsplat: "**",
         blockarg: "&"
       }.freeze
+      private_constant :SPECIAL_ARG_MARKER
 
       def convert_arguments(args)
         return s(:args) if args.nil?

data/lib/ripper_ruby_parser/sexp_handlers/string_literals.rb

@@ -139,11 +139,11 @@ module RipperRubyParser
       end
 
       def merge_raw_string_literals(list)
-        chunks = list.chunk { |it| it.sexp_type == :@tstring_content }
+        chunks = list.chunk { |lit| lit.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
+            contents = items.map { |lit| lit[1] }.join
             [s(:@tstring_content, contents, head[2], head[3])]
           else
             items
@@ -236,6 +236,12 @@ module RipperRubyParser
       NON_INTERPOLATING_WORD_LIST = /^%[wi].$/
       REGEXP_LITERALS = ["/", /^%r.$/].freeze
 
+      private_constant :INTERPOLATING_HEREDOC, :NON_INTERPOLATING_HEREDOC,
+                       :INTERPOLATING_STRINGS, :NON_INTERPOLATING_STRINGS,
+                       :INTERPOLATING_DSYM,
+                       :INTERPOLATING_WORD_LIST, :NON_INTERPOLATING_WORD_LIST,
+                       :REGEXP_LITERALS
+
       def handle_string_unescaping(content, delim)
         case delim
         when INTERPOLATING_HEREDOC, INTERPOLATING_DSYM, *INTERPOLATING_STRINGS

data/lib/ripper_ruby_parser/sexp_processor.rb

@@ -27,8 +27,6 @@ module RipperRubyParser
 
       @in_method_body = false
       @local_variables = []
-
-      @kept_comment = nil
     end
 
     include SexpHandlers
@@ -118,14 +116,10 @@ module RipperRubyParser
 
     def process_comment(exp)
       _, comment, inner = exp.shift 3
-      comment = @kept_comment + comment if @kept_comment
-      @kept_comment = nil
       sexp = process(inner)
       case sexp.sexp_type
       when :defs, :defn, :module, :class, :sclass
         sexp.comments = comment
-      else
-        @kept_comment = comment
       end
       sexp
     end

data/lib/ripper_ruby_parser/unescape.rb

@@ -183,7 +183,7 @@ module RipperRubyParser
     def delimiter_regexp_pattern(delimiter)
       delimiter = delimiter[-1]
       delimiters = DELIMITER_PAIRS.fetch(delimiter, delimiter)
-      delimiters.each_char.map { |it| Regexp.escape it }.join(" | ")
+      delimiters.each_char.map { |char| Regexp.escape char }.join(" | ")
     end
   end
 end

data/lib/ripper_ruby_parser/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ripper_ruby_parser
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -58,20 +57,6 @@ dependencies:
     - - ">="
       - !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
@@ -106,70 +91,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.56'
+        version: '1.79'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.56'
+        version: '1.79'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.34.1
+        version: 0.38.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.34.1
+        version: 0.38.0
 - !ruby/object:Gem::Dependency
   name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.20.2
+        version: 3.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.20.2
+        version: 3.21.0
 - !ruby/object:Gem::Dependency
   name: sexp_processor
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +221,6 @@ metadata:
   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
@@ -246,15 +230,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Parse with Ripper, produce sexps that are compatible with RubyParser.
 test_files: []