* proc.c (proc_curry): new method. [ruby-dev:33676]

* test/ruby/test_proc.rb: add tests for above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 63 insertions, 0 deletions

diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb
index b5dbdc936c..53ccde0216 100644
--- a/test/ruby/test_proc.rb
+++ b/test/ruby/test_proc.rb
@@ -137,4 +137,67 @@ class TestProc < Test::Unit::TestCase
     assert_equal "OK", b.call
   end
 
+  def test_curry
+    b = proc {|x, y, z| (x||0) + (y||0) + (z||0) }
+    assert_equal(6, b.curry[1][2][3])
+    assert_equal(6, b.curry[1, 2][3, 4])
+    assert_equal(6, b.curry(5)[1][2][3][4][5])
+    assert_equal(6, b.curry(5)[1, 2][3, 4][5])
+    assert_equal(1, b.curry(1)[1])
+
+    b = proc {|x, y, z, *w| (x||0) + (y||0) + (z||0) + w.inject(0, &:+) }
+    assert_equal(6, b.curry[1][2][3])
+    assert_equal(10, b.curry[1, 2][3, 4])
+    assert_equal(15, b.curry(5)[1][2][3][4][5])
+    assert_equal(15, b.curry(5)[1, 2][3, 4][5])
+    assert_equal(1, b.curry(1)[1])
+
+    b = lambda {|x, y, z| (x||0) + (y||0) + (z||0) }
+    assert_equal(6, b.curry[1][2][3])
+    assert_raise(ArgumentError) { b.curry[1, 2][3, 4] }
+    assert_raise(ArgumentError) { b.curry(5) }
+    assert_raise(ArgumentError) { b.curry(1) }
+
+    b = lambda {|x, y, z, *w| (x||0) + (y||0) + (z||0) + w.inject(0, &:+) }
+    assert_equal(6, b.curry[1][2][3])
+    assert_equal(10, b.curry[1, 2][3, 4])
+    assert_equal(15, b.curry(5)[1][2][3][4][5])
+    assert_equal(15, b.curry(5)[1, 2][3, 4][5])
+    assert_raise(ArgumentError) { b.curry(1) }
+
+    b = proc { :foo }
+    assert_equal(:foo, b.curry[])
+  end
+ 
+  def test_curry_ski_fib
+    s = proc {|f, g, x| f[x][g[x]] }.curry
+    k = proc {|x, y| x }.curry
+    i = proc {|x| x }.curry
+
+    fib = []
+    inc = proc {|x| fib[-1] += 1; x }.curry
+    ret = proc {|x| throw :end if fib.size > 10; fib << 0; x }.curry
+
+    catch(:end) do
+      s[
+        s[s[i][i]][k[i]]
+      ][
+        k[inc]
+      ][
+        s[
+          s[
+            k[s]
+          ][
+            s[k[s[k[s]]]
+          ][
+            s[s[k[s]][s[k[s[k[ret]]]][s[k[s[i]]][k]]]][k]]
+          ]
+        ][
+          k[s[k[s]][k]]
+        ]
+      ]
+    end
+
+    assert_equal(fib, [1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89])
+  end
 end