diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-30 04:21:26 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-30 04:21:26 +0000 |
commit | dacc2c24363dbaaf58cc246e0ae1b8fa643b213e (patch) | |
tree | 0d1d46f4c4e412bf69783f8acf90f906eea218e7 /ext/-test- | |
parent | 4ce307aeee3e89b1bec5e275b253c198d12131d3 (diff) | |
download | ruby-dacc2c24363dbaaf58cc246e0ae1b8fa643b213e.tar.gz |
vm_eval.c: blockarg
* vm_eval.c (rb_yield_block): implement non-nil block argument.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/-test-')
-rw-r--r-- | ext/-test-/iter/break.c | 4 | ||||
-rw-r--r-- | ext/-test-/iter/extconf.rb | 8 | ||||
-rw-r--r-- | ext/-test-/iter/init.c | 11 | ||||
-rw-r--r-- | ext/-test-/iter/yield.c | 16 |
4 files changed, 36 insertions, 3 deletions
diff --git a/ext/-test-/iter/break.c b/ext/-test-/iter/break.c index 56ba7e7ffd..66ed26a9b8 100644 --- a/ext/-test-/iter/break.c +++ b/ext/-test-/iter/break.c @@ -17,9 +17,9 @@ iter_break_value(VALUE self, VALUE val) } void -Init_break(void) +Init_break(VALUE klass) { - VALUE breakable = rb_define_module_under(rb_define_module("Bug"), "Breakable"); + VALUE breakable = rb_define_module_under(klass, "Breakable"); rb_define_module_function(breakable, "iter_break", iter_break, 0); rb_define_module_function(breakable, "iter_break_value", iter_break_value, 1); } diff --git a/ext/-test-/iter/extconf.rb b/ext/-test-/iter/extconf.rb index 695b5e9f6d..0ba99691bd 100644 --- a/ext/-test-/iter/extconf.rb +++ b/ext/-test-/iter/extconf.rb @@ -1 +1,7 @@ -create_makefile("-test-/iter/break") +$INCFLAGS << " -I$(topdir) -I$(top_srcdir)" +$srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")] +inits = $srcs.map {|s| File.basename(s, ".*")} +inits.delete("init") +inits.map! {|s|"X(#{s})"} +$defs << "-DTEST_INIT_FUNCS(X)=\"#{inits.join(' ')}\"" +create_makefile("-test-/iter") diff --git a/ext/-test-/iter/init.c b/ext/-test-/iter/init.c new file mode 100644 index 0000000000..a074ec46a9 --- /dev/null +++ b/ext/-test-/iter/init.c @@ -0,0 +1,11 @@ +#include "ruby.h" + +#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);} + +void +Init_iter(void) +{ + VALUE mBug = rb_define_module("Bug"); + VALUE klass = rb_define_module_under(mBug, "Iter"); + TEST_INIT_FUNCS(init); +} diff --git a/ext/-test-/iter/yield.c b/ext/-test-/iter/yield.c new file mode 100644 index 0000000000..3cd408a928 --- /dev/null +++ b/ext/-test-/iter/yield.c @@ -0,0 +1,16 @@ +#include <ruby.h> + +static VALUE +yield_block(int argc, VALUE *argv, VALUE self) +{ + rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS); + return rb_block_call(self, rb_to_id(argv[0]), argc-1, argv+1, rb_yield_block, 0); +} + +void +Init_yield(VALUE klass) +{ + VALUE yield = rb_define_module_under(klass, "Yield"); + + rb_define_method(yield, "yield_block", yield_block, -1); +} |