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

* complex.c (read_comp): mathn compliant.

Browse source 
* rational.c (read_num): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37708 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2012-11-18 00:35:06 +00:00
parent 7a1985a969
commit 42d38decda
3 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
complex.c
View file

@ -1646,14 +1646,14 @@ read_comp(const char **s, int strict,
if (isimagunit(**s)) {
(*s)++;
num = INT2FIX((sign == '-') ? -1 : + 1);
*ret = rb_complex_raw2(ZERO, num);
*ret = rb_complex_new2(ZERO, num);
return 1; /* e.g. "i" */
}
if (!read_rat_nos(s, strict, b)) {
**b = '\0';
num = str2num(bb);
*ret = rb_complex_raw2(num, ZERO);
*ret = rb_complex_new2(num, ZERO);
return 0; /* e.g. "1/" */
}
**b = '\0';
@ -1661,7 +1661,7 @@ read_comp(const char **s, int strict,
if (isimagunit(**s)) {
(*s)++;
*ret = rb_complex_raw2(ZERO, num);
*ret = rb_complex_new2(ZERO, num);
return 1; /* e.g. "3i" */
}
@ -1674,7 +1674,7 @@ read_comp(const char **s, int strict,
**b = '\0';
if (strlen(bb) < 1 ||
!isdigit((unsigned char)*(bb + strlen(bb) - 1))) {
*ret = rb_complex_raw2(num, ZERO);
*ret = rb_complex_new2(num, ZERO);
return 0; /* e.g. "1@x" */
}
num2 = str2num(bb);
@ -1692,23 +1692,23 @@ read_comp(const char **s, int strict,
num2 = INT2FIX((sign == '-') ? -1 : + 1);
else {
if (!read_rat_nos(s, strict, b)) {
*ret = rb_complex_raw2(num, ZERO);
*ret = rb_complex_new2(num, ZERO);
return 0; /* e.g. "1+xi" */
}
**b = '\0';
num2 = str2num(bb);
}
if (!isimagunit(**s)) {
*ret = rb_complex_raw2(num, ZERO);
*ret = rb_complex_new2(num, ZERO);
return 0; /* e.g. "1+3x" */
}
(*s)++;
*ret = rb_complex_raw2(num, num2);
*ret = rb_complex_new2(num, num2);
return 1; /* e.g. "1+2i" */
}
/* !(@, - or +) */
{
*ret = rb_complex_raw2(num, ZERO);
*ret = rb_complex_new2(num, ZERO);
return 1; /* e.g. "3" */
}
}