tracia 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc2d81fead9f93a65e43c6f12eab0c2c780944336bcc46a3b4b1954db607b85c
-  data.tar.gz: 07f39b8b528e0eaf17e68e7fb25ccc3643deb83c47cc310962faab616539ff62
+  metadata.gz: ac587bcc0c01258f1220731adda063b6c83a7f66e87fe51da334286e7f629c7a
+  data.tar.gz: 972cfa5242cb2570aa6e9614fc30fa43937cf8c23390af260c0685b57573d094
 SHA512:
-  metadata.gz: 03ab7c66bd930c473c70236ac5da77eded3bd28747d68f30d4b132b2bb2e14f2ce834d6270f20cb9f7cc3cb0c6402779ee22dc86f834a0b30797a8ee0d227e54
-  data.tar.gz: 1fa5ac6f5a4cf003b850407d2b67d0f22f331550e014d8a5f51b8ee07b987c0d665eaa6c9b81c2090c11060df16aa63aee2e57b2b771d49145bb3bb2ba05fa0a
+  metadata.gz: d7631de3f1aaa6cae27892e120ba4eadb9318c04f4461c8697141278642d4fd18253fc8b11abb26408a306d683c0e71f8c356f03dd8c862273fdbaf4a2c6ac36
+  data.tar.gz: 6410a901a160249b4dab2eebe147f7a517e2ffc5da81a99d097e12d031a59e631a3b5c4ec44dfbb6566cc34d416768725cf1dd7aa09db7713e7c72719f1a7e67

data/lib/tracia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Tracia
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/lib/tracia.rb

@@ -90,13 +90,33 @@ class Tracia
 
     root = @stack[0]
     if root
-      non_tail_recursion!([root]) if @non_tail_recursion
+      eliminate_tail_recursion!([root]) if @non_tail_recursion
       @logger.call(root)
     end
   end
 
   private
 
+  def eliminate_tail_recursion!(stack)
+    @specific_recursion =
+      case @non_tail_recursion
+      when true
+        -> (_) { true }
+      else
+        target_recursions = Array === @non_tail_recursion ? @non_tail_recursion : [@non_tail_recursion]
+        target_recursions.map!{ |h| Frame.new(h[:klass], h[:call_sym], h[:method_name], nil, nil) }
+        -> (current) do
+          target_recursions.any? do |tr|
+            current.klass == tr.klass &&
+              current.call_sym == tr.call_sym &&
+              current.method_name == tr.method_name
+          end
+        end
+      end
+
+    non_tail_recursion!(stack)
+  end
+
   def non_tail_recursion!(stack)
     current_frame = stack.last
     last_idx = current_frame.children.count - 1
@@ -105,7 +125,9 @@ class Tracia
       next unless Frame === child
       next non_tail_recursion!([child]) if last_idx != idx
 
-      recursion_idx = stack.index{ |frame| frame.same_klass_and_method?(child) }
+      # pp (stack + [child]).map{|f| "#{f.send(:class_and_method)}:#{f.object_id}" }
+
+      recursion_idx = @specific_recursion[child] && stack.rindex{ |frame| frame.same_klass_and_method?(child) }
       if recursion_idx
         parent = stack[recursion_idx - 1]
         parent.children << child

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tracia
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - ken
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry