diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-12-11 03:48:08 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-12-11 03:48:08 +0000 |
commit | a59c599209a11d4ab0dc0d7626ab3d5ca43a78c2 (patch) | |
tree | f4c4400099a7feb51a7b303cbedc0e1f04714f43 /struct.c | |
parent | 8a91c99905c1bfbf441ec890161538acc8e34120 (diff) |
* string.c (rb_str_match_m): should convert an argument into
regexp if it's a string.
* array.c (rb_ary_select): Array#select(n,m,...) now works like
Array#indexes(n,m,..). [new, experimental]
* hash.c (rb_hash_select): ditto.
* hash.c (env_select): ditto.
* re.c (match_select): ditto.
* struct.c (rb_struct_select): ditto.
* gc.c (STR_ASSOC): use FL_USER3 instead of FL_USER2.
* parse.y (str_extend): make up pushback call.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1905 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'struct.c')
-rw-r--r-- | struct.c | 29 |
1 files changed, 29 insertions, 0 deletions
@@ -507,6 +507,34 @@ rb_struct_aset(s, idx, val) return RSTRUCT(s)->ptr[i] = val; } + +static VALUE +rb_struct_select(argc, argv, s) + int argc; + VALUE *argv; + VALUE s; +{ + VALUE result = rb_ary_new(); + long i; + + if (rb_block_given_p()) { + if (argc > 0) { + rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc); + } + for (i = 0; i < RSTRUCT(s)->len; i++) { + if (RTEST(rb_yield(RARRAY(s)->ptr[i]))) { + rb_ary_push(result, RSTRUCT(s)->ptr[i]); + } + } + } + else { + for (i=0; i<argc; i++) { + rb_ary_push(result, rb_struct_aref(s, argv[i])); + } + } + return result; +} + static VALUE rb_struct_equal(s, s2) VALUE s, s2; @@ -556,6 +584,7 @@ Init_Struct() rb_define_method(rb_cStruct, "each", rb_struct_each, 0); rb_define_method(rb_cStruct, "[]", rb_struct_aref, 1); rb_define_method(rb_cStruct, "[]=", rb_struct_aset, 2); + rb_define_method(rb_cStruct, "select", rb_struct_select, -1); rb_define_method(rb_cStruct, "members", rb_struct_members, 0); } |