unparser 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 824d898a010fcf41a3a7d243d3f6c30dc551751fccc8a7d592e73fe6685dab8c
-  data.tar.gz: ef5e5fdc7df12831465d4ed15d35da615ff10eafb342d2a32495c42d88c7b415
+  metadata.gz: 21e418840b351f5e697c472127300d7733ca1c20bdf4be321ae1832133447767
+  data.tar.gz: c130412892dcb6a1db4835c3ef9fa9738f2a181ede78ccca6a7a13336a348e8c
 SHA512:
-  metadata.gz: c902fd66c8d5195ba76c3f53d028112e41e4bff18e62d851e207949ea332d5c1e2a352a2eb478b626a6fee2c4d908303c595c94364c03539bb4aa8a72d53b64d
-  data.tar.gz: 647e6ac18916a4e2454cd1c018932da6c464598ac548d84da242d6b8d8b19c06a5ee430d9fa35338e3576bb860ac3acbde3814e6d891259db1506b9004c612cc
+  metadata.gz: 4a25a3e71df443024af556d20ca97f9a627874ee5857a4badfa2c7bd228159732fac0060715b198acc5648879c25baf8c0b10496f6cb0303fa41841cf06521ad
+  data.tar.gz: 8dec6ae089dbf574a7687177993da010f2569677217032e95079e007598c04e0acbb35d967667532331187d6ab25c81346c5073454dda7665e8864fc0e31e42a

data/lib/unparser.rb

@@ -117,21 +117,10 @@ module Unparser
     Parser::CurrentRuby.new(Builder.new).tap do |parser|
       parser.diagnostics.tap do |diagnostics|
         diagnostics.all_errors_are_fatal = true
-        diagnostics.consumer             = method(:consume_diagnostic)
       end
     end
   end
 
-  # Consume diagnostic
-  #
-  # @param [Parser::Diagnostic] diagnostic
-  #
-  # @return [undefined]
-  def self.consume_diagnostic(diagnostic)
-    Kernel.warn(diagnostic.render)
-  end
-  private_class_method :consume_diagnostic
-
   # Construct a parser buffer from string
   #
   # @param [String] source
@@ -209,6 +198,9 @@ require 'unparser/emitter/undef'
 require 'unparser/emitter/variable'
 require 'unparser/emitter/xstr'
 require 'unparser/emitter/yield'
+require 'unparser/emitter/kwargs'
+require 'unparser/emitter/pair'
+require 'unparser/emitter/match_pattern'
 require 'unparser/writer'
 require 'unparser/writer/binary'
 require 'unparser/writer/dynamic_string'

data/lib/unparser/emitter/hash.rb

@@ -4,10 +4,6 @@ module Unparser
   class Emitter
     # Emitter for Hash literals
     class Hash < self
-      BAREWORD = /\A[A-Za-z_][A-Za-z_0-9]*[?!]?\z/.freeze
-
-      private_constant(*constants(false))
-
       handle :hash
 
       def emit_last_argument_hash
@@ -41,34 +37,8 @@ module Unparser
       end
 
       def emit_hash_body
-        delimited(children, &method(:emit_hash_member))
-      end
-
-      def emit_hash_member(node)
-        if n_kwsplat?(node)
-          visit(node)
-        else
-          emit_pair(node)
-        end
+        delimited(children)
       end
-
-      def emit_pair(pair)
-        key, value = *pair.children
-
-        if colon?(key)
-          write(key.children.first.to_s, ': ')
-        else
-          visit(key)
-          write(' => ')
-        end
-
-        visit(value)
-      end
-
-      def colon?(key)
-        n_sym?(key) && BAREWORD.match?(key.children.first)
-      end
-
     end # Hash
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/kwargs.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Unparser
+  class Emitter
+    class Kwargs < self
+      handle :kwargs
+
+      def dispatch
+        delimited(children)
+      end
+    end # Kwargs
+  end # Emitter
+end # Unparser

data/lib/unparser/emitter/match_pattern.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Unparser
+  class Emitter
+    # Emitter for in pattern nodes
+    class MatchPattern < self
+
+      handle :match_pattern
+      handle :match_pattern_p
+
+      children :target, :pattern
+
+    private
+
+      def dispatch
+        visit(target)
+        write(' in ')
+        visit(pattern)
+      end
+    end # InPattern
+  end # Emitter
+end # Unparser

data/lib/unparser/emitter/pair.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Unparser
+  class Emitter
+    # Emitter for key value pairs in hash literals or kwargs
+    class Pair < self
+      BAREWORD = /\A[A-Za-z_][A-Za-z_0-9]*[?!]?\z/.freeze
+
+      private_constant(*constants(false))
+
+      handle :pair
+
+      children :key, :value
+
+    private
+
+      def dispatch
+        if colon?(key)
+          write(key.children.first.to_s, ': ')
+        else
+          visit(key)
+          write(' => ')
+        end
+
+        visit(value)
+      end
+
+      def colon?(key)
+        n_sym?(key) && BAREWORD.match?(key.children.first)
+      end
+    end
+  end
+end

data/lib/unparser/writer/dynamic_string.rb

@@ -42,7 +42,7 @@ module Unparser
     private
 
       def heredoc_header
-        need_squiggly? ? '<<~HEREDOC' : '<<-HEREDOC'
+        '<<-HEREDOC'
       end
 
       def heredoc?
@@ -55,11 +55,7 @@ module Unparser
 
       def emit_heredoc_body
         nl
-        if need_squiggly?
-          emit_squiggly_heredoc_body
-        else
-          emit_normal_heredoc_body
-        end
+        emit_normal_heredoc_body
       end
 
       def emit_heredoc_footer
@@ -119,10 +115,6 @@ module Unparser
         n_str?(last) && last.children.first[-1].eql?("\n")
       end
 
-      def need_squiggly?
-        children.any?(s(:str, ''))
-      end
-
       def emit_squiggly_heredoc_body
         buffer.indent
         children.each do |child|

data/lib/unparser/writer/send.rb

@@ -75,20 +75,7 @@ module Unparser
       end
 
       def emit_normal_arguments
-        parentheses do
-          arguments.each_with_index do |node, index|
-            write(', ') unless index.zero?
-            emit_argument(node, index.succ.equal?(arguments.length))
-          end
-        end
-      end
-
-      def emit_argument(argument, last)
-        if n_hash?(argument) && last
-          writer_with(Emitter::Hash, argument).emit_last_argument_hash
-        else
-          visit(argument)
-        end
+        parentheses { delimited(arguments) }
       end
 
       def emit_heredoc_reminder(argument)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2020-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_type
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.5
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.5
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: procto
   requirement: !ruby/object:Gem::Requirement
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.19
+        version: 0.10.21
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.19
+        version: 0.10.21
 - !ruby/object:Gem::Dependency
   name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.19
+        version: 0.10.21
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.19
+        version: 0.10.21
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -212,28 +212,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
 description: Generate equivalent source for parser gem AST nodes
 email: mbj@schirp-dso.com
 executables:
@@ -285,17 +285,20 @@ files:
 - lib/unparser/emitter/in_match.rb
 - lib/unparser/emitter/in_pattern.rb
 - lib/unparser/emitter/index.rb
+- lib/unparser/emitter/kwargs.rb
 - lib/unparser/emitter/kwbegin.rb
 - lib/unparser/emitter/lambda.rb
 - lib/unparser/emitter/masgn.rb
 - lib/unparser/emitter/match.rb
 - lib/unparser/emitter/match_alt.rb
 - lib/unparser/emitter/match_as.rb
+- lib/unparser/emitter/match_pattern.rb
 - lib/unparser/emitter/match_rest.rb
 - lib/unparser/emitter/match_var.rb
 - lib/unparser/emitter/mlhs.rb
 - lib/unparser/emitter/module.rb
 - lib/unparser/emitter/op_assign.rb
+- lib/unparser/emitter/pair.rb
 - lib/unparser/emitter/pin.rb
 - lib/unparser/emitter/primitive.rb
 - lib/unparser/emitter/range.rb
@@ -331,7 +334,10 @@ files:
 homepage: http://github.com/mbj/unparser
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/mbj/unparser/issues
+  changelog_uri: https://github.com/mbj/unparser/blob/master/Changelog.md
+  funding_uri: https://github.com/sponsors/mbj
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -347,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes