merge revision(s) b176d4f52e: [Backport #21008]

[Bug #21008] Normalize before sum to float

	After switching to `Float`-mode when summing `Numeric` objects,
	normalization for `Float` is still needed.
This commit is contained in:
Takashi Kokubun 2025-01-14 18:00:02 -08:00
parent 12a0807965
commit 7b9caf19ba
3 changed files with 17 additions and 2 deletions

2
enum.c
View file

@ -4650,7 +4650,7 @@ sum_iter(VALUE i, struct enum_sum_memo *memo)
}
else switch (TYPE(memo->v)) {
default: sum_iter_some_value(i, memo); return;
case T_FLOAT: sum_iter_Kahan_Babuska(i, memo); return;
case T_FLOAT:
case T_FIXNUM:
case T_BIGNUM:
case T_RATIONAL:

View file

@ -1044,4 +1044,19 @@ class TestEnumerator < Test::Unit::TestCase
assert_raise(FrozenError) { e.feed 1 }
assert_raise(FrozenError) { e.rewind }
end
def test_sum_of_numeric
num = Class.new(Numeric) do
attr_reader :to_f
def initialize(val)
@to_f = Float(val)
end
end
ary = [5, 10, 20].map {|i| num.new(i)}
assert_equal(35.0, ary.sum)
enum = ary.each
assert_equal(35.0, enum.sum)
end
end

View file

@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 121
#define RUBY_PATCHLEVEL 122
#include "ruby/version.h"
#include "ruby/internal/abi.h"