deferral 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df6589679f83c024ae2b3e33c2a172f86b7b71b94b135b79af9fa80201d8911f
-  data.tar.gz: 2265ea2d27731ffc8abe5f358b67bc3ef91538334969af2a0bfb29adef86fa21
+  metadata.gz: c29e4800b21774bc07464b24ccf6b55567e246d172078226c4efb75904a73d6d
+  data.tar.gz: 37e3137b7fd15b5020c8832ec9dd8c116aec606ae706725f801b7e5c1e84199a
 SHA512:
-  metadata.gz: 2ecb6345db973339220e9cd5b2b57d1c6f0d80f6d1b5e64519348cda9df3a66a3abcf21d508d72ca882b0eb096c8fa26af898a0642c67bd01aa93a2aa7f01d76
-  data.tar.gz: 86d0896af5471e7f1c9d64e2458567b06a298479050e687541fc3d6dd48e50f124464db2b91c876b011fe9448a261abe4fb32fe9245ec083a5444525fa334e89
+  metadata.gz: faadf44111eadf4ad96aeee801674e28ae5326fa493635e184e5189d353a56bf6653d3fd64faba72c9612ddbf17131c59a95e60dacf8dec9733440beae4f91a5
+  data.tar.gz: 7b259425ec31357c87c28910909ef0981ee275361728222f4effbd73787f88dbd023cc3b417ba291ec4368e2360e480f27562893181a1fe9a2bf6b48b89ec7de

data/lib/deferral.rb

@@ -23,32 +23,39 @@ module Deferral
 
       stack = store[:stack] = [StackFrame.new(:root)] # root stack frame as first "caller" position of this method
       first_return = true
+      stack_under_defer = false
 
       trace = TracePoint.new(:call, :return, :b_call, :b_return) do |tp|
-        if tp.event == :return && first_return # return from this method
+        if first_return && tp.event == :return && tp.defined_class == Deferral::Mixin && tp.method_id == :defer
           first_return = false
           next
         end
 
         case tp.event
         when :call, :b_call
+          next if stack_under_defer
+
           if tp.defined_class == Deferral::Mixin && tp.method_id == :defer
-            # invocation of "defer" itself - ignore it
+            stack_under_defer = true
             next
           end
 
           stack << StackFrame.new(tp.event)
+
         when :return, :b_return
-          if tp.defined_class == Deferral::Mixin && tp.method_id == :defer
-            # invocation of "defer" itself - ignore it
+          if stack_under_defer && tp.defined_class == Deferral::Mixin && tp.method_id == :defer
+            stack_under_defer = false
             next
           end
 
+          next if stack_under_defer
+
           frame = stack.pop
           frame.release!
           if frame.root?
             trace.disable
           end
+
         else
           raise "unexpected TracePoint event:#{tp.event}"
         end

data/lib/deferral/deferred.rb

@@ -0,0 +1,37 @@
+module Deferral
+  class Deferred
+    def self.get_local_variables(block)
+      vars = {}
+      block.binding.local_variables.each do |name|
+        vars[name] = block.binding.local_variable_get(name)
+      end
+      vars
+    end
+
+    def self.set_local_variables(block, vars)
+      vars.each_pair do |name, val|
+        block.binding.local_variable_set(name, val)
+      end
+      nil
+    end
+
+    def initialize(block)
+      @block = block
+      @local_variables = Deferred.get_local_variables(block)
+    end
+
+    def call
+      current_vars = Deferred.get_local_variables(@block)
+      begin
+        Deferred.set_local_variables(@block, @local_variables)
+        @block.call
+      rescue Exception
+        # ignore all exceptions ...
+        # no way to add "suppressed" exceptions to the exception already thrown
+      ensure
+        Deferred.set_local_variables(@block, current_vars)
+      end
+    end
+  end
+end
+

data/lib/deferral/stack_frame.rb

@@ -1,3 +1,5 @@
+require_relative "./deferred"
+
 module Deferral
   class StackFrame
     attr_reader :type, :id
@@ -12,18 +14,13 @@ module Deferral
     end
 
     def add(release)
-      @releases << release
+      @releases << Deferred.new(release)
     end
 
     def release!
       return if @releases.empty?
-      @releases.reverse.each do |r|
-        begin
-          r.call
-        rescue Exception
-          # ignore all exceptions ...
-          # no way to add "suppressed" exceptions to the exception already thrown
-        end
+      @releases.reverse.each do |d|
+        d.call
       end
       nil
     end

data/lib/deferral/version.rb

@@ -1,3 +1,3 @@
 module Deferral
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deferral
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - TAGOMORI Satoshi
@@ -66,6 +66,7 @@ files:
 - Rakefile
 - deferral.gemspec
 - lib/deferral.rb
+- lib/deferral/deferred.rb
 - lib/deferral/kernel_ext.rb
 - lib/deferral/stack_frame.rb
 - lib/deferral/toplevel.rb