deep-cover 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87db799f1d293b8ec1f537de9d4da1f0e64fdc3d
-  data.tar.gz: 7d2406c8639b80ddc55169983322074049b3726c
+  metadata.gz: ef02156435418688aa0934036aa4273c3179468c
+  data.tar.gz: ba37d24e7cbf1e34f0fbd0db4f3f2720527825f4
 SHA512:
-  metadata.gz: 1a1307e9bd830c0eee32251b73a95a9933e85a57225e837231a2a77ba6c81eea69496918f95d7bec8fc650dc9655539f42d941076123dba031ac1c1c56a09548
-  data.tar.gz: d379b6d29d5a7c4a9d60466e2aac46cc5fb6c6157c0798cb763bbf770f94de2b31fe555a7121a45891f9b9d1a216bb900b27f6eded6cc79e60c41471e6900c28
+  metadata.gz: 0c209ce060a984b41dc8e454fccebb6d9911a464a1b76de267ccdd326e567b9af9e427c42e66f75007b7fd81cdb27d4bc5b513772cf2d0d0e11c98a8d152a164
+  data.tar.gz: 492ebdb2f56861e7b9d8d195cfdc2818568ff245e7e64c778d9062290785d420c31e43cb1cdcd2efbd204ef40141ba6e80d7d05e220250beba4bf88759b39a1d

data/lib/deep_cover/node/block.rb

@@ -15,20 +15,13 @@ module DeepCover
       end
     end
 
-    class SendWithBlock < Node
+    class SendWithBlock < SendBase
       include WithBlock
-      has_child receiver: [Node, nil]
-      has_child method_name: Symbol
-      has_extra_children arguments: Node
+    end
 
-      def rewriting_rules # TODO: test more with foo[42]. Factorize with Send.
-        rules = super
-        unless arguments.empty? || loc_hash[:begin]
-          range = arguments.last.expression.with(begin_pos: loc_hash[:selector].end_pos)
-          rules.unshift [range, '(%{node})']
-        end
-        rules
-      end
+    class CsendWithBlock < Csend
+      include WithBlock
+      refine_child actual_send: {safe_send: SendWithBlock}
     end
 
     class SuperWithBlock < Node
@@ -39,7 +32,8 @@ module DeepCover
     class Block < Node
       check_completion
       has_tracker :body
-      has_child call: {send: SendWithBlock, 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

@@ -16,7 +16,7 @@ module DeepCover
     end
 
     class TrivialBranch < Node::EmptyBody
-      def initialize(condition, other_branch, position: true)
+      def initialize(other_branch: raise, condition: raise, position: true)
         @condition = condition
         @other_branch = other_branch
         super(nil, parent: condition.parent, position: position)

data/lib/deep_cover/node/send.rb

@@ -3,8 +3,7 @@ require_relative 'branch'
 
 module DeepCover
   class Node
-    class Send < Node
-      check_completion
+    class SendBase < Node
       has_child receiver: [Node, nil]
       has_child message: Symbol
       has_extra_children arguments: Node
@@ -52,6 +51,10 @@ module DeepCover
       end
     end
 
+    class Send < SendBase
+      check_completion
+    end
+
     class Csend < Node
       include Branch
       has_tracker :conditional
@@ -69,7 +72,9 @@ module DeepCover
 
       executed_loc_keys :dot
 
-      alias_method :execution_count, :flow_entry_count
+      def execution_count
+        receiver.flow_completion_count
+      end
 
       def message
         actual_send.message
@@ -77,7 +82,7 @@ module DeepCover
 
       def branches
         [ actual_send,
-          TrivialBranch.new(receiver, actual_send)
+          TrivialBranch.new(condition: receiver, other_branch: actual_send)
         ]
       end
     end

data/lib/deep_cover/node/short_circuit.rb

@@ -5,14 +5,14 @@ module DeepCover
     class ShortCircuit < Node
       include Branch
       has_tracker :conditional
-      has_child first: Node
+      has_child lhs: Node
       has_child conditional: Node, flow_entry_count: :conditional_tracker_hits,
         rewrite: '((%{conditional_tracker};%{node}))'
 
       def branches
         [
           conditional,
-          TrivialBranch.new(first, conditional)
+          TrivialBranch.new(condition: lhs, other_branch: conditional)
         ]
       end
     end

data/lib/deep_cover/version.rb

@@ -1,3 +1,3 @@
 module DeepCover
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep-cover
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Marc-André Lafortune