unparser 0.5.0 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c326e601dd3bcfdc7363e456e07d1b15ef323ae095e39026e094205de5206119
-  data.tar.gz: a839f69163fab291b893a7e0702771848fc4632161414dff4b4528ad12568573
+  metadata.gz: 824d898a010fcf41a3a7d243d3f6c30dc551751fccc8a7d592e73fe6685dab8c
+  data.tar.gz: ef5e5fdc7df12831465d4ed15d35da615ff10eafb342d2a32495c42d88c7b415
 SHA512:
-  metadata.gz: b6821013d903d32988111efbea734cc1daaeb02d5fc4b3073c215365f365fd86d52a40c4b495175610d30c30a467670ea2c37357acbb8191623940673119cfae
-  data.tar.gz: 924afece12fe65ab3c4783420ca6ce200db08249830eb0a0cdd16b69ddb05f7377dc0900e832abd0957c97b0d4fe259eaa0c320c67e714d9daeed033575bd235
+  metadata.gz: c902fd66c8d5195ba76c3f53d028112e41e4bff18e62d851e207949ea332d5c1e2a352a2eb478b626a6fee2c4d908303c595c94364c03539bb4aa8a72d53b64d
+  data.tar.gz: 647e6ac18916a4e2454cd1c018932da6c464598ac548d84da242d6b8d8b19c06a5ee430d9fa35338e3576bb860ac3acbde3814e6d891259db1506b9004c612cc

data/README.md

@@ -4,7 +4,7 @@ unparser
 ![CI](https://github.com/mbj/unparser/workflows/CI/badge.svg)
 [![Gem Version](https://img.shields.io/gem/v/unparser.svg)](https://rubygems.org/gems/unparser)
 
-Generate equivalent source for ASTs from whitequarks [parser](https://github.com/whitequark/parser).
+Generate equivalent source for ASTs from [parser](https://github.com/whitequark/parser).
 
 The following constraints apply:
 
@@ -12,8 +12,13 @@ The following constraints apply:
 * Only support for the [modern AST](https://github.com/whitequark/parser/#usage) format
 * Only support for Ruby >= 2.5
 
-It serves well for [mutant](https://github.com/mbj/mutant) mutators and the in-memory vendoring for self hosting,
-and other tooling.
+Notable Users:
+
+* [mutant](https://github.com/mbj/mutant) - Code review engine via mutation testing.
+* [ruby-next](https://github.com/ruby-next/ruby-next) - Ruby Syntax Backports.
+* May other [reverse-dependencies](https://rubygems.org/gems/unparser/reverse_dependencies).
+
+(if you want your tool to be mentioned here please PR the addition with a TLDR of your use case).
 
 Public API:
 -----------
@@ -86,12 +91,22 @@ RUBY
 
 generated = Unparser.unparse(node) # ["foo", "bar"], NOT %w[foo bar] !
 
-code == generated                            # false, not identical code
+code == generated                 # false, not identical code
 Unparser.parse(generated) == node # true, but identical AST
 ```
 
 Summary: unparser does not reproduce your source! It produces equivalent source.
 
+Ruby Versions:
+--------------
+
+Unparsers primay reason for existance is mutant and its
+supported [Ruby-Versions](https://github.com/mbj/mutant#ruby-versions).
+
+Basically: All non EOL MRI releases.
+
+If you need to generate Ruby Syntax outside of this band feel free to contact me (email in gemspec).
+
 Testing:
 --------
 

data/lib/unparser.rb

@@ -50,6 +50,23 @@ module Unparser
     end.content
   end
 
+  # Unparse with validation
+  #
+  # @param [Parser::AST::Node, nil] node
+  # @param [Array] comment_array
+  #
+  # @return [Either<Validation,String>]
+  def self.unparse_validate(node, comment_array = [])
+    generated = unparse(node, comment_array)
+    validation = Validation.from_string(generated)
+
+    if validation.success?
+      MPrelude::Either::Right.new(generated)
+    else
+      MPrelude::Either::Left.new(validation)
+    end
+  end
+
   # Unparse capturing errors
   #
   # This is mostly useful for writing testing tools against unparser.

data/lib/unparser/emitter/flow_modifier.rb

@@ -19,8 +19,11 @@ module Unparser
       def dispatch
         write(MAP.fetch(node.type))
 
-        unless children.empty?
-          emit_arguments
+        if children.one? && n_if?(children.first)
+          ws
+          emitter(children.first).emit_ternary
+        else
+          emit_arguments unless children.empty?
         end
       end
 

data/lib/unparser/emitter/if.rb

@@ -8,6 +8,14 @@ module Unparser
 
       children :condition, :if_branch, :else_branch
 
+      def emit_ternary
+        visit(condition)
+        write(' ? ')
+        visit(if_branch)
+        write(' : ')
+        visit(else_branch)
+      end
+
     private
 
       def dispatch

data/lib/unparser/emitter/in_pattern.rb

@@ -27,6 +27,8 @@ module Unparser
           ws
           write('then')
           emit_body(branch)
+        else
+          nl
         end
       end
     end # InPattern

data/lib/unparser/emitter/splat.rb

@@ -22,12 +22,22 @@ module Unparser
 
       children :subject
 
+      def emit_mlhs
+        write('*')
+        subject_emitter.emit_mlhs if subject
+      end
+
     private
 
       def dispatch
         write('*')
-        visit(subject) if subject
+        subject_emitter.write_to_buffer
+      end
+
+      def subject_emitter
+        emitter(subject)
       end
+      memoize :subject_emitter
     end
   end
 end # Unparser

data/lib/unparser/generation.rb

@@ -204,7 +204,9 @@ module Unparser
     end
 
     def emit_rescue_postcontrol(node)
-      writer_with(Writer::Rescue, node).emit_postcontrol
+      writer = writer_with(Writer::Rescue, node)
+      writer.emit_postcontrol
+      writer.emit_heredoc_reminders
     end
 
     def emit_rescue_regular(node)

data/lib/unparser/node_helpers.rb

@@ -45,6 +45,7 @@ module Unparser
       ensure
       hash
       hash_pattern
+      if
       in_pattern
       int
       kwsplat

data/lib/unparser/validation.rb

@@ -71,6 +71,27 @@ module Unparser
       )
     end
 
+    # Create validator from node
+    #
+    # @param [Parser::AST::Node] original_node
+    #
+    # @return [Validator]
+    def self.from_node(original_node)
+      generated_source = Unparser.unparse_either(original_node)
+
+      generated_node = generated_source
+        .lmap(&method(:const_unit))
+        .bind(&Unparser.public_method(:parse_either))
+
+      new(
+        identification:   '(string)',
+        original_source:  generated_source,
+        original_node:    MPrelude::Either::Right.new(original_node),
+        generated_source: generated_source,
+        generated_node:   generated_node
+      )
+    end
+
     # Create validator from file
     #
     # @param [Pathname] path

data/lib/unparser/writer/dynamic_string.rb

@@ -20,7 +20,7 @@ module Unparser
         ]
       )
 
-      FLAT_INTERPOLATION = %i[ivar cvar gvar].to_set.freeze
+      FLAT_INTERPOLATION = %i[ivar cvar gvar nth_ref].to_set.freeze
 
       private_constant(*constants(false))
 
@@ -46,7 +46,7 @@ module Unparser
       end
 
       def heredoc?
-        children.empty? || (nl_last_child? && heredoc_pattern?)
+        !children.empty? && (nl_last_child? && heredoc_pattern?)
       end
 
       def emit_heredoc_header
@@ -169,8 +169,12 @@ module Unparser
       end
 
       def emit_dstr
-        segments.each_with_index do |children, index|
-          emit_segment(children, index)
+        if children.empty?
+          write('%()')
+        else
+          segments.each_with_index do |children, index|
+            emit_segment(children, index)
+          end
         end
       end
 

data/lib/unparser/writer/rescue.rb

@@ -20,6 +20,10 @@ module Unparser
         end
       end
 
+      def emit_heredoc_reminders
+        emitter(body).emit_heredoc_reminders
+      end
+
       def emit_postcontrol
         visit(body)
         writer_with(Resbody, rescue_body).emit_postcontrol

data/lib/unparser/writer/send.rb

@@ -45,7 +45,7 @@ module Unparser
       def effective_writer_class
         if details.binary_syntax_allowed?
           Binary
-        elsif details.selector_unary_operator?
+        elsif details.selector_unary_operator? && n_send?(node)
           Unary
         elsif write_as_attribute_assignment?
           AttributeAssignment

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.5
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2020-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_type
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.13
+        version: 0.10.19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.13
+        version: 0.10.19
 - !ruby/object:Gem::Dependency
   name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.13
+        version: 0.10.19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.13
+        version: 0.10.19
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -198,28 +198,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.92.0
+        version: 1.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.92.0
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
@@ -340,14 +340,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes