unparser 0.6.2 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eda3912beee61a5384b60d5011749c10c7c46df2ad76d34c26cbb2bf2cc3fae
-  data.tar.gz: 2721620e86f7ff2d5be383551ef9a9c6b961f3a2695ce3eae84e56246a658129
+  metadata.gz: bd425c8abea3ba512e8652c7f913b5ed09b5254fa868358f000f3af1fcd3ed82
+  data.tar.gz: caf2e58c2f862bd94f63d3290876b61620cf100a22c88a07d3916d87f253c0c0
 SHA512:
-  metadata.gz: c6a25eebeab70213690d84e50e3a161950e2a025d88c693094387299108ce191d671078c8aa03ab059f82aaae0b6d21ced684830aa85f8a4696772a88a01273c
-  data.tar.gz: a5252a53a3dd3cb1f77d99d12a500f1fb22a191ffa59d9cf15c2cc65daa21fb86805574466c174111914b805346c2fc054850d44b1f8b27da70d5995e8236bcf
+  metadata.gz: f45782eed90b778fbde30cdbd90f388a4b9f649e0080c26618e9243014618774d3afd9eb2076c7a47d0a0d43e137d1940382c85d0dea0915afa232f87d9e950d
+  data.tar.gz: 2fda013558e05453f9ea1540b64bb51a9bd9269f6166395bd92f775aed3523abc5878b1c92c5ba4f0352842b6b4fb532f317f8a5d54aa108822f94dfcb7d9e9a

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.6
+* Only support for Ruby >= 2.7
 
 Notable Users:
 

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/block.rb

@@ -15,8 +15,8 @@ module Unparser
         emit_target
         ws
         write_open
-        target_writer.emit_heredoc_reminders if n_send?(target)
         emit_block_arguments unless n_lambda?(target)
+        target_writer.emit_heredoc_reminders if n_send?(target)
         emit_optional_body_ensure_rescue(body)
         write_close
       end

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/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.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.2
+  version: 0.6.5
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2022-04-18 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.11.1
+        version: 0.11.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.4
 - !ruby/object:Gem::Dependency
   name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.4
 - !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,7 +259,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="