deep-cover 0.1.14 → 0.1.15

data/lib/deep_cover/node/begin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   class Node
     class Begin < Node
@@ -16,7 +18,7 @@ module DeepCover
         when 'else', '#{'
           %i[begin end]
         else
-          warn "Unknown context for Begin node"
+          warn 'Unknown context for Begin node'
           []
         end
       end

data/lib/deep_cover/node/block.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'send'
 require_relative 'keywords'
 
@@ -32,8 +34,9 @@ module DeepCover
     class Block < Node
       check_completion
       has_tracker :body
-      has_child call: { send: SendWithBlock, csend: CsendWithBlock,
-                        zsuper: SuperWithBlock, super: SuperWithBlock }
+      has_child call: {send: SendWithBlock, csend: CsendWithBlock,
+                       zsuper: SuperWithBlock, super: SuperWithBlock,
+}
       has_child args: Args
       has_child body: Node,
                 can_be_empty: -> { base_node.loc.end.begin },

data/lib/deep_cover/node/branch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'empty_body'
 
 module DeepCover
@@ -26,6 +28,5 @@ module DeepCover
         @condition.flow_completion_count - @other_branch.flow_entry_count
       end
     end
-
   end
 end

data/lib/deep_cover/node/case.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'branch'
 
 module DeepCover
@@ -14,8 +16,8 @@ module DeepCover
       # See https://github.com/jruby/jruby/issues/4804
       # This is solved in jruby 9.2.0.0, better keep the workaround
       # for compatibility.
-      has_child condition: Node, rewrite: "(((%{entry_tracker}) && %{node}))",
-        flow_entry_count: :entry_tracker_hits
+      has_child condition: Node, rewrite: '(((%{entry_tracker}) && %{node}))',
+                flow_entry_count: :entry_tracker_hits
       executed_loc_keys []
 
       def flow_entry_count
@@ -43,18 +45,18 @@ module DeepCover
 
     class When < Node
       has_tracker :body_entry
-      has_extra_children matches: { splat: WhenSplatCondition, Parser::AST::Node => WhenCondition }
+      has_extra_children matches: {splat: WhenSplatCondition, Parser::AST::Node => WhenCondition}
       has_child body: Node,
-        can_be_empty: -> {
-          if (after_then = base_node.loc.begin)
-            after_then.end
-          else
-            base_node.loc.expression.end
-          end
-        },
-        rewrite: ";%{body_entry_tracker};%{local}=nil;%{node}",
-        is_statement: true,
-        flow_entry_count: :body_entry_tracker_hits
+                can_be_empty: -> {
+                                if (after_then = base_node.loc.begin)
+                                  after_then.end
+                                else
+                                  base_node.loc.expression.end
+                                end
+                              },
+                rewrite: ';%{body_entry_tracker};%{local}=nil;%{node}',
+                is_statement: true,
+                flow_entry_count: :body_entry_tracker_hits
 
       def flow_entry_count
         matches.first.flow_entry_count

data/lib/deep_cover/node/collections.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'splat'
 
 module DeepCover

data/lib/deep_cover/node/const.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   class Node::Const < Node
     check_completion

data/lib/deep_cover/node/def.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'arguments'
 
 module DeepCover
@@ -7,10 +9,10 @@ module DeepCover
     has_child method_name: Symbol
     has_child signature: Args
     has_child body: Node,
-      rewrite: '%{method_call_tracker};%{local}=nil;%{node}',
-      can_be_empty: -> { base_node.loc.end.begin },
-      is_statement: true,
-      flow_entry_count: :method_call_tracker_hits
+              rewrite: '%{method_call_tracker};%{local}=nil;%{node}',
+              can_be_empty: -> { base_node.loc.end.begin },
+              is_statement: true,
+              flow_entry_count: :method_call_tracker_hits
     executed_loc_keys :keyword, :name
 
     def children_nodes_in_flow_order
@@ -25,10 +27,10 @@ module DeepCover
     has_child method_name: Symbol
     has_child signature: Args
     has_child body: Node,
-      rewrite: '%{method_call_tracker};%{local}=nil;%{node}',
-      can_be_empty: -> { base_node.loc.end.begin },
-      is_statement: true,
-      flow_entry_count: :method_call_tracker_hits
+              rewrite: '%{method_call_tracker};%{local}=nil;%{node}',
+              can_be_empty: -> { base_node.loc.end.begin },
+              is_statement: true,
+              flow_entry_count: :method_call_tracker_hits
     executed_loc_keys :keyword, :name, :operator
 
     def children_nodes_in_flow_order

data/lib/deep_cover/node/empty_body.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   class Node::EmptyBody < Node
     def initialize(base_node, parent: raise, index: 0, position: ChildCanBeEmpty.last_empty_position)

data/lib/deep_cover/node/exceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'variables'
 require_relative 'collections'
 
@@ -51,7 +53,7 @@ module DeepCover
         if prev.equal? watched_body
           prev.flow_entry_count - prev.flow_completion_count
         else # RESBODIES
-          if prev.exception
+          if prev.exception # rubocop:disable Style/IfInsideElse
             prev.exception.flow_completion_count - prev.execution_count
           else
             prev.flow_entry_count - prev.execution_count

data/lib/deep_cover/node/if.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'branch'
 
 module DeepCover
@@ -19,7 +21,7 @@ module DeepCover
       executed_loc_keys :keyword, :question
 
       def branches
-        [ true_branch, false_branch ]
+        [true_branch, false_branch]
       end
 
       def execution_count

data/lib/deep_cover/node/keywords.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'variables'
 require_relative 'literals'
 
@@ -31,7 +33,7 @@ module DeepCover
 
     class Break < Node
       has_extra_children arguments: Node
-      # TODO Anything special needed for the arguments?
+      # TODO: Anything special needed for the arguments?
 
       def flow_completion_count
         0
@@ -40,7 +42,7 @@ module DeepCover
 
     class Next < Node
       has_extra_children arguments: Node
-      # TODO Anything special needed for the arguments?
+      # TODO: Anything special needed for the arguments?
 
       def flow_completion_count
         0

data/lib/deep_cover/node/literals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'begin'
 require_relative 'variables'
 module DeepCover

data/lib/deep_cover/node/loops.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   class Node
     class For < Node
@@ -5,9 +7,9 @@ module DeepCover
       has_child assignments: [Mlhs, VariableAssignment], flow_entry_count: -> { body.flow_entry_count if body }
       has_child iterable: [Node], flow_entry_count: -> { flow_entry_count }
       has_child body: Node,
-        can_be_empty: -> { base_node.loc.end.begin },
-        flow_entry_count: :body_tracker_hits,
-        rewrite: '((%{body_tracker};%{local}=nil;%{node}))'
+                can_be_empty: -> { base_node.loc.end.begin },
+                flow_entry_count: :body_tracker_hits,
+                rewrite: '((%{body_tracker};%{local}=nil;%{node}))'
       check_completion
 
       def execution_count

data/lib/deep_cover/node/mixin/can_augment_children.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   module Node::Mixin
     module CanAugmentChildren
@@ -10,9 +12,9 @@ module DeepCover
       # Caution: receiver is not fully constructed since it is also being augmented.
       #          don't call `children`
       def augment_children(child_base_nodes)
-        missing = self.class.min_children - child_base_nodes.size
-        if missing > 0
-          child_base_nodes = [*child_base_nodes, *Array.new(missing)]
+        if child_base_nodes.size < (sz = self.class.min_children)
+          child_base_nodes = child_base_nodes.dup
+          child_base_nodes[sz..-1] = [] # Fill with nil
         end
         child_base_nodes.map.with_index do |child, child_index|
           child_name = self.class.child_index_to_name(child_index, child_base_nodes.size)
@@ -25,14 +27,13 @@ module DeepCover
       end
       private :augment_children
 
-      def remap_child(child, name=nil)
+      def remap_child(child, name = nil)
         return unless child.is_a?(Parser::AST::Node)
         class_name = Tools.camelize(child.type)
         Node.const_defined?(class_name) ? Node.const_get(class_name) : Node
       end
 
       module ClassMethods
-
         # This handles the following shortcuts:
         #   has_child foo: {type: NodeClass, ...}
         # same as:
@@ -43,13 +44,13 @@ module DeepCover
         def has_child(remap: nil, **h)
           name, types = h.first
           if types.is_a? Hash
-            raise "Use either remap or a hash as type but not both" if remap
+            raise 'Use either remap or a hash as type but not both' if remap
             remap = types
             h[name] = types = []
           end
           if remap.is_a? Hash
             type_map = remap
-            remap = -> (child) do
+            remap = ->(child) do
               klass = type_map[child.type] if child.respond_to? :type
               klass ||= type_map[child.class]
               klass

data/lib/deep_cover/node/mixin/check_completion.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require_relative 'executed_after_children'
 
 module DeepCover
   module Node::Mixin
     module CheckCompletion
-      def check_completion(outer:'(%{node})', inner:'(%{node})')
+      def check_completion(outer: '(%{node})', inner: '(%{node})')
         has_tracker :completion
         include ExecutedAfterChildren
         alias_method :flow_completion_count, :completion_tracker_hits

data/lib/deep_cover/node/mixin/child_can_be_empty.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   module Node::Mixin
     module ChildCanBeEmpty
@@ -8,7 +10,7 @@ module DeepCover
         end
       end
 
-      def remap_child(child, name=raise)
+      def remap_child(child, name = raise)
         if child == nil
           if (ChildCanBeEmpty.last_empty_position = child_can_be_empty(child, name))
             return Node::EmptyBody
@@ -17,7 +19,7 @@ module DeepCover
         super
       end
 
-      def child_can_be_empty(_child, _name=nil)
+      def child_can_be_empty(_child, _name = nil)
         false
       end
     end

data/lib/deep_cover/node/mixin/executed_after_children.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   module Node::Mixin
     # By default, nodes are considered executed if they are entered.

data/lib/deep_cover/node/mixin/execution_location.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   module Node::Mixin
     module ExecutionLocation
@@ -30,7 +32,7 @@ module DeepCover
         if (keys = parent.child_executed_loc_keys(self))
           h.merge!(Tools.slice(parent.loc_hash, *keys))
         end
-        h.reject{|k, v| v.nil? }
+        h.reject { |k, v| v.nil? }
       end
 
       def executed_locs
@@ -38,7 +40,7 @@ module DeepCover
       end
 
       def loc_hash
-        @loc_hash ||= (base_node.respond_to?(:location) ? base_node.location.to_hash : {}).freeze
+        base_node.respond_to?(:location) ? base_node.location.to_hash : {}
       end
 
       def expression

data/lib/deep_cover/node/mixin/flow_accounting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   module Node::Mixin
     module FlowAccounting

data/lib/deep_cover/node/mixin/has_child.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module DeepCover
   module Node::Mixin
     module HasChild
       def self.included(base)
         base.extend ClassMethods
       end
-      CHILDREN = {}
-      CHILDREN_TYPES = {}
+      CHILDREN = {}.freeze
+      CHILDREN_TYPES = {}.freeze
 
       def initialize(*)
         super
@@ -20,31 +22,31 @@ module DeepCover
       end
 
       module ClassMethods
-        def has_child(_rest: false, _refine: false, **h)
+        def has_child(rest_: false, refine_: false, **h)
           raise "Needs exactly one custom named argument, got #{h.size}" if h.size != 1
           name, types = h.first
           raise TypeError, "Expect a Symbol for name, got a #{name.class} (#{name.inspect})" unless name.is_a?(Symbol)
-          update_children_const(name, rest: _rest) unless _refine
-          define_accessor(name) unless _refine
+          update_children_const(name, rest: rest_) unless refine_
+          define_accessor(name) unless refine_
           add_runtime_check(name, types)
           self
         end
 
         def has_extra_children(**h)
-          has_child(**h, _rest: true)
+          has_child(**h, rest_: true)
         end
 
         def refine_child(child_name = nil, **h)
           if child_name
             h = {child_name => self::CHILDREN_TYPES.fetch(child_name), **h}
           end
-          has_child(**h, _refine: true)
+          has_child(**h, refine_: true)
         end
 
         def child_index_to_name(index, nb_children)
           self::CHILDREN.each do |name, i|
             return name if i == index || (i == index - nb_children) ||
-              (i.is_a?(Range) && i.begin <= index && i.end + nb_children >= index)
+                           (i.is_a?(Range) && i.begin <= index && i.end + nb_children >= index)
           end
           raise IndexError, "index #{index} does not correspond to any child of #{self}"
         end
@@ -82,7 +84,7 @@ module DeepCover
           when nil
             node.nil?
           when Array
-            expected.any? {|exp| node_matches_type?(node, exp) }
+            expected.any? { |exp| node_matches_type?(node, exp) }
           when Class
             node.is_a?(expected)
           when Symbol
@@ -110,22 +112,24 @@ module DeepCover
             end
           end
           children_map[name] = if rest
-            raise "Class #{self} can't have extra children '#{name}' because it already has '#{name}' (#{children_map.inspect})" if already_has_rest
-            children_map.size..-1
-          elsif already_has_rest
-            -1
-          else
-            children_map.size
-          end
+                                 if already_has_rest
+                                   raise "Class #{self} can't have extra children '#{name}' because it already has '#{name}' (#{children_map})"
+                                 end
+                                 children_map.size..-1
+                               elsif already_has_rest
+                                 -1
+                               else
+                                 children_map.size
+                               end
         end
 
         def define_accessor(name)
           warn "child name '#{name}' conflicts with existing method for #{self}" if method_defined? name
-          class_eval <<-end_eval, __FILE__, __LINE__
+          class_eval <<-EVAL, __FILE__, __LINE__ + 1
             def #{name}
               children[CHILDREN.fetch(#{name.inspect})]
             end
-          end_eval
+          EVAL
         end
 
         def add_runtime_check(name, type)