archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 00:54:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) dc146babf47a84bbd1f176d766637d4a40327019,f23d5028059078a346efc977287b669d494a5a3f,a0f7de814ae5c299d6ce99bed5fb308a05d50ba0: [Backport #20296]

Browse source 
[Bug #20296] Clear errinfo when `exception: false`

	[Bug #20296] Refine the test

	[Bug #20296] Fix the default assertion message
This commit is contained in:
Takashi Kokubun 2024-05-29 11:00:27 -07:00
parent 22c1e5f126
commit 8f1084db9b
3 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
complex.c
View file

@ -2321,8 +2321,11 @@ nucomp_convert(VALUE klass, VALUE a1, VALUE a2, int raise)
return a1;
/* should raise exception for consistency */
if (!k_numeric_p(a1)) {
if (!raise)
return rb_protect(to_complex, a1, NULL);
if (!raise) {
a1 = rb_protect(to_complex, a1, NULL);
rb_set_errinfo(Qnil);
return a1;
}
return to_complex(a1);
}
}