unparser 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce1de83bf10221446d1c5f7a5925dfd3df7022d51342678b5fd9eb0f2f1fbcce
-  data.tar.gz: '083da9ef8026a9afd957b3585e8915f379c126745f8c7863ae0c896258cd31db'
+  metadata.gz: c326e601dd3bcfdc7363e456e07d1b15ef323ae095e39026e094205de5206119
+  data.tar.gz: a839f69163fab291b893a7e0702771848fc4632161414dff4b4528ad12568573
 SHA512:
-  metadata.gz: dafb7bb7320e6b238e52f92f5e31257f53309b276c4693238550459a1c4bb5d8c16ee616d2a5bc8262254c7796705b63ef1e18f0d3b59f8db8423460e0119371
-  data.tar.gz: 6af30e50074a3ed71557a7bb8f078bf6509bcf2adf8c5ceaf641a1e862a39ed021da672a9bcb29d8e2925b7769f9152a32050eb6adef52fb7b7933bded06ac0b
+  metadata.gz: b6821013d903d32988111efbea734cc1daaeb02d5fc4b3073c215365f365fd86d52a40c4b495175610d30c30a467670ea2c37357acbb8191623940673119cfae
+  data.tar.gz: 924afece12fe65ab3c4783420ca6ce200db08249830eb0a0cdd16b69ddb05f7377dc0900e832abd0957c97b0d4fe259eaa0c320c67e714d9daeed033575bd235

data/README.md

@@ -1,9 +1,7 @@
 unparser
 ========
 
-[![Build Status](https://secure.travis-ci.org/mbj/unparser.png?branch=master)](http://travis-ci.org/mbj/unparser)
-[![Dependency Status](https://gemnasium.com/mbj/unparser.png)](https://gemnasium.com/mbj/unparser)
-[![Code Climate](https://codeclimate.com/github/mbj/unparser.png)](https://codeclimate.com/github/mbj/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).

data/bin/unparser

@@ -5,6 +5,6 @@ trap('INT') do |status|
   exit! 128 + status
 end
 
-require 'unparser/cli'
+require 'unparser'
 
 exit Unparser::CLI.run(ARGV)

data/lib/unparser.rb

@@ -1,16 +1,27 @@
 # frozen_string_literal: true
 
-require 'set'
 require 'abstract_type'
-require 'procto'
+require 'anima'
 require 'concord'
+require 'diff/lcs'
+require 'diff/lcs/hunk'
+require 'mprelude'
+require 'optparse'
 require 'parser/current'
+require 'procto'
+require 'set'
 
 # Library namespace
 module Unparser
   # Unparser specific AST builder defaulting to modern AST format
   class Builder < Parser::Builders::Default
     modernize
+
+    def initialize
+      super
+
+      self.emit_file_line_as_literals = false
+    end
   end
 
   EMPTY_STRING = ''.freeze
@@ -28,23 +39,49 @@ module Unparser
   # @api private
   #
   def self.unparse(node, comment_array = [])
-    node = Preprocessor.run(node)
-    buffer = Buffer.new
-    comments = Comments.new(comment_array)
-    root = Emitter::Root.new(Parser::AST::Node.new(:root, [node]), buffer, comments)
-    Emitter.emitter(node, root).write_to_buffer
-    buffer.content
+    return '' if node.nil?
+
+    Buffer.new.tap do |buffer|
+      Emitter::Root.new(
+        buffer,
+        node,
+        Comments.new(comment_array)
+      ).write_to_buffer
+    end.content
+  end
+
+  # Unparse capturing errors
+  #
+  # This is mostly useful for writing testing tools against unparser.
+  #
+  # @param [Parser::AST::Node, nil] node
+  #
+  # @return [Either<Exception, String>]
+  def self.unparse_either(node)
+    MPrelude::Either
+      .wrap_error(Exception) { unparse(node) }
   end
 
   # Parse string into AST
   #
   # @param [String] source
   #
-  # @return [Parser::AST::Node]
+  # @return [Parser::AST::Node, nil]
   def self.parse(source)
     parser.parse(buffer(source))
   end
 
+  # Parse string into either syntax error or AST
+  #
+  # @param [String] source
+  #
+  # @return [MPrelude::Either<Parser::SyntaxError, (Parser::ASTNode, nil)>]
+  def self.parse_either(source)
+    MPrelude::Either.wrap_error(Parser::SyntaxError) do
+      parser.parse(buffer(source))
+    end
+  end
+
   # Parse string into AST, with comments
   #
   # @param [String] source
@@ -59,8 +96,6 @@ module Unparser
   # @return [Parser::Base]
   #
   # @api private
-  #
-  # ignore :reek:NestedIterators
   def self.parser
     Parser::CurrentRuby.new(Builder.new).tap do |parser|
       parser.diagnostics.tap do |diagnostics|
@@ -85,72 +120,92 @@ module Unparser
   # @param [String] source
   #
   # @return [Parser::Source::Buffer]
-  def self.buffer(source)
-    Parser::Source::Buffer.new('(string)').tap do |buffer|
-      buffer.source = source
-    end
+  def self.buffer(source, identification = '(string)')
+    Parser::Source::Buffer.new(identification, source: source)
   end
 end # Unparser
 
-require 'unparser/buffer'
 require 'unparser/node_helpers'
-require 'unparser/preprocessor'
+require 'unparser/ast'
+require 'unparser/ast/local_variable_scope'
+require 'unparser/buffer'
+require 'unparser/generation'
+require 'unparser/color'
 require 'unparser/comments'
 require 'unparser/constants'
+require 'unparser/diff'
 require 'unparser/dsl'
-require 'unparser/ast'
-require 'unparser/ast/local_variable_scope'
 require 'unparser/emitter'
-require 'unparser/emitter/literal'
-require 'unparser/emitter/literal/primitive'
-require 'unparser/emitter/literal/singleton'
-require 'unparser/emitter/literal/dynamic'
-require 'unparser/emitter/literal/regexp'
-require 'unparser/emitter/literal/array'
-require 'unparser/emitter/literal/hash'
-require 'unparser/emitter/literal/range'
-require 'unparser/emitter/literal/dynamic_body'
-require 'unparser/emitter/literal/execute_string'
-require 'unparser/emitter/meta'
-require 'unparser/emitter/send'
-require 'unparser/emitter/send/unary'
-require 'unparser/emitter/send/binary'
-require 'unparser/emitter/send/regular'
-require 'unparser/emitter/send/conditional'
-require 'unparser/emitter/send/attribute_assignment'
-require 'unparser/emitter/block'
-require 'unparser/emitter/assignment'
-require 'unparser/emitter/variable'
-require 'unparser/emitter/splat'
-require 'unparser/emitter/cbase'
+require 'unparser/emitter/alias'
+require 'unparser/emitter/args'
 require 'unparser/emitter/argument'
+require 'unparser/emitter/array'
+require 'unparser/emitter/array_pattern'
+require 'unparser/emitter/assignment'
 require 'unparser/emitter/begin'
-require 'unparser/emitter/flow_modifier'
-require 'unparser/emitter/undef'
-require 'unparser/emitter/def'
+require 'unparser/emitter/binary'
+require 'unparser/emitter/block'
+require 'unparser/emitter/case'
+require 'unparser/emitter/case_guard'
+require 'unparser/emitter/case_match'
+require 'unparser/emitter/cbase'
 require 'unparser/emitter/class'
-require 'unparser/emitter/module'
-require 'unparser/emitter/op_assign'
+require 'unparser/emitter/const_pattern'
+require 'unparser/emitter/def'
 require 'unparser/emitter/defined'
+require 'unparser/emitter/dstr'
+require 'unparser/emitter/dsym'
+require 'unparser/emitter/flipflop'
+require 'unparser/emitter/float'
+require 'unparser/emitter/flow_modifier'
+require 'unparser/emitter/for'
+require 'unparser/emitter/hash'
+require 'unparser/emitter/hash_pattern'
 require 'unparser/emitter/hookexe'
-require 'unparser/emitter/super'
-require 'unparser/emitter/retry'
-require 'unparser/emitter/redo'
 require 'unparser/emitter/if'
-require 'unparser/emitter/alias'
-require 'unparser/emitter/yield'
-require 'unparser/emitter/binary'
-require 'unparser/emitter/case'
-require 'unparser/emitter/for'
-require 'unparser/emitter/repetition'
-require 'unparser/emitter/root'
-require 'unparser/emitter/match'
-require 'unparser/emitter/empty'
-require 'unparser/emitter/flipflop'
-require 'unparser/emitter/rescue'
-require 'unparser/emitter/resbody'
-require 'unparser/emitter/ensure'
+require 'unparser/emitter/in_match'
+require 'unparser/emitter/in_pattern'
 require 'unparser/emitter/index'
+require 'unparser/emitter/kwbegin'
 require 'unparser/emitter/lambda'
+require 'unparser/emitter/masgn'
+require 'unparser/emitter/match'
+require 'unparser/emitter/match_alt'
+require 'unparser/emitter/match_as'
+require 'unparser/emitter/match_rest'
+require 'unparser/emitter/match_var'
+require 'unparser/emitter/mlhs'
+require 'unparser/emitter/module'
+require 'unparser/emitter/op_assign'
+require 'unparser/emitter/pin'
+require 'unparser/emitter/primitive'
+require 'unparser/emitter/range'
+require 'unparser/emitter/regexp'
+require 'unparser/emitter/repetition'
+require 'unparser/emitter/rescue'
+require 'unparser/emitter/root'
+require 'unparser/emitter/send'
+require 'unparser/emitter/simple'
+require 'unparser/emitter/splat'
+require 'unparser/emitter/super'
+require 'unparser/emitter/undef'
+require 'unparser/emitter/variable'
+require 'unparser/emitter/xstr'
+require 'unparser/emitter/yield'
+require 'unparser/writer'
+require 'unparser/writer/binary'
+require 'unparser/writer/dynamic_string'
+require 'unparser/writer/resbody'
+require 'unparser/writer/rescue'
+require 'unparser/writer/send'
+require 'unparser/writer/send/attribute_assignment'
+require 'unparser/writer/send/binary'
+require 'unparser/writer/send/regular'
+require 'unparser/writer/send/unary'
+require 'unparser/node_details'
+require 'unparser/node_details/send'
+require 'unparser/cli'
+
+require 'unparser/validation'
 # make it easy for zombie
 require 'unparser/finalize'

data/lib/unparser/ast.rb

@@ -2,7 +2,6 @@
 
 module Unparser
   # Namespace for AST processing tools
-  # :reek:TooManyConstants
   module AST
 
     FIRST_CHILD = ->(node) { node.children.first }.freeze
@@ -50,7 +49,7 @@ module Unparser
 
     # Return local variables that get assigned in scope
     #
-    # @param [Parser::AST::Node]
+    # @param [Parser::AST::Node] node
     #
     # @return [Set<Symbol>]
     #

data/lib/unparser/ast/local_variable_scope.rb

@@ -56,40 +56,27 @@ module Unparser
 
       # Test if local variables where first assigned in body and read by conditional
       #
-      # @param [Parser::AST::Node] conditional
       # @param [Parser::AST::Node] body
+      # @param [Parser::AST::Node] condition
       #
       # @api private
       #
-      def first_assignment_in_body_and_used_in_condition?(body, condition)
-        condition_reads = AST.local_variable_reads(condition)
+      def first_assignment_in?(left, right)
+        condition_reads = AST.local_variable_reads(right)
 
-        candidates = AST.local_variable_assignments(body).select do |node|
-          name = node.children.first
-          condition_reads.include?(name)
+        candidates = AST.local_variable_assignments(left).select do |node|
+          condition_reads.include?(node.children.first)
         end
 
-        candidates.any? do |node|
-          first_assignment?(node)
-        end
+        candidates.any?(&public_method(:first_assignment?))
       end
 
     private
 
-      # Match node
-      #
-      # @param [Parser::AST::Node] node
-      #   if block given
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
-      def match(neddle)
+      def match(needle)
         @items.each do |node, current, before|
-          return yield(current, before) if node.equal?(neddle)
+          return yield(current, before) if node.equal?(needle)
         end
-        false
       end
 
     end # LocalVariableScope
@@ -137,25 +124,10 @@ module Unparser
 
     private
 
-      # Return current set of local variables
-      #
-      # @return [Set<Symbol>]
-      #
-      # @api private
-      #
       def current
         @stack.last
       end
 
-      # Visit node and record local variable state
-      #
-      # @param [Parser::AST::Node]
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      # ignore :reek:LongYieldList
       def visit(node, &block)
         before = current.dup
         enter(node)
@@ -166,75 +138,33 @@ module Unparser
         leave(node)
       end
 
-      # Record local variable state
-      #
-      # @param [Parser::AST::Node]
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def enter(node)
         case node.type
         when *RESET_NODES
           push_reset
-        when *ASSIGN_NODES
+        when ASSIGN_NODES
           define(node.children.first)
         when *INHERIT_NODES
           push_inherit
         end
       end
 
-      # Pop from local variable state
-      #
-      # @param [Parser::AST::Node] node
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def leave(node)
         pop if CLOSE_NODES.include?(node.type)
       end
 
-      # Define a local variable on current stack
-      #
-      # @param [Symbol] name
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def define(name)
         current << name
       end
 
-      # Push reset scope on stack
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def push_reset
         @stack << Set.new
       end
 
-      # Push inherited lvar scope on stack
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def push_inherit
         @stack << current.dup
       end
 
-      # Pop lvar scope from stack
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def pop
         @stack.pop
       end

data/lib/unparser/buffer.rb

@@ -3,8 +3,6 @@
 module Unparser
 
   # Buffer used to emit into
-  #
-  # ignore :reek:TooManyMethods
   class Buffer
 
     NL = "\n".freeze
@@ -82,6 +80,13 @@ module Unparser
       self
     end
 
+    def root_indent
+      before = @indent
+      @indent = 0
+      yield
+      @indent = before
+    end
+
     # Test for a fresh line
     #
     # @return [Boolean]
@@ -114,26 +119,24 @@ module Unparser
       @content[size_before..-1]
     end
 
-  private
-
-    INDENT_SPACE = '  '.freeze
-
-    # Write prefix
-    #
-    # @return [String]
+    # Write raw fragment to buffer
     #
-    # @api private
-    #
-    def prefix
-      write(INDENT_SPACE * @indent)
-    end
-
-    # Write to content buffer
+    # Does not do indentation logic.
     #
     # @param [String] fragment
     #
+    # @return [self]
     def write(fragment)
       @content << fragment
+      self
+    end
+
+  private
+
+    INDENT_SPACE = '  '.freeze
+
+    def prefix
+      write(INDENT_SPACE * @indent)
     end
 
   end # Buffer