1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* proc.c (make_curry_proc): should propagate lambda-ness.

Browse Source 
[ruby-core:24127]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23970 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-07-06 00:31:55 +00:00
parent 4256968488
commit 06b9094f96
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,4 +1,7 @@
Mon Jul 6 09:23:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Jul 6 09:31:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* proc.c (make_curry_proc): should propagate lambda-ness.
[ruby-core:24127]
* proc.c (proc_hash): use long. * proc.c (proc_hash): use long.

12
proc.c
View File

@ -1765,9 +1765,17 @@ static VALUE
make_curry_proc(VALUE proc, VALUE passed, VALUE arity) make_curry_proc(VALUE proc, VALUE passed, VALUE arity)
{ {
VALUE args = rb_ary_new3(3, proc, passed, arity); VALUE args = rb_ary_new3(3, proc, passed, arity);
rb_proc_t *procp;
int is_lambda;
GetProcPtr(proc, procp);
is_lambda = procp->is_lambda;
rb_ary_freeze(passed); rb_ary_freeze(passed);
rb_ary_freeze(args); rb_ary_freeze(args);
return rb_proc_new(curry, args); proc = rb_proc_new(curry, args);
GetProcPtr(proc, procp);
procp->is_lambda = is_lambda;
return proc;
} }
static VALUE static VALUE
@ -1781,7 +1789,7 @@ curry(VALUE dummy, VALUE args, int argc, VALUE *argv, VALUE passed_proc)
passed = rb_ary_plus(passed, rb_ary_new4(argc, argv)); passed = rb_ary_plus(passed, rb_ary_new4(argc, argv));
rb_ary_freeze(passed); rb_ary_freeze(passed);
if(RARRAY_LEN(passed) < FIX2INT(arity)) { if (RARRAY_LEN(passed) < FIX2INT(arity)) {
if (!NIL_P(passed_proc)) { if (!NIL_P(passed_proc)) {
rb_warn("given block not used"); rb_warn("given block not used");
} }

7
test/ruby/test_proc.rb
View File

@ -181,6 +181,13 @@ class TestProc < Test::Unit::TestCase
b = b.call(2) { raise } b = b.call(2) { raise }
b = b.call(3) {|x| x + 4 } b = b.call(3) {|x| x + 4 }
assert_equal(9, b) assert_equal(9, b)
l = proc {}
assert_equal(false, l.lambda?)
assert_equal(false, l.curry.lambda?, '[ruby-core:24127]')
l = lambda {}
assert_equal(true, l.lambda?)
assert_equal(true, l.curry.lambda?, '[ruby-core:24127]')
end end
def test_curry_ski_fib def test_curry_ski_fib