kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* enum.c (enum_chunk): Deprecate the state management.

Browse source 
(enum_slice_before): Ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47653 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-09-20 15:01:44 +00:00
parent cc659d2f1b
commit 1292c5ec58
3 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Sep 20 23:58:21 2014 Tanaka Akira <akr@fsij.org>
* enum.c (enum_chunk): Deprecate the state management.
(enum_slice_before): Ditto.
Sat Sep 20 15:39:11 2014 Tanaka Akira <akr@fsij.org> Sat Sep 20 15:39:11 2014 Tanaka Akira <akr@fsij.org>
* enum.c (enum_slice_when): New method: Enumerable#slice_when. * enum.c (enum_slice_when): New method: Enumerable#slice_when.

4
NEWS
View file

@ -87,6 +87,10 @@ with all sufficient information, see the ChangeLog file.
=== Core classes compatibility issues (excluding feature bug fixes) === Core classes compatibility issues (excluding feature bug fixes)
* Enumerable
* Enumerable#slice_before's state management deprecated.
* Enumerable#chunk's state management deprecated.
* GC * GC
* incompatible changes: * incompatible changes:
* Rename GC.stat entries. [Feature #9924] * Rename GC.stat entries. [Feature #9924]

14
enum.c
View file

@ -2751,7 +2751,7 @@ chunk_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
/* /*
* call-seq: * call-seq:
* enum.chunk { |elt| ... } -> an_enumerator * enum.chunk { |elt| ... } -> an_enumerator
* enum.chunk(initial_state) { |elt, state| ... } -> an_enumerator * enum.chunk(initial_state) { |elt, state| ... } -> an_enumerator (deprecated)
* *
* Enumerates over the items, chunking them together based on the return * Enumerates over the items, chunking them together based on the return
* value of the block. * value of the block.
@ -2847,10 +2847,13 @@ enum_chunk(int argc, VALUE *argv, VALUE enumerable)
{ {
VALUE initial_state; VALUE initial_state;
VALUE enumerator; VALUE enumerator;
int n;
if (!rb_block_given_p()) if (!rb_block_given_p())
rb_raise(rb_eArgError, "no block given"); rb_raise(rb_eArgError, "no block given");
rb_scan_args(argc, argv, "01", &initial_state); n = rb_scan_args(argc, argv, "01", &initial_state);
if (n != 0)
rb_warn("initial_state given for chunk. (Use Enumerator.new with lexical scope variables.)");
enumerator = rb_obj_alloc(rb_cEnumerator); enumerator = rb_obj_alloc(rb_cEnumerator);
rb_ivar_set(enumerator, rb_intern("chunk_enumerable"), enumerable); rb_ivar_set(enumerator, rb_intern("chunk_enumerable"), enumerable);
@ -2926,7 +2929,7 @@ slicebefore_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
* call-seq: * call-seq:
* enum.slice_before(pattern) -> an_enumerator * enum.slice_before(pattern) -> an_enumerator
* enum.slice_before { |elt| bool } -> an_enumerator * enum.slice_before { |elt| bool } -> an_enumerator
* enum.slice_before(initial_state) { |elt, state| bool } -> an_enumerator * enum.slice_before(initial_state) { |elt, state| bool } -> an_enumerator (deprecated)
* *
* Creates an enumerator for each chunked elements. * Creates an enumerator for each chunked elements.
* The beginnings of chunks are defined by _pattern_ and the block. * The beginnings of chunks are defined by _pattern_ and the block.
@ -3066,7 +3069,10 @@ enum_slice_before(int argc, VALUE *argv, VALUE enumerable)
if (rb_block_given_p()) { if (rb_block_given_p()) {
VALUE initial_state; VALUE initial_state;
rb_scan_args(argc, argv, "01", &initial_state); int n;
n = rb_scan_args(argc, argv, "01", &initial_state);
if (n != 0)
rb_warn("initial_state given for slice_before. (Use Enumerator.new with lexical scope variables.)");
enumerator = rb_obj_alloc(rb_cEnumerator); enumerator = rb_obj_alloc(rb_cEnumerator);
rb_ivar_set(enumerator, rb_intern("slicebefore_sep_pred"), rb_block_proc()); rb_ivar_set(enumerator, rb_intern("slicebefore_sep_pred"), rb_block_proc());
rb_ivar_set(enumerator, rb_intern("slicebefore_initial_state"), initial_state); rb_ivar_set(enumerator, rb_intern("slicebefore_initial_state"), initial_state);