unparser 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d687ea37d01a5a689f6c2c909072090603ec406d0a0e0bc933d315362b10d5a3
-  data.tar.gz: a49fe55eb25755a6d4158084ca9ccd0df1e62741584af21d9313b8eb63d1d5af
+  metadata.gz: e0e776dd7b47efb62b8ad18d7262d247362944f28ea67edb7e518d8a94c74649
+  data.tar.gz: 759ec6fb240c4c62835bd8c789877fc26fc974563d2566687a63b2c0dec1072f
 SHA512:
-  metadata.gz: 5bc28be9868ed008eb3c7e072a01a9403921f2ee9a28566f2d4a616042cb2f3da659a817a79046462fd4d5a782219d2209072ed21942c54133bac82754f1103d
-  data.tar.gz: eaa194a4a148f61ffdefad476cadf99c600fa88f94618dbf408a8fed10027cde2f4151bb6d2ec4b35195ce54c10d07b90d2b58be83f7ef8abf24056aee3d828a
+  metadata.gz: 11fe99943d2575e00ca2fc150a78cad1f2f830b3249f3692f473da7e520775fc9423b254fb2f7613e4b6811f03dd3d2af0d4bba1d0f2f143e048ab65281771ff
+  data.tar.gz: f08db4117aa2ebba9c5ac7a9e057ca7ddc9fc0613170752ac10cc7515058f491fe756b880db73629e2e7a8328cc979872b4c682197c061de39da52a44796587f

data/README.md

@@ -10,7 +10,7 @@ The following constraints apply:
 
 * No support for macruby extensions
 * Only support for the [modern AST](https://github.com/whitequark/parser/#usage) format
-* Only support for Ruby >= 3.1
+* Only support for Ruby >= 3.2
 
 Notable Users:
 
@@ -44,9 +44,9 @@ To preserve the comments from the source:
 require 'parser/current'
 require 'unparser'
 
-ast, comments = Unparser.parse_with_comments('your(ruby(code)) # with comments')
+ast, comments = Unparser.parser.parse_with_comments(Unparser.buffer('your(ruby(code)) # with comments'))
 
-Unparser.unparse(ast, comments) # => 'your(ruby(code)) # with comments'
+Unparser.unparse(ast, comments: comments) # => 'your(ruby(code)) # with comments'
 ```
 
 Passing in manually constructed AST:
@@ -114,7 +114,7 @@ Unparser currently successfully round trips almost all ruby code around. Using R
 If there is a non round trippable example that is NOT subjected to known [Limitations](#limitations).
 please report a bug.
 
-On CI unparser is currently tested against rubyspec with minor [excludes](https://github.com/mbj/unparser/blob/master/spec/integrations.yml).
+On CI unparser is currently tested against rubyspec with minor [excludes](https://github.com/mbj/unparser/blob/main/spec/integrations.yml).
 
 Limitations:
 ------------

data/lib/unparser/cli.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'pathname'
+
 module Unparser
   # Unparser CLI implementation
   class CLI

data/lib/unparser/color.rb

@@ -30,10 +30,10 @@ module Unparser
 
       # Well rubocop you are static so you do not have a clue here ;)
       # rubocop:disable Style/RedundantInitialize
-      # rubocop:disable Style/MissingSuper
+      # rubocop:disable Lint/MissingSuper
       def initialize; end
       # rubocop:enable Style/RedundantInitialize
-      # rubocop:enable Style/MissingSuper
+      # rubocop:enable Lint/MissingSuper
 
     end.new
 

data/lib/unparser/emitter/args.rb

@@ -13,7 +13,11 @@ module Unparser
       end
 
       def emit_def_arguments
-        delimited(normal_arguments)
+        if children.one? && n_mlhs?(Util.one(children))
+          emitter(Util.one(children)).dispatch_def
+        else
+          delimited(normal_arguments)
+        end
       end
 
       def emit_lambda_arguments

data/lib/unparser/emitter/assignment.rb

@@ -25,6 +25,16 @@ module Unparser
 
         if BINARY_OPERATOR.include?(right.type)
           writer_with(Writer::Binary, node: right).emit_operator
+        elsif n_array?(right)
+          emit_array
+        else
+          right_emitter.write_to_buffer
+        end
+      end
+
+      def emit_array
+        if right.children.size > 1
+          delimited(right.children)
         else
           right_emitter.write_to_buffer
         end

data/lib/unparser/emitter/block.rb

@@ -5,7 +5,7 @@ module Unparser
 
     # Block emitter
     class Block < self
-      handle :block, :numblock
+      handle :block, :numblock, :itblock
 
       children :target, :arguments, :body
 
@@ -71,8 +71,16 @@ module Unparser
         node.type.equal?(:numblock)
       end
 
+      # NOTE: mutant fails on Ruby < 3.4
+      # mutant:disable
+      def itblock?
+        node.type.equal?(:itblock)
+      end
+
+      # NOTE: mutant fails on Ruby < 3.4
+      # mutant:disable
       def emit_block_arguments
-        return if numblock? || arguments.children.empty?
+        return if numblock? || itblock? || arguments.children.empty?
 
         ws
 

data/lib/unparser/emitter/dsym.rb

@@ -33,7 +33,7 @@ module Unparser
 
       def emit_begin_child(component)
         write('#{')
-        visit(unwrap_single_begin(component))
+        visit(Util.one(component.children)) if component.children.any?
         write('}')
       end
     end # DSym

data/lib/unparser/emitter/ensure.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Unparser
+  class Emitter
+    # Emitter for ensure nodes
+    class Ensure < self
+      handle :ensure
+
+    private
+
+      def dispatch
+        emit_ensure(node)
+      end
+    end # Ensure
+  end # Emitter
+end # Unparser

data/lib/unparser/emitter/flow_modifier.rb

@@ -21,7 +21,7 @@ module Unparser
 
         if children.one? && n_if?(children.first)
           ws
-          emitter(children.first).emit_ternary
+          emitter(Util.one(children)).emit_ternary
         else
           emit_arguments unless children.empty?
         end

data/lib/unparser/emitter/in_pattern.rb

@@ -16,7 +16,7 @@ module Unparser
 
         ws
 
-        visit(target)
+        dispatch_target(target)
 
         if unless_guard
           ws
@@ -31,6 +31,14 @@ module Unparser
           nl
         end
       end
+
+      def dispatch_target(target)
+        if n_array?(target)
+          writer_with(Writer::Array, node: target).emit_compact
+        else
+          visit(target)
+        end
+      end
     end # InPattern
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/kwbegin.rb

@@ -12,7 +12,7 @@ module Unparser
         write('begin')
 
         if children.one?
-          emit_body_ensure_rescue(children.first)
+          emit_body_ensure_rescue(Util.one(children))
         else
           indented do
             emit_multiple_body

data/lib/unparser/emitter/match_pattern.rb

@@ -14,7 +14,12 @@ module Unparser
       def dispatch
         visit(target)
         write(' => ')
-        visit(pattern)
+
+        if n_array?(pattern)
+          writer_with(Writer::Array, node: pattern).emit_compact
+        else
+          visit(pattern)
+        end
       end
     end # MatchPattern
   end # Emitter

data/lib/unparser/emitter/match_pattern_p.rb

@@ -13,7 +13,12 @@ module Unparser
       def dispatch
         visit(target)
         write(' in ')
-        visit(pattern)
+
+        if n_array?(pattern)
+          writer_with(Writer::Array, node: pattern).emit_compact
+        else
+          visit(pattern)
+        end
       end
     end # MatchPatternP
   end # Emitter

data/lib/unparser/emitter/mlhs.rb

@@ -6,10 +6,16 @@ module Unparser
     class MLHS < self
       handle :mlhs
 
-      NO_COMMA = %i[arg splat mlhs restarg].freeze
+      NO_COMMA = %i[arg splat restarg].freeze
 
       private_constant(*constants(false))
 
+      def dispatch_def
+        parentheses do
+          delimited(children)
+        end
+      end
+
     private
 
       def dispatch

data/lib/unparser/emitter/range.rb

@@ -25,9 +25,30 @@ module Unparser
     private
 
       def dispatch
-        visit(begin_node) if begin_node
+        visit_begin_node(begin_node)
         write(TOKENS.fetch(node.type))
-        visit(end_node) if end_node
+        visit_end_node(end_node)
+      end
+
+      def visit_begin_node(node)
+        return unless node
+
+        if n_array?(begin_node)
+          writer_with(Writer::Array, node: begin_node).emit_compact
+        else
+          visit(begin_node)
+        end
+      end
+
+      def visit_end_node(node)
+        return unless node
+
+        write(' ') if n_range?(node)
+        if n_array?(node)
+          writer_with(Writer::Array, node: node).emit_compact
+        else
+          visit(node)
+        end
       end
 
     end # Range

data/lib/unparser/emitter/xstr.rb

@@ -41,6 +41,8 @@ module Unparser
         children.each do |child|
           if n_begin?(child)
             emit_begin(child)
+          elsif n_gvar?(child)
+            emit_gvar(child)
           else
             emit_string(child)
           end
@@ -64,9 +66,14 @@ module Unparser
 
       def emit_begin(component)
         write('#{')
-        visit(unwrap_single_begin(component))
+        visit(Util.one(component.children)) if component.children.any?
         write('}')
       end
+
+      def emit_gvar(component)
+        write('#')
+        write(Util.one(component.children).to_s)
+      end
     end # XStr
   end # Emitter
 end # Unparser

data/lib/unparser/generation.rb

@@ -147,6 +147,7 @@ module Unparser
     def emit_body_inner(node)
       head, *tail = node.children
       emit_body_member(head)
+      write(';') if requires_explicit_statement_terminator?(head, tail)
 
       tail.each do |child|
         buffer.ensure_nl
@@ -154,9 +155,14 @@ module Unparser
         nl if EXTRA_NL.include?(child.type)
 
         emit_body_member(child)
+        write(';') if requires_explicit_statement_terminator?(child, tail)
       end
     end
 
+    def requires_explicit_statement_terminator?(node, nodes_group)
+      n_range?(node) && node.children.fetch(1).nil? && !node.eql?(nodes_group.fetch(-1))
+    end
+
     def emit_body_member(node)
       if n_rescue?(node)
         emit_rescue_postcontrol(node)

data/lib/unparser/node_helpers.rb

@@ -31,7 +31,16 @@ module Unparser
       node.type.equal?(type)
     end
 
+    def n_flipflop?(node)
+      n_iflipflop?(node) || n_eflipflop?(node)
+    end
+
+    def n_range?(node)
+      n_irange?(node) || n_erange?(node)
+    end
+
     %i[
+      and
       arg
       args
       array
@@ -41,19 +50,26 @@ module Unparser
       cbase
       const
       dstr
+      eflipflop
       empty_else
+      erange
       ensure
+      gvar
       hash
       hash_pattern
       if
+      iflipflop
       in_pattern
       int
+      irange
       kwarg
       kwargs
       kwsplat
       lambda
       lvar
       match_rest
+      mlhs
+      or
       pair
       rescue
       send
@@ -61,20 +77,13 @@ module Unparser
       splat
       str
       sym
-    ].each do |type|
+      xstr
+    ].to_set.each do |type|
       name = "n_#{type}?"
       define_method(name) do |node|
         n?(type, node)
       end
       private(name)
     end
-
-    def unwrap_single_begin(node)
-      if n_begin?(node) && node.children.one?
-        node.children.first
-      else
-        node
-      end
-    end
   end # NodeHelpers
 end # Unparser

data/lib/unparser/util.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Unparser
+  # Original code before vendoring and reduction from: https://github.com/mbj/mutant/blob/main/lib/mutant/util.rb
+  module Util
+    # Error raised by `Util.one` if size is not exactly one
+    SizeError = Class.new(IndexError)
+
+    # Return only element in array if it contains exactly one member
+    #
+    # @param array [Array]
+    #
+    # @return [Object] first entry
+    def self.one(array)
+      case array
+      in [value]
+        value
+      else
+        fail SizeError, "expected size to be exactly 1 but size was #{array.size}"
+      end
+    end
+  end
+end

data/lib/unparser/writer/array.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Unparser
+  module Writer
+    class Array
+      include Writer, Adamantium
+
+      MAP = {
+        dsym: '%I',
+        sym:  '%i',
+        dstr: '%W',
+        str:  '%w'
+      }.freeze
+      private_constant(*constants(false))
+
+      def emit_compact # rubocop:disable Metrics/AbcSize
+        children_generic_type = array_elements_generic_type
+
+        write(MAP.fetch(children_generic_type))
+
+        parentheses('[', ']') do
+          delimited(children, ' ') do |child|
+            if n_sym?(child) || n_str?(child)
+              write(Util.one(child.children).to_s)
+            else
+              write('#{')
+              emitter(Util.one(Util.one(child.children).children)).write_to_buffer
+              write('}')
+            end
+          end
+        end
+      end
+
+      private
+
+      def array_elements_generic_type
+        children_types = children.to_set(&:type)
+
+        if children_types == Set[:sym, :dsym]
+          :dsym
+        elsif children_types == Set[:str, :dstr]
+          :dstr
+        elsif children_types == Set[]
+          :sym
+        else
+          Util.one(children_types.to_a)
+        end
+      end
+    end # Array
+  end # Writer
+end # Unparser

data/lib/unparser/writer/binary.rb

@@ -39,7 +39,7 @@ module Unparser
           tANDOP: '&&'
         }.freeze
 
-      NEED_KEYWORD = %i[return break next].freeze
+      NEED_KEYWORD = %i[return break next match_pattern_p].freeze
 
       private_constant(*constants(false))
 
@@ -52,9 +52,13 @@ module Unparser
       end
 
       def dispatch
-        left_emitter.write_to_buffer
-        write(' ', MAP.fetch(effective_symbol), ' ')
-        visit(right)
+        if node.type.eql?(:and) && left.type.equal?(:or)
+          emit_with(KEYWORD_TOKENS)
+        else
+          left_emitter.write_to_buffer
+          write(' ', MAP.fetch(effective_symbol), ' ')
+          visit(right)
+        end
       end
 
     private

data/lib/unparser/writer/regexp.rb

@@ -55,6 +55,9 @@ module Unparser
             write('#{')
             node.children.each(&method(:visit))
             write('}')
+          elsif n_gvar?(node)
+            write('#')
+            write_regular(node.children.first.to_s)
           else
             write_regular(node.children.first)
           end

data/lib/unparser/writer/resbody.rb

@@ -14,8 +14,13 @@ module Unparser
       children :exception, :assignment, :body
 
       def emit_postcontrol
-        write(' rescue ')
-        visit(body)
+        if body
+          write(' rescue ')
+          visit(body)
+        else
+          nl
+          write('rescue')
+        end
       end
 
       def emit_regular
@@ -58,10 +63,10 @@ module Unparser
       end
 
       def write_index_assignment
-        receiver, index = assignment.children
+        receiver, *indexes = assignment.children
         visit(receiver)
         write('[')
-        visit(index) if index
+        delimited(indexes)
         write(']')
       end
     end # Resbody

data/lib/unparser/writer/rescue.rb

@@ -21,7 +21,7 @@ module Unparser
       end
 
       def emit_postcontrol
-        visit(body)
+        visit(body) if body
         writer_with(Resbody, node: rescue_body).emit_postcontrol
       end
 

data/lib/unparser/writer/send/unary.rb

@@ -12,13 +12,18 @@ module Unparser
 
         private_constant(*constants(false))
 
-        def dispatch
+        def dispatch # rubocop:disable Metrics/AbcSize
           name = selector
+          first_child = children.fetch(0)
 
-          write(MAP.fetch(name, name).to_s)
+          if n_flipflop?(first_child) || n_and?(first_child) || n_or?(first_child)
+            write 'not '
+          else
+            write(MAP.fetch(name, name).to_s)
 
-          if n_int?(receiver) && selector.equal?(:+@)
-            write('+')
+            if n_int?(receiver) && selector.equal?(:+@)
+              write('+')
+            end
           end
 
           visit(receiver)

data/lib/unparser/writer.rb

@@ -29,10 +29,9 @@ module Unparser
     # mutant:disable
     def round_trips?(source:)
       parser = Unparser.parser
-
-      local_variable_scope
-        .local_variables_for_node(node)
-        .each(&parser.static_env.public_method(:declare))
+      local_variable_scope.local_variables_for_node(node).each do |local_variable|
+        parser.declare_local_variable(local_variable)
+      end
 
       buffer = Buffer.new
       buffer.write_encoding(explicit_encoding) if explicit_encoding

data/lib/unparser.rb

@@ -3,7 +3,6 @@
 require 'diff/lcs'
 require 'diff/lcs/hunk'
 require 'optparse'
-require 'parser/current'
 require 'set'
 
 require 'unparser/equalizer'
@@ -18,18 +17,53 @@ require 'unparser/anima/attribute'
 require 'unparser/anima/error'
 
 # Library namespace
-module Unparser
+module Unparser # rubocop:disable Metrics/ModuleLength
   # Unparser specific AST builder defaulting to modern AST format
-  class Builder < Parser::Builders::Default
-    modernize
+  if Gem::Version.new(RUBY_VERSION) <= '3.4'
+    require 'parser/current'
+    class Builder < Parser::Builders::Default
+      modernize
 
-    def initialize
-      super
+      # mutant:disable
+      def initialize
+        super
 
-      self.emit_file_line_as_literals = false
+        self.emit_file_line_as_literals = false
+      end
+    end
+  else
+    require 'prism'
+    class Builder < Prism::Translation::Parser::Builder
+      modernize
+
+      # mutant:disable
+      def initialize
+        super
+
+        self.emit_file_line_as_literals = false
+      end
     end
   end
 
+  PARSER_CLASS =
+    if Gem::Version.new(RUBY_VERSION) <= '3.4'
+      Class.new(Parser::CurrentRuby) do
+        def declare_local_variable(local_variable)
+          static_env.declare(local_variable)
+        end
+      end
+    else
+      Class.new(Prism::Translation::Parser34) do
+        def declare_local_variable(local_variable)
+          (@local_variables ||= Set.new) << local_variable
+        end
+
+        def prism_options
+          super.merge(scopes: [@local_variables.to_a])
+        end
+      end
+    end
+
   EMPTY_STRING = ''.freeze
   EMPTY_ARRAY  = [].freeze
 
@@ -202,8 +236,9 @@ module Unparser
   # @return [Parser::Base]
   #
   # @api private
+  # mutant:disable
   def self.parser
-    Parser::CurrentRuby.new(Builder.new).tap do |parser|
+    PARSER_CLASS.new(Builder.new).tap do |parser|
       parser.diagnostics.tap do |diagnostics|
         diagnostics.all_errors_are_fatal = true
       end
@@ -250,6 +285,7 @@ require 'unparser/emitter/def'
 require 'unparser/emitter/defined'
 require 'unparser/emitter/dstr'
 require 'unparser/emitter/dsym'
+require 'unparser/emitter/ensure'
 require 'unparser/emitter/flipflop'
 require 'unparser/emitter/float'
 require 'unparser/emitter/flow_modifier'
@@ -294,6 +330,7 @@ require 'unparser/emitter/find_pattern'
 require 'unparser/emitter/match_pattern'
 require 'unparser/emitter/match_pattern_p'
 require 'unparser/writer'
+require 'unparser/writer/array'
 require 'unparser/writer/binary'
 require 'unparser/writer/dynamic_string'
 require 'unparser/writer/regexp'
@@ -307,6 +344,7 @@ require 'unparser/writer/send/unary'
 require 'unparser/node_details'
 require 'unparser/node_details/send'
 require 'unparser/cli'
+require 'unparser/util'
 
 require 'unparser/validation'
 # make it easy for zombie

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Markus Schirp
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -38,34 +37,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.0
+- !ruby/object:Gem::Dependency
+  name: prism
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: mutant
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +197,7 @@ files:
 - lib/unparser/emitter/defined.rb
 - lib/unparser/emitter/dstr.rb
 - lib/unparser/emitter/dsym.rb
+- lib/unparser/emitter/ensure.rb
 - lib/unparser/emitter/find_pattern.rb
 - lib/unparser/emitter/flipflop.rb
 - lib/unparser/emitter/float.rb
@@ -233,8 +247,10 @@ files:
 - lib/unparser/node_details.rb
 - lib/unparser/node_details/send.rb
 - lib/unparser/node_helpers.rb
+- lib/unparser/util.rb
 - lib/unparser/validation.rb
 - lib/unparser/writer.rb
+- lib/unparser/writer/array.rb
 - lib/unparser/writer/binary.rb
 - lib/unparser/writer/dynamic_string.rb
 - lib/unparser/writer/regexp.rb
@@ -251,11 +267,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/mbj/unparser/issues
-  changelog_uri: https://github.com/mbj/unparser/blob/master/Changelog.md
+  changelog_uri: https://github.com/mbj/unparser/blob/main/Changelog.md
   funding_uri: https://github.com/sponsors/mbj
   source_code_uri: https://github.com/mbj/unparser
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -270,8 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes
 test_files: []