1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Merge pull request #24723 from lvl0nax/array_split_fix

Little perfomance fix for Array#split.
This commit is contained in:
Jeremy Daer 2016-04-26 11:41:16 -05:00
commit f03c27cad2
No known key found for this signature in database
GPG key ID: AB8F6399D5C60664
2 changed files with 14 additions and 10 deletions

View file

@ -100,17 +100,13 @@ class Array
results
end
else
results, arr = [[]], self.dup
until arr.empty?
if (idx = arr.index(value))
results.last.concat(arr.shift(idx))
arr.shift
results << []
else
results.last.concat(arr.shift(arr.size))
end
arr = self.dup
result = []
while (idx = arr.index(value))
result << arr.shift(idx)
arr.shift
end
results
result << arr
end
end
end

View file

@ -123,4 +123,12 @@ class SplitTest < ActiveSupport::TestCase
assert_equal [[], [2, 3, 4], []], a.split { |i| i == 1 || i == 5 }
assert_equal [1, 2, 3, 4, 5], a
end
def test_split_with_repeated_values
a = [1, 2, 3, 5, 5, 3, 4, 6, 2, 1, 3]
assert_equal [[1, 2], [5, 5], [4, 6, 2, 1], []], a.split(3)
assert_equal [[1, 2, 3], [], [3, 4, 6, 2, 1, 3]], a.split(5)
assert_equal [[1, 2], [], [], [], [4, 6, 2, 1], []], a.split { |i| i == 3 || i == 5 }
assert_equal [1, 2, 3, 5, 5, 3, 4, 6, 2, 1, 3], a
end
end