Skip to content

Array#index more logical and add a rdoc extension to the README files #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

Array#index more logical and add a rdoc extension to the README files #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4b23810
The rb_ary_index method now return an array instead of a single index
robin850 Jun 10, 2012
2ad2ffa
Add a return statement in order to return the array which was build w…
robin850 Jun 10, 2012
3c2ae5a
Move README files with a markdown extension for more readability e.g.…
robin850 Jun 10, 2012
9a4dc02
Restore the previous version of the Array#index method and add a Arra…
robin850 Jun 10, 2012
dcc4939
Add some documentation for the Array#indexes method
robin850 Jun 12, 2012
0a272cd
Move once more readme rdoc file without the rdoc extension
robin850 Jun 14, 2012
3b44e74
Few changes in ordre to fix some typo (thanks to drbrain)
robin850 Jun 14, 2012
68e99d9
Fix a typo that could generate an error
robin850 Jun 14, 2012
69a6728
Add some tests for the Array#indexes method
robin850 Jun 14, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,6 +1242,50 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary)
return Qnil;
}


/*
* Call-seq:
*
* array.indexes(elem) -> array
*
* Returns an array of indexes of the word into the concerned array
*
* a = ["a", "b", "c", "a"]
* a.indexes("a") # => [0, 3]
* a.index_all("a") # => [0, 3]
* a.indexes("b") # => [1]
*
* This method also has an alias which is Array#index_all
*/
static VALUE
rb_ary_indexes(int argc, VALUE *argv, VALUE ary)
{

VALUE val;
long i;

if (argc > 0) {
RETURN_ENUMERATOR(ary, 0, 0);
array_length = 0;

for (i=0; i<RARRAY_LEN(ary); i++) {
if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) {
array_length++;
}
}

indexes = rb_ary_new2(array_length);
index = 0;

for (i=0; i<RARRAY_LEN(ary); i++) {
if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) {
indexes[index] = LONG2NUM(i);
index++;
}
}
return indexes;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since there is no return outside this if (argc == 0) { block, a "control reaches end of non-void function" error will be generated.

This will crash ruby. You should handle argc > 0 here.

}
/*
* call-seq:
* ary.rindex(obj) -> int or nil
Expand Down Expand Up @@ -5076,6 +5120,8 @@ Init_Array(void)
rb_define_method(rb_cArray, "empty?", rb_ary_empty_p, 0);
rb_define_method(rb_cArray, "find_index", rb_ary_index, -1);
rb_define_method(rb_cArray, "index", rb_ary_index, -1);
rb_define_method(rb_cArray, "indexes", rb_ary_indexes, -1);
rb_define_method(rb_cArray, "index_all", rb_ary_indexes, -1);
rb_define_method(rb_cArray, "rindex", rb_ary_rindex, -1);
rb_define_method(rb_cArray, "join", rb_ary_join_m, -1);
rb_define_method(rb_cArray, "reverse", rb_ary_reverse_m, 0);
Expand Down
7 changes: 7 additions & 0 deletions test/ruby/test_array.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,6 +883,13 @@ def test_index
assert_equal(1, a.index(99) {|x| x == 'cat' })
end

def test_indexes
a = @cls[ 'cat', 99, /a/, 99, @cls[ 1, 2, 3] ]
assert_equal(@cls[1, 3], a.indexes(99))
assert_equal(@cls[], a.indexes('car'))
assert_equal(@cls[4], a.indexes([1,2,3]))
end

def test_values_at
a = @cls[*('a'..'j').to_a]
assert_equal(@cls['a', 'c', 'e'], a.values_at(0, 2, 4))
Expand Down