archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* enumerator.c (enumerator_allocate, enumerator_ptr): Properly

Browse source 
detect if the object is initialized and raise error when
  appropriate.
  (enumerator_initialize): Fix a typo in rdoc. [ruby-core:17052]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16769 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2008-06-03 04:03:15 +00:00
parent 0eb420cc78
commit 1434fc3fa8
3 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
enumerator.c
View file

@ -55,7 +55,7 @@ enumerator_ptr(obj)
"wrong argument type %s (expected Enumerable::Enumerator)",
rb_obj_classname(obj));
}
if (!ptr) {
if (!ptr || ptr->obj == Qundef) {
rb_raise(rb_eArgError, "uninitialized enumerator");
}
return ptr;
@ -214,8 +214,13 @@ enumerator_allocate(klass)
VALUE klass;
{
struct enumerator *ptr;
return Data_Make_Struct(klass, struct enumerator,
enumerator_mark, -1, ptr);
VALUE enum_obj;
enum_obj = Data_Make_Struct(klass, struct enumerator,
enumerator_mark, -1, ptr);
ptr->obj = Qundef;
return enum_obj;
}
static VALUE enumerator_each_i _((VALUE, VALUE));
@ -235,7 +240,13 @@ enumerator_init(enum_obj, obj, meth, argc, argv)
int argc;
VALUE *argv;
{
struct enumerator *ptr = enumerator_ptr(enum_obj);
struct enumerator *ptr;
Data_Get_Struct(enum_obj, struct enumerator, ptr);
if (!ptr) {
rb_raise(rb_eArgError, "unallocated enumerator");
}
ptr->obj = obj;
ptr->meth = rb_to_id(meth);
@ -253,8 +264,7 @@ enumerator_init(enum_obj, obj, meth, argc, argv)
* used as an Enumerable object using the given object's given
* method with the given arguments.
*
* Use of this method is not discouraged. Use Kernel#enum_for()
* instead.
* Use of this method is discouraged. Use Kernel#enum_for() instead.
*/
static VALUE
enumerator_initialize(argc, argv, obj)