unparser 0.6.0 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a585e06cf743ca1901a601efa2fb7f178528307f89a6bea190df19014e3abf3
-  data.tar.gz: dc1980af7f00fa4b54da6fc91cc740857588bf5d1bf30f6c362be995a86a2d83
+  metadata.gz: bb5014c1ad5b93a94374f4f79c60735d626e7b678c2a0521c15d4aeef63bf4a4
+  data.tar.gz: c932ade7d867e5dafc58f538bef903c723717c03e5276cd6e00bb4b6ec1205e9
 SHA512:
-  metadata.gz: da5524a1621bd1202f943c201b79b425ae4c203a9642a633b2a8a66fc85a0b8d3a250464c18432b791ce7e656c5b1a3940bc93d004f0bc18aa5413f931fc74bf
-  data.tar.gz: ab9cd266e002fcf85a12e1051a6b6a9fb9f47479ac2d7d883abcb99306d09ea6a196cb5d7de98a8c4f8a6635a78284e14e689cc2786f0a994eb504db0a0545ee
+  metadata.gz: ba212ad02df6e81cebc47f085d0432c5a05f44a63c5e9869f356cbd78a52805fc9ef9b8ffe331e0c802399e6c450f1a2ecd6eea49d01fb1ca6b7c750200d09e1
+  data.tar.gz: 5fa98dd676c1f2ebd2fa4006920fb8df12056178df169728d3bb239b3b9152ce0b6ba8f8cce4359b3fc4ee935e1aa79f079d0dd72953e2f24b75b5612e00f553

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 >= 2.5
+* Only support for Ruby >= 2.6
 
 Notable Users:
 
@@ -110,7 +110,7 @@ If you need to generate Ruby Syntax outside of this band feel free to contact me
 Testing:
 --------
 
-Unparser currently successfully round trips almost all ruby code around. Using MRI-2.5.x.
+Unparser currently successfully round trips almost all ruby code around. Using Ruby >= 2.6.
 If there is a non round trippable example that is NOT subjected to known [Limitations](#limitations).
 please report a bug.
 

data/lib/unparser/adamantium/method_builder.rb

@@ -101,7 +101,8 @@ module Unparser
       def visibility
         if    @descendant.private_method_defined?(@method_name)   then :private
         elsif @descendant.protected_method_defined?(@method_name) then :protected
-        else                                                           :public
+        else
+          :public
         end
       end
 

data/lib/unparser/buffer.rb

@@ -114,9 +114,9 @@ module Unparser
     # @api private
     #
     def capture_content
-      size_before = @content.size
+      size_before = content.size
       yield
-      @content[size_before..-1]
+      content[size_before..]
     end
 
     # Write raw fragment to buffer

data/lib/unparser/cli.rb

@@ -76,6 +76,7 @@ module Unparser
       @targets = []
 
       @fail_fast  = false
+      @start_with = nil
       @success    = true
       @validation = :validation
       @verbose    = false

data/lib/unparser/emitter/argument.rb

@@ -127,7 +127,7 @@ module Unparser
 
       def dispatch
         write('&')
-        visit(name)
+        visit(name) if name
       end
 
     end # BlockPass

data/lib/unparser/emitter/find_pattern.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Unparser
+  class Emitter
+    # Emitter for in pattern nodes
+    class FindPattern < self
+      handle :find_pattern
+
+    private
+
+      def dispatch
+        write('[')
+        delimited(children)
+        write(']')
+      end
+    end # FindPattern
+  end # Emitter
+end # Unparser

data/lib/unparser/emitter/hash_pattern.rb

@@ -60,7 +60,7 @@ module Unparser
       end
 
       def write_symbol_body(symbol)
-        write(symbol.inspect[1..-1])
+        write(symbol.inspect[1..])
       end
     end # Pin
   end # Emitter

data/lib/unparser/emitter/match_pattern.rb

@@ -6,17 +6,25 @@ module Unparser
     class MatchPattern < self
 
       handle :match_pattern
-      handle :match_pattern_p
 
       children :target, :pattern
 
+      # Modern ast format emits `match_pattern`
+      # node on single line pre 3.0, but 3.0+ uses `match_pattern_p`
+      SYMBOL =
+        if RUBY_VERSION < '3.0'
+          ' in '
+        else
+          ' => '
+        end
+
     private
 
       def dispatch
         visit(target)
-        write(' in ')
+        write(SYMBOL)
         visit(pattern)
       end
-    end # InPattern
+    end # MatchPattern
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/match_pattern_p.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Unparser
+  class Emitter
+    class MatchPatternP < self
+
+      handle :match_pattern_p
+
+      children :target, :pattern
+
+    private
+
+      def dispatch
+        visit(target)
+        write(' in ')
+        visit(pattern)
+      end
+    end # MatchPatternP
+  end # Emitter
+end # Unparser

data/lib/unparser/emitter/match_rest.rb

@@ -4,8 +4,15 @@ module Unparser
   class Emitter
     # Emiter for match rest nodes
     class MatchRest < self
+      handle :match_rest
+
       children :match_var
 
+      def dispatch
+        write('*')
+        visit(match_var) if match_var
+      end
+
       def emit_array_pattern
         write('*')
         emit_match_var

data/lib/unparser/node_details/send.rb

@@ -19,7 +19,10 @@ module Unparser
       end
 
       def binary_syntax_allowed?
-        selector_binary_operator? && arguments.one? && !n_splat?(arguments.first)
+        selector_binary_operator?        \
+          && arguments.one?              \
+          && !n_splat?(arguments.first)  \
+          && !n_kwargs?(arguments.first)
       end
 
       def selector_unary_operator?
@@ -48,7 +51,7 @@ module Unparser
       memoize :assignment?
 
       def arguments
-        children[2..-1]
+        children[2..]
       end
       memoize :arguments
 

data/lib/unparser/node_helpers.rb

@@ -36,18 +36,20 @@ module Unparser
       args
       array
       array_pattern
-      empty_else
       begin
       block
       cbase
       const
       dstr
+      empty_else
       ensure
       hash
       hash_pattern
       if
       in_pattern
       int
+      kwarg
+      kwargs
       kwsplat
       lambda
       match_rest

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

@@ -17,7 +17,7 @@ module Unparser
 
           write(MAP.fetch(name, name).to_s)
 
-          if n_int?(receiver) && selector.equal?(:'+@')
+          if n_int?(receiver) && selector.equal?(:+@)
             write('+')
           end
 

data/lib/unparser/writer/send.rb

@@ -6,8 +6,8 @@ module Unparser
     class Send
       include Writer, Adamantium, Constants, Generation
 
-      INDEX_ASSIGN    = :'[]='
-      INDEX_REFERENCE = :'[]'
+      INDEX_ASSIGN    = :[]=
+      INDEX_REFERENCE = :[]
 
       OPERATORS = {
         csend: '&.',
@@ -45,7 +45,7 @@ module Unparser
       def effective_writer_class
         if details.binary_syntax_allowed?
           Binary
-        elsif details.selector_unary_operator? && n_send?(node)
+        elsif details.selector_unary_operator? && n_send?(node) && arguments.empty?
           Unary
         elsif write_as_attribute_assignment?
           AttributeAssignment

data/lib/unparser.rb

@@ -218,7 +218,9 @@ require 'unparser/emitter/xstr'
 require 'unparser/emitter/yield'
 require 'unparser/emitter/kwargs'
 require 'unparser/emitter/pair'
+require 'unparser/emitter/find_pattern'
 require 'unparser/emitter/match_pattern'
+require 'unparser/emitter/match_pattern_p'
 require 'unparser/writer'
 require 'unparser/writer/binary'
 require 'unparser/writer/dynamic_string'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.4
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-16 00:00:00.000000000 Z
+date: 2022-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: mutant
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.25
+        version: 0.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.25
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.25
+        version: 0.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.25
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +184,7 @@ files:
 - lib/unparser/emitter/defined.rb
 - lib/unparser/emitter/dstr.rb
 - lib/unparser/emitter/dsym.rb
+- lib/unparser/emitter/find_pattern.rb
 - lib/unparser/emitter/flipflop.rb
 - lib/unparser/emitter/float.rb
 - lib/unparser/emitter/flow_modifier.rb
@@ -203,6 +204,7 @@ files:
 - lib/unparser/emitter/match_alt.rb
 - lib/unparser/emitter/match_as.rb
 - lib/unparser/emitter/match_pattern.rb
+- lib/unparser/emitter/match_pattern_p.rb
 - lib/unparser/emitter/match_rest.rb
 - lib/unparser/emitter/match_var.rb
 - lib/unparser/emitter/mlhs.rb
@@ -257,15 +259,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.2
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes