unparser 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51f39ff818f38c725475d8e6970391c4f7a771a1
-  data.tar.gz: 6838c26d95b6bf42ecf19e9b1874c39223d00d6a
+  metadata.gz: 8311740d232b8385dfa4e602fdb037769593990f
+  data.tar.gz: c2cbcfa29bc39e0affdaa3eb02acddd60a78ec85
 SHA512:
-  metadata.gz: e71bf25de61e37a461f9f09d3b1600070d84c7458d9717c11ce768d5eafd3881a5ea1eca3e8926d0704dbc06862d4d1bfb718f335fb2e9a23d9362a3797a0bea
-  data.tar.gz: 2df198d4fd9b6807af07b7a45f5a781f1b969a4b716fb6ef407f7c3cdca0613b9b66fbf84eddfba9b73b59e81e4b076f86a08f4df823b9e80a46aa3a6b4b799f
+  metadata.gz: 664dd07c08c822714a16c4c2ae9758cd270d3a643bebccfc4cee2c1a536cc5a4aa1eff6e80302dbc4438592b3d443787fc6400a4761eda3ef51f497087f4efb9
+  data.tar.gz: a9af21984e94034f91b33d8b68b13a5ee045fe6d1e03459e45739c8eaeeedaabf0d3ce41e51957b08d8eec86894388739b97d336df0d428ec5ff8b123cf80901

data/Changelog.md

@@ -1,3 +1,9 @@
+# v0.1.16 2014-11-07
+
+* Add emitter for complex and rational literals
+* Fix edge cases for MLHS
+* Fix differencies from 2.2.pre7 series of parser
+
 # v0.1.15 2014-09-24
 
 * Handle syntax edge case for MRI 2.1.3 parser.

data/circle.yml

@@ -1,6 +1,6 @@
 machine:
   ruby:
-    version: 2.0.0
+    version: '2.1'
 test:
   override:
     - bundle exec rake ci

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 13
-total_score: 698
+total_score: 679

data/config/flog.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 22.1
+threshold: 23.7

data/config/reek.yml

@@ -79,6 +79,7 @@ TooManyStatements:
   - Unparser::CLI#add_options
   - Unparser::CLI#initialize
   - Unparser::CLI::Source#report_unparser
+  - Unparser::Emitter#delimited
 DuplicateMethodCall:
   allow_calls: []
   exclude: []

data/lib/unparser/ast.rb

@@ -185,7 +185,7 @@ module Unparser
         return unless controller.call(node)
         block.call(node)
         node.children.each do |child|
-          next unless child.kind_of?(Parser::AST::Node)
+          next unless child.is_a?(Parser::AST::Node)
           call(child)
         end
         self

data/lib/unparser/ast/local_variable_scope.rb

@@ -161,7 +161,7 @@ module Unparser
         enter(node)
         yield node, current.dup, before
         node.children.each do |child|
-          visit(child, &block) if child.kind_of?(Parser::AST::Node)
+          visit(child, &block) if child.is_a?(Parser::AST::Node)
         end
         leave(node)
       end

data/lib/unparser/cli/differ.rb

@@ -101,7 +101,7 @@ module Unparser
       # @api private
       #
       def self.lines(source)
-        source.lines.map { |line| line.chomp }
+        source.lines.map(&:chomp)
       end
       private_class_method :lines
 

data/lib/unparser/cli/source.rb

@@ -131,6 +131,8 @@ module Unparser
       def report_generated
         strip(<<-MESSAGE)
           Parsing of generated source failed:
+          Original-source:
+          #{original_source}
           Original-AST:
           #{original_ast.inspect}
           Source:

data/lib/unparser/constants.rb

@@ -98,17 +98,6 @@ module Unparser
     K_FILE     = '__FILE__'
     K_THEN     = 'then'
 
-    # Nodes that can be emitted in tokens that terminate their expression.
-    #
-    # These nodes dont require parentheses to be exactly reproduced in context of a more complex expression.
-    #
-    TERMINATED = symbol_set %w(
-      int float self kwbegin const regexp args lvar
-      ivar gvar cvar if case module class sclass super
-      yield zsuper break next defined? str block while loop until
-      def defs true false nil array hash sym return match_current_line
-    )
-
     DEFAULT_DELIMITER = ', '.freeze
 
     CURLY_BRACKETS = IceNine.deep_freeze(%w({ }))

data/lib/unparser/dsl.rb

@@ -13,7 +13,7 @@ module Unparser
     # @api private
     #
     def define_remaining_children(names)
-      range = names.length .. -1
+      range = names.length..-1
       define_method(:remaining_children) do
         children[range]
       end

data/lib/unparser/emitter.rb

@@ -17,6 +17,18 @@ module Unparser
 
     CURLY_BRACKETS = IceNine.deep_freeze(%w({ }))
 
+    module Unterminated
+      def terminated?
+        false
+      end
+    end
+
+    module Terminated
+      def terminated?
+        true
+      end
+    end
+
     module LocalVariableRoot
 
       # Return local variable root
@@ -133,9 +145,7 @@ module Unparser
     #
     # @api private
     #
-    def terminated?
-      TERMINATED.include?(node.type)
-    end
+    abstract_method :terminated?
 
   protected
 
@@ -183,12 +193,12 @@ module Unparser
     #
     # @api private
     #
-    def visit(node)
+    def visit_plain(node)
       emitter = emitter(node)
       emitter.write_to_buffer
     end
 
-    # Visit unambigous node
+    # Visit ambigous node
     #
     # @param [Parser::AST::Node] node
     #
@@ -196,7 +206,7 @@ module Unparser
     #
     # @api private
     #
-    def visit_terminated(node)
+    def visit(node)
       emitter = emitter(node)
       conditional_parentheses(!emitter.terminated?) do
         emitter.write_to_buffer
@@ -213,7 +223,7 @@ module Unparser
     #
     def visit_parentheses(node, *arguments)
       parentheses(*arguments) do
-        visit(node)
+        visit_plain(node)
       end
     end
 
@@ -254,13 +264,27 @@ module Unparser
     #
     # @api private
     #
-    def delimited(nodes, delimiter = DEFAULT_DELIMITER)
+    def delimited_plain(nodes, delimiter = DEFAULT_DELIMITER)
+      delimited(nodes, delimiter, &method(:visit_plain))
+    end
+
+    # Emit delimited body
+    #
+    # @param [Enumerable<Parser::AST::Node>] nodes
+    # @param [String] delimiter
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def delimited(nodes, delimiter = DEFAULT_DELIMITER, &block)
       return if nodes.empty?
+      block ||= method(:visit)
       head, *tail = nodes
-      visit(head)
+      block.call(head)
       tail.each do |node|
         write(delimiter)
-        visit(node)
+        block.call(node)
       end
     end
 
@@ -401,8 +425,12 @@ module Unparser
     #
     # @api private
     #
+    # False positive:
+    #
+    # rubocop:disable MethodCallParentheses
+    #
     def indented
-      buffer = self.buffer
+      buffer = buffer()
       buffer.indent
       nl
       yield
@@ -438,9 +466,9 @@ module Unparser
     #
     def visit_indented(node)
       if NOINDENT.include?(node.type)
-        visit(node)
+        visit_plain(node)
       else
-        indented { visit(node) }
+        indented { visit_plain(node) }
       end
     end
 

data/lib/unparser/emitter/argument.rb

@@ -19,14 +19,13 @@ module Unparser
       # @api private
       #
       def dispatch
-        parentheses do
-          visit(body)
-        end
+        visit_parentheses(body)
       end
     end # ArgExpr
 
     # Arguments emitter
     class Arguments < self
+      include Terminated
 
       handle :args
 
@@ -54,13 +53,7 @@ module Unparser
       # @api private
       #
       def normal_arguments
-        children.reject(&SHADOWARGS).map do |child|
-          if child.type.equal?(:mlhs)
-            Parser::AST::Node.new(:arg_expr, [child])
-          else
-            child
-          end
-        end
+        children.reject(&SHADOWARGS)
       end
 
       # Return shadow args
@@ -76,10 +69,17 @@ module Unparser
 
     end # Arguments
 
-    # Emitter for block arguments
-    class Blockarg < self
+    # Emitter for block and kwrestarg arguments
+    class Morearg < self
+      include Terminated
+
+      MAP = {
+        blockarg: T_AMP,
+        kwrestarg: T_DSPLAT
+      }
 
       handle :blockarg
+      handle :kwrestarg
 
       children :name
 
@@ -92,13 +92,14 @@ module Unparser
       # @api private
       #
       def dispatch
-        write(T_AMP, name.to_s)
+        write(MAP.fetch(node_type), name.to_s)
       end
 
     end # Blockarg
 
     # Optional argument emitter
     class Optarg < self
+      include Terminated
 
       handle :optarg
 
@@ -118,28 +119,10 @@ module Unparser
       end
     end
 
-    # Keyword rest argument emitter
-    class KeywordRest < self
-
-      handle :kwrestarg
-
-      children :name
-
-    private
-
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def dispatch
-        write(T_DSPLAT, name.to_s)
-      end
-    end # KeywordRest
-
     # Optional keyword argument emitter
     class KeywordOptional < self
+      include Terminated
+
       handle :kwoptarg
 
       children :name, :value
@@ -161,6 +144,8 @@ module Unparser
 
     # Keyword argument emitter
     class Kwarg < self
+      include Terminated
+
       handle :kwarg
 
       children :name
@@ -181,6 +166,7 @@ module Unparser
 
     # Rest argument emitter
     class Restarg < self
+      include Terminated
 
       handle :restarg
 
@@ -202,6 +188,7 @@ module Unparser
 
     # Argument emitter
     class Argument < self
+      include Terminated
 
       handle :arg, :shadowarg
 
@@ -223,6 +210,7 @@ module Unparser
 
     # Block pass node emitter
     class BlockPass < self
+      include Terminated
 
       handle :block_pass
 
@@ -238,7 +226,7 @@ module Unparser
       #
       def dispatch
         write(T_AMP)
-        visit_terminated(name)
+        visit(name)
       end
 
     end # BlockPass

data/lib/unparser/emitter/assignment.rb

@@ -22,6 +22,18 @@ module Unparser
       # Single assignment emitter
       class Single < self
 
+        # Test for terminated emit
+        #
+        # @return [Boolean]
+        #
+        # @api private
+        #
+        def terminated?
+          right_node.nil?
+        end
+
+      private
+
         # Emit right
         #
         # @return [undefined]
@@ -86,6 +98,7 @@ module Unparser
 
       # Multiple assignment
       class Multiple < self
+        include Unterminated
 
         handle :masgn
 
@@ -100,7 +113,7 @@ module Unparser
         # @api private
         #
         def emit_left
-          visit(first_child)
+          visit_plain(first_child)
         end
 
         # Emit right
@@ -127,12 +140,14 @@ module Unparser
 
       # Emitter for multiple assignment left hand side
       class MLHS < Emitter
+        include Unterminated
 
         handle :mlhs
 
       private
 
-        NO_COMMA = [:splat, :restarg, :mlhs].to_set.freeze
+        NO_COMMA = [:splat, :restarg].to_set.freeze
+        PARENT_MLHS = [:mlhs, :masgn]
 
         # Perform dispatch
         #
@@ -141,11 +156,19 @@ module Unparser
         # @api private
         #
         def dispatch
-          conditional_parentheses(parent_type.equal?(:mlhs)) do
-            delimited(children)
-          end
+          delimited(children)
+
+          write(',') if children.one? && mlhs?
+        end
 
-          write(',') if children.one? && !NO_COMMA.include?(children.first.type) && !parent_type.equal?(:arg_expr)
+        # Test for mlhs context
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def mlhs?
+          !NO_COMMA.include?(first_child.type) && PARENT_MLHS.include?(parent_type)
         end
 
       end # MLHS

data/lib/unparser/emitter/begin.rb

@@ -17,7 +17,10 @@ module Unparser
       # @api private
       #
       def emit_inner
-        delimited(children, NL)
+        children.each_with_index do |child, index|
+          visit_plain(child)
+          write(NL) if index < children.length - 1
+        end
       end
 
       # Emitter for implicit begins
@@ -25,8 +28,6 @@ module Unparser
 
         handle :begin
 
-        NON_EMPTY_PARENS = [:root, :dstr, :dyn_str_body].to_set.freeze
-
         # Test if begin is terminated
         #
         # @return [Boolean]
@@ -34,9 +35,11 @@ module Unparser
         # @api private
         #
         def terminated?
-          children.empty? && !NON_EMPTY_PARENS.include?(parent_type)
+          children.empty?
         end
 
+        TERMINATING_PARENT = [:root, :dyn_str_body].to_set.freeze
+
       private
 
         # Perform dispatch
@@ -46,12 +49,10 @@ module Unparser
         # @api private
         #
         def dispatch
-          if terminated?
+          if terminated? && !TERMINATING_PARENT.include?(parent_type)
             write('()')
           else
-            conditional_parentheses(parent_type.equal?(:optarg)) do
-              emit_inner
-            end
+            emit_inner
           end
         end
 
@@ -59,6 +60,7 @@ module Unparser
 
       # Emitter for explicit begins
       class Explicit < self
+        include Terminated
 
         handle :kwbegin