mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
complex.c: rb_complex prefix
* complex.c (rb_complex_plus, rb_complex_mul): rename to rb_complex prefix. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55645 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
92b98a982b
commit
89ed4f41a3
3 changed files with 8 additions and 8 deletions
|
@ -715,11 +715,11 @@ f_addsub(VALUE self, VALUE other,
|
||||||
* Complex(20, 9) + 9.8 #=> (29.8+9i)
|
* Complex(20, 9) + 9.8 #=> (29.8+9i)
|
||||||
*/
|
*/
|
||||||
VALUE
|
VALUE
|
||||||
rb_nucomp_add(VALUE self, VALUE other)
|
rb_complex_plus(VALUE self, VALUE other)
|
||||||
{
|
{
|
||||||
return f_addsub(self, other, f_add, '+');
|
return f_addsub(self, other, f_add, '+');
|
||||||
}
|
}
|
||||||
#define nucomp_add rb_nucomp_add
|
#define nucomp_add rb_complex_plus
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* call-seq:
|
* call-seq:
|
||||||
|
@ -765,7 +765,7 @@ safe_mul(VALUE a, VALUE b, int az, int bz)
|
||||||
* Complex(20, 9) * 9.8 #=> (196.0+88.2i)
|
* Complex(20, 9) * 9.8 #=> (196.0+88.2i)
|
||||||
*/
|
*/
|
||||||
VALUE
|
VALUE
|
||||||
rb_nucomp_mul(VALUE self, VALUE other)
|
rb_complex_mul(VALUE self, VALUE other)
|
||||||
{
|
{
|
||||||
if (k_complex_p(other)) {
|
if (k_complex_p(other)) {
|
||||||
VALUE real, imag;
|
VALUE real, imag;
|
||||||
|
@ -794,7 +794,7 @@ rb_nucomp_mul(VALUE self, VALUE other)
|
||||||
}
|
}
|
||||||
return rb_num_coerce_bin(self, other, '*');
|
return rb_num_coerce_bin(self, other, '*');
|
||||||
}
|
}
|
||||||
#define nucomp_mul rb_nucomp_mul
|
#define nucomp_mul rb_complex_mul
|
||||||
|
|
||||||
inline static VALUE
|
inline static VALUE
|
||||||
f_divide(VALUE self, VALUE other,
|
f_divide(VALUE self, VALUE other,
|
||||||
|
|
|
@ -901,8 +901,8 @@ CONSTFUNC(const char * rb_insns_name(int i));
|
||||||
VALUE rb_insns_name_array(void);
|
VALUE rb_insns_name_array(void);
|
||||||
|
|
||||||
/* complex.c */
|
/* complex.c */
|
||||||
VALUE rb_nucomp_add(VALUE, VALUE);
|
VALUE rb_complex_plus(VALUE, VALUE);
|
||||||
VALUE rb_nucomp_mul(VALUE, VALUE);
|
VALUE rb_complex_mul(VALUE, VALUE);
|
||||||
|
|
||||||
/* cont.c */
|
/* cont.c */
|
||||||
VALUE rb_obj_is_fiber(VALUE);
|
VALUE rb_obj_is_fiber(VALUE);
|
||||||
|
|
|
@ -3240,7 +3240,7 @@ fix_plus(VALUE x, VALUE y)
|
||||||
return DBL2NUM((double)FIX2LONG(x) + RFLOAT_VALUE(y));
|
return DBL2NUM((double)FIX2LONG(x) + RFLOAT_VALUE(y));
|
||||||
}
|
}
|
||||||
else if (RB_TYPE_P(y, T_COMPLEX)) {
|
else if (RB_TYPE_P(y, T_COMPLEX)) {
|
||||||
return rb_nucomp_add(y, x);
|
return rb_complex_plus(y, x);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return rb_num_coerce_bin(x, y, '+');
|
return rb_num_coerce_bin(x, y, '+');
|
||||||
|
@ -3342,7 +3342,7 @@ fix_mul(VALUE x, VALUE y)
|
||||||
return DBL2NUM((double)FIX2LONG(x) * RFLOAT_VALUE(y));
|
return DBL2NUM((double)FIX2LONG(x) * RFLOAT_VALUE(y));
|
||||||
}
|
}
|
||||||
else if (RB_TYPE_P(y, T_COMPLEX)) {
|
else if (RB_TYPE_P(y, T_COMPLEX)) {
|
||||||
return rb_nucomp_mul(y, x);
|
return rb_complex_mul(y, x);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return rb_num_coerce_bin(x, y, '*');
|
return rb_num_coerce_bin(x, y, '*');
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue