mame-dynamicwind 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.0.1 / 2008-11-21
+* lib/dynamicwind.rb (dynamicwind, __switch): before/after procs should be
+  called in a dynamic context of a corresponding dynamicwind.
+
+* test/test_dynamicwind.rb: add some tests.
+
 === 1.0.0 / 2008-11-20
 
 * 1 major enhancement

data/lib/dynamicwind.rb

@@ -4,7 +4,7 @@ rescue LoadError
 end
 
 module DynamicWind
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   Stack = Struct.new(:fst, :snd, :next)
 
@@ -18,8 +18,17 @@ module DynamicWind
   end
 
   def dynamicwind(before, thunk, after)
+    before_ = after_ = nil
+    if ctn_before = __callcc_orig {|c| before_ = c; false }
+      before.call
+      ctn_before.call
+    end
+    if ctn_after = __callcc_orig {|c| after_ = c; false }
+      after.call
+      ctn_after.call
+    end
     mark = __top
-    __switch(Stack[[before, nil], [nil, after], mark])
+    __switch(Stack[[before_, nil], [nil, after_], mark])
     thunk.call ensure __switch(mark)
   end
 
@@ -35,7 +44,7 @@ module DynamicWind
     return if __top.equal?(mark)
     __switch(mark.next)
     fst, snd = mark.fst, mark.snd
-    fst.first.call if fst.first
+    __callcc_orig {|c| fst.first.call(c) } if fst.first
     __top.fst = snd
     __top.snd = fst
     __top.next = mark
@@ -43,7 +52,7 @@ module DynamicWind
     __top.fst = nil
     __top.snd = nil
     __top.next = nil
-    fst.last.call if fst.last
+    __callcc_orig {|c| fst.last.call(c) } if fst.last
   end
 end
 

data/test/test_dynamicwind.rb

@@ -73,7 +73,172 @@ class TestDynamicWind < Test::Unit::TestCase
     assert_equal([:before, :thunk1, :thunk2, :after, :end, :before, :thunk3, :after, :end], ary)
   end
 
-  def test_callcc_in_before
+  def test_jump_from_before_to_before
+    ary = []
+    ctn = nil
+    i = 0
+    while i <= 1
+      dynamicwind(
+        proc do
+          ary << :before1
+          ctn.call if ctn
+          ary << :before2
+          callcc {|c| ctn = c }
+          ary << :before3
+        end,
+        proc { ary << :thunk },
+        proc { ary << :after }
+      )
+      ary << :end
+      i += 1
+    end
+    assert_equal([:before1, :before2, :before3, :thunk, :after, :end, :before1, :before3, :thunk, :after, :end], ary)
+  end
+
+  def test_jump_from_before_to_thunk
+    ary = []
+    ctn = nil
+    flag = true
+    i = 0
+    while i <= 1
+      dynamicwind(
+        proc do
+          ary << :before1
+          (flag = false; ctn.call) if ctn && flag
+          ary << :before2
+        end,
+        proc do
+          ary << :thunk1
+          callcc {|c| ctn = c }
+          ary << :thunk2
+        end,
+        proc { ary << :after }
+      )
+      ary << :end
+      i += 1
+    end
+    assert_equal([:before1, :before2, :thunk1, :thunk2, :after, :end, :before1, :before1, :before2, :thunk2, :after, :end], ary)
+  end
+
+  def test_jump_from_before_to_after
+    ary = []
+    ctn = nil
+    i = 0
+    while i <= 1
+      dynamicwind(
+        proc do
+          ary << :before1
+          ctn.call if ctn
+          ary << :before2
+        end,
+        proc { ary << :thunk },
+        proc do
+          ary << :after1
+          callcc {|c| ctn = c }
+          ary << :after2
+        end
+      )
+      ary << :end
+      i += 1
+    end
+    assert_equal([:before1, :before2, :thunk, :after1, :after2, :end, :before1, :after2, :end], ary)
+  end
+
+  def test_jump_from_thunk_to_before
+    ary = []
+    ctn = nil
+    flag = true
+    dynamicwind(
+      proc do
+        ary << :before1
+        callcc {|c| ctn = c }
+        ary << :before2
+      end,
+      proc do
+        ary << :thunk1
+        (flag = false; ctn.call) if flag
+        ary << :thunk2
+      end,
+      proc { ary << :after }
+    )
+    assert_equal([:before1, :before2, :thunk1, :after, :before2, :thunk1, :thunk2, :after], ary)
+  end
+
+  def test_jump_from_thunk_to_before_2
+    ary = []
+    ctn = nil
+    flag = true
+    i = 0
+    while i <= 1
+      dynamicwind(
+        proc do
+          ary << :before1
+          callcc {|c| ctn = c } if i == 0
+          ary << :before2
+        end,
+        proc do
+          ary << :thunk1
+          (flag = false; ctn.call) if i == 1 && flag
+          ary << :thunk2
+        end,
+        proc { ary << :after }
+      )
+      ary << :end
+      i += 1
+    end
+    assert_equal([:before1, :before2, :thunk1, :thunk2, :after, :end, :before1, :before2, :thunk1, :after, :before2, :thunk1, :thunk2, :after, :end], ary)
+  end
+
+  def test_jump_from_thunk_to_thunk
+    ary = []
+    ctn = nil
+    flag = true
+    i = 0
+    while i <= 1
+      dynamicwind(
+        proc do
+          ary << :before1
+          callcc {|c| ctn = c } if i == 0
+          ary << :before2
+        end,
+        proc do
+          ary << :thunk1
+          (flag = false; ctn.call) if i == 1 && flag
+          ary << :thunk2
+        end,
+        proc { ary << :after }
+      )
+      ary << :end
+      i += 1
+    end
+    assert_equal([:before1, :before2, :thunk1, :thunk2, :after, :end, :before1, :before2, :thunk1, :after, :before2, :thunk1, :thunk2, :after, :end], ary)
+  end
+
+  def test_jump_from_thunk_to_after
+    ary = []
+    ctn = nil
+    i = 0
+    while i <= 1
+      dynamicwind(
+        proc { ary << :before },
+        proc do
+          ary << :thunk1
+          ctn.call if ctn
+          ary << :thunk2
+        end,
+        proc do
+          ary << :after1
+          callcc {|c| ctn = c }
+          ary << :after2
+        end
+      )
+      ary << :end
+      i += 1
+    end
+    assert_equal([:before, :thunk1, :thunk2, :after1, :after2, :end, :before, :thunk1, :after1, :after2, :after2, :end], ary)
+  end
+
+  def test_jump_from_after_to_before
     ary = []
     ctn = nil
     flag = true
@@ -93,6 +258,98 @@ class TestDynamicWind < Test::Unit::TestCase
     assert_equal([:before1, :before2, :thunk, :after1, :before2, :thunk, :after1, :after2], ary)
   end
 
+  def test_jump_from_after_to_before_2
+    ary = []
+    ctn = nil
+    flag = true
+    i = 0
+    while i <= 1
+      dynamicwind(
+        proc do
+          ary << :before1
+          callcc {|c| ctn = c } if i == 0
+          ary << :before2
+        end,
+        proc { ary << :thunk },
+        proc do
+          ary << :after1
+          (flag = false; ctn.call) if i == 1 && flag
+          ary << :after2
+        end
+      )
+      ary << :end
+      i += 1
+    end
+    assert_equal([:before1, :before2, :thunk, :after1, :after2, :end, :before1, :before2, :thunk, :after1, :before2, :thunk, :after1, :after2, :end], ary)
+  end
+
+  def test_jump_from_after_to_thunk
+    ary = []
+    ctn = nil
+    flag = true
+    dynamicwind(
+      proc { ary << :before },
+      proc do
+        ary << :thunk1
+        callcc {|c| ctn = c }
+        ary << :thunk2
+      end,
+      proc do
+        ary << :after1
+        (flag = false; ctn.call) if flag
+        ary << :after2
+      end
+    )
+    assert_equal([:before, :thunk1, :thunk2, :after1, :before, :thunk2, :after1, :after2], ary)
+  end
+
+  def test_jump_from_after_to_thunk_2
+    ary = []
+    ctn = nil
+    flag = true
+    i = 0
+    while i <= 1
+      dynamicwind(
+        proc { ary << :before },
+        proc do
+          ary << :thunk1
+          callcc {|c| ctn = c } if i == 0
+          ary << :thunk2
+        end,
+        proc do
+          ary << :after1
+          (flag = false; ctn.call) if i == 1 && flag
+          ary << :after2
+        end
+      )
+      ary << :end
+      i += 1
+    end
+    assert_equal([:before, :thunk1, :thunk2, :after1, :after2, :end, :before, :thunk1, :thunk2, :after1, :before, :thunk2, :after1, :after2, :end], ary)
+  end
+
+  def test_jump_from_after_to_after
+    ary = []
+    ctn = nil
+    i = 0
+    while i <= 1
+      dynamicwind(
+        proc { ary << :before },
+        proc { ary << :thunk },
+        proc do
+          ary << :after1
+          ctn.call if ctn
+          ary << :after2
+          callcc {|c| ctn = c }
+          ary << :after3
+        end
+      )
+      ary << :end
+      i += 1
+    end
+    assert_equal([:before, :thunk, :after1, :after2, :after3, :end, :before, :thunk, :after1, :after3, :end], ary)
+  end
+
   def test_raise
     ary = []
     assert_raise(RuntimeError) do
@@ -185,4 +442,77 @@ class TestDynamicWind < Test::Unit::TestCase
     (flag = false; c2.call) if flag
     assert_equal([:before1, :before2, :thunk1, :after2, :after1, :end, :before1, :before2, :thunk2, :after2, :after1, :end], ary)
   end
+
+  def test_raise_in_before
+    ary = []
+    ctn = nil
+    flag = true
+    begin
+      dynamicwind(
+        proc do
+          ary << :before
+          raise if ctn
+        end,
+        proc do
+          ary << :thunk1
+          callcc {|c| ctn = c }
+          ary << :thunk2
+        end,
+        proc { ary << :after }
+      )
+      ary << :normal
+    rescue
+      ary << :exception
+    end
+    ary << :end
+    assert_nothing_raised { flag = false; ctn.call } if flag
+    assert_equal([:before, :thunk1, :thunk2, :after, :normal, :end, :before, :exception, :end], ary)
+  end
+
+  def test_raise_in_after
+    ary = []
+    ctn = nil
+    assert_nothing_raised do
+      dynamicwind(
+        proc { ary << :before1 },
+        proc do
+          ary << :thunk1
+          callcc {|c| ctn = c }
+          ary << :thunk2
+        end,
+        proc { ary << :after1 }
+      )
+    end
+    ary << :between
+    begin
+      dynamicwind(
+        proc { ary << :before2 },
+        proc do
+          ary << :thunk3
+          assert_nothing_raised { ctn.call }
+        end,
+        proc { ary << :after2; raise }
+      )
+    rescue
+      ary << :exception
+    end
+    ary << :end
+    assert_equal([:before1, :thunk1, :thunk2, :after1, :between, :before2, :thunk3, :after2, :exception, :end], ary)
+  end
+
+  def test_callcc_in_thunk
+    ary = []
+    dynamicwind(
+      proc { ary << :before },
+      proc do
+        callcc do |c|
+          ary << :thunk1
+          c.call
+          ary << :thunk2
+        end
+      end,
+      proc { ary << :after }
+    )
+    assert_equal([:before, :thunk1, :after], ary)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mame-dynamicwind
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Yusuke Endoh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-20 00:00:00 -08:00
+date: 2008-11-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency