diff options
Diffstat (limited to 'complex.c')
| -rw-r--r-- | complex.c | 1329 |
1 files changed, 775 insertions, 554 deletions
@@ -5,32 +5,50 @@ which is written in ruby. */ -#include "internal.h" +#include "ruby/internal/config.h" + +#if defined _MSC_VER +/* Microsoft Visual C does not define M_PI and others by default */ +# define _USE_MATH_DEFINES 1 +#endif + +#include <ctype.h> #include <math.h> -#define NDEBUG -#include <assert.h> +#include "id.h" +#include "internal.h" +#include "internal/array.h" +#include "internal/class.h" +#include "internal/complex.h" +#include "internal/math.h" +#include "internal/numeric.h" +#include "internal/object.h" +#include "internal/rational.h" +#include "ruby_assert.h" #define ZERO INT2FIX(0) #define ONE INT2FIX(1) #define TWO INT2FIX(2) +#if USE_FLONUM +#define RFLOAT_0 DBL2NUM(0) +#else +static VALUE RFLOAT_0; +#endif VALUE rb_cComplex; -static ID id_abs, id_arg, id_convert, - id_denominator, id_eqeq_p, id_expt, id_fdiv, - id_negate, id_numerator, id_quo, - id_real_p, id_to_f, id_to_i, id_to_r, - id_i_real, id_i_imag; - -#define f_boolcast(x) ((x) ? Qtrue : Qfalse) - -#define binop(n,op) \ -inline static VALUE \ -f_##n(VALUE x, VALUE y)\ -{\ - return rb_funcall(x, (op), 1, y);\ -} +static ID id_abs, id_arg, + id_denominator, id_numerator, + id_real_p, id_i_real, id_i_imag, + id_finite_p, id_infinite_p, id_rationalize, + id_PI; +#define id_to_i idTo_i +#define id_to_r idTo_r +#define id_negate idUMinus +#define id_expt idPow +#define id_to_f idTo_f +#define id_quo idQuo +#define id_fdiv idFdiv #define fun1(n) \ inline static VALUE \ @@ -46,31 +64,32 @@ f_##n(VALUE x, VALUE y)\ return rb_funcall(x, id_##n, 1, y);\ } -#define math1(n) \ -inline static VALUE \ -m_##n(VALUE x)\ -{\ - return rb_funcall(rb_mMath, id_##n, 1, x);\ -} - -#define math2(n) \ -inline static VALUE \ -m_##n(VALUE x, VALUE y)\ -{\ - return rb_funcall(rb_mMath, id_##n, 2, x, y);\ -} - #define PRESERVE_SIGNEDZERO inline static VALUE f_add(VALUE x, VALUE y) { -#ifndef PRESERVE_SIGNEDZERO - if (FIXNUM_P(y) && FIX2LONG(y) == 0) - return x; - else if (FIXNUM_P(x) && FIX2LONG(x) == 0) - return y; -#endif + if (RB_INTEGER_TYPE_P(x) && + LIKELY(rb_method_basic_definition_p(rb_cInteger, idPLUS))) { + if (FIXNUM_ZERO_P(x)) + return y; + if (FIXNUM_ZERO_P(y)) + return x; + return rb_int_plus(x, y); + } + else if (RB_FLOAT_TYPE_P(x) && + LIKELY(rb_method_basic_definition_p(rb_cFloat, idPLUS))) { + if (FIXNUM_ZERO_P(y)) + return x; + return rb_float_plus(x, y); + } + else if (RB_TYPE_P(x, T_RATIONAL) && + LIKELY(rb_method_basic_definition_p(rb_cRational, idPLUS))) { + if (FIXNUM_ZERO_P(y)) + return x; + return rb_rational_plus(x, y); + } + return rb_funcall(x, '+', 1, y); } @@ -82,56 +101,162 @@ f_div(VALUE x, VALUE y) return rb_funcall(x, '/', 1, y); } -inline static VALUE +inline static int f_gt_p(VALUE x, VALUE y) { - if (FIXNUM_P(x) && FIXNUM_P(y)) - return f_boolcast(FIX2LONG(x) > FIX2LONG(y)); - return rb_funcall(x, '>', 1, y); + if (RB_INTEGER_TYPE_P(x)) { + if (FIXNUM_P(x) && FIXNUM_P(y)) + return (SIGNED_VALUE)x > (SIGNED_VALUE)y; + return RTEST(rb_int_gt(x, y)); + } + else if (RB_FLOAT_TYPE_P(x)) + return RTEST(rb_float_gt(x, y)); + else if (RB_TYPE_P(x, T_RATIONAL)) { + int const cmp = rb_cmpint(rb_rational_cmp(x, y), x, y); + return cmp > 0; + } + return RTEST(rb_funcall(x, '>', 1, y)); } inline static VALUE f_mul(VALUE x, VALUE y) { -#ifndef PRESERVE_SIGNEDZERO - if (FIXNUM_P(y)) { - long iy = FIX2LONG(y); - if (iy == 0) { - if (FIXNUM_P(x) || RB_TYPE_P(x, T_BIGNUM)) - return ZERO; - } - else if (iy == 1) - return x; - } - else if (FIXNUM_P(x)) { - long ix = FIX2LONG(x); - if (ix == 0) { - if (FIXNUM_P(y) || RB_TYPE_P(y, T_BIGNUM)) - return ZERO; - } - else if (ix == 1) - return y; + if (RB_INTEGER_TYPE_P(x) && + LIKELY(rb_method_basic_definition_p(rb_cInteger, idMULT))) { + if (FIXNUM_ZERO_P(y)) + return ZERO; + if (FIXNUM_ZERO_P(x) && RB_INTEGER_TYPE_P(y)) + return ZERO; + if (x == ONE) return y; + if (y == ONE) return x; + return rb_int_mul(x, y); + } + else if (RB_FLOAT_TYPE_P(x) && + LIKELY(rb_method_basic_definition_p(rb_cFloat, idMULT))) { + if (y == ONE) return x; + return rb_float_mul(x, y); + } + else if (RB_TYPE_P(x, T_RATIONAL) && + LIKELY(rb_method_basic_definition_p(rb_cRational, idMULT))) { + if (y == ONE) return x; + return rb_rational_mul(x, y); + } + else if (LIKELY(rb_method_basic_definition_p(CLASS_OF(x), idMULT))) { + if (y == ONE) return x; } -#endif return rb_funcall(x, '*', 1, y); } inline static VALUE f_sub(VALUE x, VALUE y) { -#ifndef PRESERVE_SIGNEDZERO - if (FIXNUM_P(y) && FIX2LONG(y) == 0) + if (FIXNUM_ZERO_P(y) && + LIKELY(rb_method_basic_definition_p(CLASS_OF(x), idMINUS))) { return x; -#endif + } return rb_funcall(x, '-', 1, y); } -fun1(abs) -fun1(arg) -fun1(denominator) -fun1(negate) -fun1(numerator) -fun1(real_p) +inline static VALUE +f_abs(VALUE x) +{ + if (RB_INTEGER_TYPE_P(x)) { + return rb_int_abs(x); + } + else if (RB_FLOAT_TYPE_P(x)) { + return rb_float_abs(x); + } + else if (RB_TYPE_P(x, T_RATIONAL)) { + return rb_rational_abs(x); + } + else if (RB_TYPE_P(x, T_COMPLEX)) { + return rb_complex_abs(x); + } + return rb_funcall(x, id_abs, 0); +} + +static VALUE numeric_arg(VALUE self); +static VALUE float_arg(VALUE self); + +inline static VALUE +f_arg(VALUE x) +{ + if (RB_INTEGER_TYPE_P(x)) { + return numeric_arg(x); + } + else if (RB_FLOAT_TYPE_P(x)) { + return float_arg(x); + } + else if (RB_TYPE_P(x, T_RATIONAL)) { + return numeric_arg(x); + } + else if (RB_TYPE_P(x, T_COMPLEX)) { + return rb_complex_arg(x); + } + return rb_funcall(x, id_arg, 0); +} + +inline static VALUE +f_numerator(VALUE x) +{ + if (RB_TYPE_P(x, T_RATIONAL)) { + return RRATIONAL(x)->num; + } + if (RB_FLOAT_TYPE_P(x)) { + return rb_float_numerator(x); + } + return x; +} + +inline static VALUE +f_denominator(VALUE x) +{ + if (RB_TYPE_P(x, T_RATIONAL)) { + return RRATIONAL(x)->den; + } + if (RB_FLOAT_TYPE_P(x)) { + return rb_float_denominator(x); + } + return INT2FIX(1); +} + +inline static VALUE +f_negate(VALUE x) +{ + if (RB_INTEGER_TYPE_P(x)) { + return rb_int_uminus(x); + } + else if (RB_FLOAT_TYPE_P(x)) { + return rb_float_uminus(x); + } + else if (RB_TYPE_P(x, T_RATIONAL)) { + return rb_rational_uminus(x); + } + else if (RB_TYPE_P(x, T_COMPLEX)) { + return rb_complex_uminus(x); + } + return rb_funcall(x, id_negate, 0); +} + +static bool nucomp_real_p(VALUE self); + +static inline bool +f_real_p(VALUE x) +{ + if (RB_INTEGER_TYPE_P(x)) { + return true; + } + else if (RB_FLOAT_TYPE_P(x)) { + return true; + } + else if (RB_TYPE_P(x, T_RATIONAL)) { + return true; + } + else if (RB_TYPE_P(x, T_COMPLEX)) { + return nucomp_real_p(x); + } + return rb_funcall(x, id_real_p, 0); +} inline static VALUE f_to_i(VALUE x) @@ -140,6 +265,7 @@ f_to_i(VALUE x) return rb_str_to_inum(x, 10, 0); return rb_funcall(x, id_to_i, 0); } + inline static VALUE f_to_f(VALUE x) { @@ -150,122 +276,117 @@ f_to_f(VALUE x) fun1(to_r) -inline static VALUE +inline static int f_eqeq_p(VALUE x, VALUE y) { if (FIXNUM_P(x) && FIXNUM_P(y)) - return f_boolcast(FIX2LONG(x) == FIX2LONG(y)); - return rb_funcall(x, id_eqeq_p, 1, y); + return x == y; + else if (RB_FLOAT_TYPE_P(x) || RB_FLOAT_TYPE_P(y)) + return NUM2DBL(x) == NUM2DBL(y); + return (int)rb_equal(x, y); } fun2(expt) fun2(fdiv) -fun2(quo) -inline static VALUE +static VALUE +f_quo(VALUE x, VALUE y) +{ + if (RB_INTEGER_TYPE_P(x)) + return rb_numeric_quo(x, y); + if (RB_FLOAT_TYPE_P(x)) + return rb_float_div(x, y); + if (RB_TYPE_P(x, T_RATIONAL)) + return rb_numeric_quo(x, y); + + return rb_funcallv(x, id_quo, 1, &y); +} + +inline static int f_negative_p(VALUE x) { - if (FIXNUM_P(x)) - return f_boolcast(FIX2LONG(x) < 0); - return rb_funcall(x, '<', 1, ZERO); + if (RB_INTEGER_TYPE_P(x)) + return INT_NEGATIVE_P(x); + else if (RB_FLOAT_TYPE_P(x)) + return RFLOAT_VALUE(x) < 0.0; + else if (RB_TYPE_P(x, T_RATIONAL)) + return INT_NEGATIVE_P(RRATIONAL(x)->num); + return rb_num_negative_p(x); } #define f_positive_p(x) (!f_negative_p(x)) -inline static VALUE +inline static int f_zero_p(VALUE x) { - if (RB_TYPE_P(x, T_FIXNUM)) { - return f_boolcast(FIX2LONG(x) == 0); + if (RB_FLOAT_TYPE_P(x)) { + return FLOAT_ZERO_P(x); } - else if (RB_TYPE_P(x, T_BIGNUM)) { - return Qfalse; + else if (RB_INTEGER_TYPE_P(x)) { + return FIXNUM_ZERO_P(x); } else if (RB_TYPE_P(x, T_RATIONAL)) { - VALUE num = RRATIONAL(x)->num; - - return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 0); + const VALUE num = RRATIONAL(x)->num; + return FIXNUM_ZERO_P(num); } - return rb_funcall(x, id_eqeq_p, 1, ZERO); + return (int)rb_equal(x, ZERO); } #define f_nonzero_p(x) (!f_zero_p(x)) -inline static VALUE -f_one_p(VALUE x) +static inline bool +always_finite_type_p(VALUE x) +{ + if (FIXNUM_P(x)) return true; + if (FLONUM_P(x)) return true; /* Infinity can't be a flonum */ + return (RB_INTEGER_TYPE_P(x) || RB_TYPE_P(x, T_RATIONAL)); +} + +inline static int +f_finite_p(VALUE x) { - if (RB_TYPE_P(x, T_FIXNUM)) { - return f_boolcast(FIX2LONG(x) == 1); + if (always_finite_type_p(x)) { + return TRUE; } - else if (RB_TYPE_P(x, T_BIGNUM)) { - return Qfalse; + else if (RB_FLOAT_TYPE_P(x)) { + return isfinite(RFLOAT_VALUE(x)); } - else if (RB_TYPE_P(x, T_RATIONAL)) { - VALUE num = RRATIONAL(x)->num; - VALUE den = RRATIONAL(x)->den; + return RTEST(rb_funcallv(x, id_finite_p, 0, 0)); +} - return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 1 && - FIXNUM_P(den) && FIX2LONG(den) == 1); +inline static int +f_infinite_p(VALUE x) +{ + if (always_finite_type_p(x)) { + return FALSE; + } + else if (RB_FLOAT_TYPE_P(x)) { + return isinf(RFLOAT_VALUE(x)); } - return rb_funcall(x, id_eqeq_p, 1, ONE); + return RTEST(rb_funcallv(x, id_infinite_p, 0, 0)); } -inline static VALUE +inline static int f_kind_of_p(VALUE x, VALUE c) { - return rb_obj_is_kind_of(x, c); + return (int)rb_obj_is_kind_of(x, c); } -inline static VALUE +inline static int k_numeric_p(VALUE x) { return f_kind_of_p(x, rb_cNumeric); } -inline static VALUE -k_fixnum_p(VALUE x) -{ - return f_kind_of_p(x, rb_cFixnum); -} - -inline static VALUE -k_bignum_p(VALUE x) -{ - return f_kind_of_p(x, rb_cBignum); -} - -inline static VALUE -k_float_p(VALUE x) -{ - return f_kind_of_p(x, rb_cFloat); -} - -inline static VALUE -k_rational_p(VALUE x) -{ - return f_kind_of_p(x, rb_cRational); -} - -inline static VALUE -k_complex_p(VALUE x) -{ - return f_kind_of_p(x, rb_cComplex); -} - -#define k_exact_p(x) (!k_float_p(x)) -#define k_inexact_p(x) k_float_p(x) +#define k_exact_p(x) (!RB_FLOAT_TYPE_P(x)) #define k_exact_zero_p(x) (k_exact_p(x) && f_zero_p(x)) -#define k_exact_one_p(x) (k_exact_p(x) && f_one_p(x)) #define get_dat1(x) \ - struct RComplex *dat;\ - dat = ((struct RComplex *)(x)) + struct RComplex *dat = RCOMPLEX(x) #define get_dat2(x,y) \ - struct RComplex *adat, *bdat;\ - adat = ((struct RComplex *)(x));\ - bdat = ((struct RComplex *)(y)) + struct RComplex *adat = RCOMPLEX(x), *bdat = RCOMPLEX(y) inline static VALUE nucomp_s_new_internal(VALUE klass, VALUE real, VALUE imag) @@ -274,6 +395,7 @@ nucomp_s_new_internal(VALUE klass, VALUE real, VALUE imag) RCOMPLEX_SET_REAL(obj, real); RCOMPLEX_SET_IMAG(obj, imag); + OBJ_FREEZE_RAW((VALUE)obj); return (VALUE)obj; } @@ -284,65 +406,26 @@ nucomp_s_alloc(VALUE klass) return nucomp_s_new_internal(klass, ZERO, ZERO); } -#if 0 -static VALUE -nucomp_s_new_bang(int argc, VALUE *argv, VALUE klass) -{ - VALUE real, imag; - - switch (rb_scan_args(argc, argv, "11", &real, &imag)) { - case 1: - if (!k_numeric_p(real)) - real = f_to_i(real); - imag = ZERO; - break; - default: - if (!k_numeric_p(real)) - real = f_to_i(real); - if (!k_numeric_p(imag)) - imag = f_to_i(imag); - break; - } - - return nucomp_s_new_internal(klass, real, imag); -} -#endif - inline static VALUE f_complex_new_bang1(VALUE klass, VALUE x) { - assert(!k_complex_p(x)); + assert(!RB_TYPE_P(x, T_COMPLEX)); return nucomp_s_new_internal(klass, x, ZERO); } inline static VALUE f_complex_new_bang2(VALUE klass, VALUE x, VALUE y) { - assert(!k_complex_p(x)); - assert(!k_complex_p(y)); + assert(!RB_TYPE_P(x, T_COMPLEX)); + assert(!RB_TYPE_P(y, T_COMPLEX)); return nucomp_s_new_internal(klass, x, y); } -#ifdef CANONICALIZATION_FOR_MATHN -#define CANON -#endif - -#ifdef CANON -static int canonicalization = 0; - -RUBY_FUNC_EXPORTED void -nucomp_canonicalization(int f) -{ - canonicalization = f; -} -#endif - inline static void nucomp_real_check(VALUE num) { - if (!RB_TYPE_P(num, T_FIXNUM) && - !RB_TYPE_P(num, T_BIGNUM) && - !RB_TYPE_P(num, T_FLOAT) && + if (!RB_INTEGER_TYPE_P(num) && + !RB_FLOAT_TYPE_P(num) && !RB_TYPE_P(num, T_RATIONAL)) { if (!k_numeric_p(num) || !f_real_p(num)) rb_raise(rb_eTypeError, "not a real"); @@ -352,26 +435,20 @@ nucomp_real_check(VALUE num) inline static VALUE nucomp_s_canonicalize_internal(VALUE klass, VALUE real, VALUE imag) { -#ifdef CANON -#define CL_CANON -#ifdef CL_CANON - if (k_exact_zero_p(imag) && canonicalization) - return real; -#else - if (f_zero_p(imag) && canonicalization) - return real; -#endif -#endif - if (f_real_p(real) && f_real_p(imag)) + int complex_r, complex_i; + complex_r = RB_TYPE_P(real, T_COMPLEX); + complex_i = RB_TYPE_P(imag, T_COMPLEX); + if (!complex_r && !complex_i) { return nucomp_s_new_internal(klass, real, imag); - else if (f_real_p(real)) { + } + else if (!complex_r) { get_dat1(imag); return nucomp_s_new_internal(klass, f_sub(real, dat->imag), f_add(ZERO, dat->real)); } - else if (f_real_p(imag)) { + else if (!complex_i) { get_dat1(real); return nucomp_s_new_internal(klass, @@ -418,13 +495,16 @@ nucomp_s_new(int argc, VALUE *argv, VALUE klass) inline static VALUE f_complex_new2(VALUE klass, VALUE x, VALUE y) { - assert(!k_complex_p(x)); + assert(!RB_TYPE_P(x, T_COMPLEX)); return nucomp_s_canonicalize_internal(klass, x, y); } +static VALUE nucomp_convert(VALUE klass, VALUE a1, VALUE a2, int raise); +static VALUE nucomp_s_convert(int argc, VALUE *argv, VALUE klass); + /* * call-seq: - * Complex(x[, y]) -> numeric + * Complex(x[, y], exception: true) -> numeric or nil * * Returns x+i*y; * @@ -433,6 +513,9 @@ f_complex_new2(VALUE klass, VALUE x, VALUE y) * Complex(nil) #=> TypeError * Complex(1, nil) #=> TypeError * + * Complex(1, nil, exception: false) #=> nil + * Complex('1+2', exception: false) #=> nil + * * Syntax of string form: * * string form = extra spaces , complex , extra spaces ; @@ -458,7 +541,19 @@ f_complex_new2(VALUE klass, VALUE x, VALUE y) static VALUE nucomp_f_complex(int argc, VALUE *argv, VALUE klass) { - return rb_funcall2(rb_cComplex, id_convert, argc, argv); + VALUE a1, a2, opts = Qnil; + int raise = TRUE; + + if (rb_scan_args(argc, argv, "11:", &a1, &a2, &opts) == 1) { + a2 = Qundef; + } + if (!NIL_P(opts)) { + raise = rb_opts_exception_p(opts, raise); + } + if (argc > 0 && CLASS_OF(a1) == rb_cComplex && a2 == Qundef) { + return a1; + } + return nucomp_convert(rb_cComplex, a1, a2, raise); } #define imp1(n) \ @@ -468,20 +563,9 @@ m_##n##_bang(VALUE x)\ return rb_math_##n(x);\ } -#define imp2(n) \ -inline static VALUE \ -m_##n##_bang(VALUE x, VALUE y)\ -{\ - return rb_math_##n(x, y);\ -} - -imp2(atan2) imp1(cos) imp1(cosh) imp1(exp) -imp2(hypot) - -#define m_hypot(x,y) m_hypot_bang((x),(y)) static VALUE m_log_bang(VALUE x) @@ -495,7 +579,7 @@ imp1(sinh) static VALUE m_cos(VALUE x) { - if (f_real_p(x)) + if (!RB_TYPE_P(x, T_COMPLEX)) return m_cos_bang(x); { get_dat1(x); @@ -510,7 +594,7 @@ m_cos(VALUE x) static VALUE m_sin(VALUE x) { - if (f_real_p(x)) + if (!RB_TYPE_P(x, T_COMPLEX)) return m_sin_bang(x); { get_dat1(x); @@ -522,42 +606,78 @@ m_sin(VALUE x) } } -#if 0 -imp1(sqrt) - static VALUE -m_sqrt(VALUE x) +f_complex_polar(VALUE klass, VALUE x, VALUE y) { - if (f_real_p(x)) { - if (f_positive_p(x)) - return m_sqrt_bang(x); - return f_complex_new2(rb_cComplex, ZERO, m_sqrt_bang(f_negate(x))); + assert(!RB_TYPE_P(x, T_COMPLEX)); + assert(!RB_TYPE_P(y, T_COMPLEX)); + if (f_zero_p(x) || f_zero_p(y)) { + return nucomp_s_new_internal(klass, x, RFLOAT_0); } - else { - get_dat1(x); - - if (f_negative_p(dat->imag)) - return f_conj(m_sqrt(f_conj(x))); + if (RB_FLOAT_TYPE_P(y)) { + const double arg = RFLOAT_VALUE(y); + if (arg == M_PI) { + x = f_negate(x); + y = RFLOAT_0; + } + else if (arg == M_PI_2) { + y = x; + x = RFLOAT_0; + } + else if (arg == M_PI_2+M_PI) { + y = f_negate(x); + x = RFLOAT_0; + } + else if (RB_FLOAT_TYPE_P(x)) { + const double abs = RFLOAT_VALUE(x); + const double real = abs * cos(arg), imag = abs * sin(arg); + x = DBL2NUM(real); + y = DBL2NUM(imag); + } else { - VALUE a = f_abs(x); - return f_complex_new2(rb_cComplex, - m_sqrt_bang(f_div(f_add(a, dat->real), TWO)), - m_sqrt_bang(f_div(f_sub(a, dat->real), TWO))); + const double ax = sin(arg), ay = cos(arg); + y = f_mul(x, DBL2NUM(ax)); + x = f_mul(x, DBL2NUM(ay)); } + return nucomp_s_new_internal(klass, x, y); } -} -#endif - -inline static VALUE -f_complex_polar(VALUE klass, VALUE x, VALUE y) -{ - assert(!k_complex_p(x)); - assert(!k_complex_p(y)); return nucomp_s_canonicalize_internal(klass, f_mul(x, m_cos(y)), f_mul(x, m_sin(y))); } +#ifdef HAVE___COSPI +# define cospi(x) __cospi(x) +#else +# define cospi(x) cos((x) * M_PI) +#endif +#ifdef HAVE___SINPI +# define sinpi(x) __sinpi(x) +#else +# define sinpi(x) sin((x) * M_PI) +#endif +/* returns a Complex or Float of ang*PI-rotated abs */ +VALUE +rb_dbl_complex_new_polar_pi(double abs, double ang) +{ + double fi; + const double fr = modf(ang, &fi); + int pos = fr == +0.5; + + if (pos || fr == -0.5) { + if ((modf(fi / 2.0, &fi) != fr) ^ pos) abs = -abs; + return rb_complex_new(RFLOAT_0, DBL2NUM(abs)); + } + else if (fr == 0.0) { + if (modf(fi / 2.0, &fi) != 0.0) abs = -abs; + return DBL2NUM(abs); + } + else { + const double real = abs * cospi(ang), imag = abs * sinpi(ang); + return rb_complex_new(DBL2NUM(real), DBL2NUM(imag)); + } +} + /* * call-seq: * Complex.polar(abs[, arg]) -> complex @@ -574,15 +694,21 @@ nucomp_s_polar(int argc, VALUE *argv, VALUE klass) { VALUE abs, arg; - switch (rb_scan_args(argc, argv, "11", &abs, &arg)) { - case 1: - nucomp_real_check(abs); - arg = ZERO; - break; - default: - nucomp_real_check(abs); - nucomp_real_check(arg); - break; + argc = rb_scan_args(argc, argv, "11", &abs, &arg); + nucomp_real_check(abs); + if (argc == 2) { + nucomp_real_check(arg); + } + else { + arg = ZERO; + } + if (RB_TYPE_P(abs, T_COMPLEX)) { + get_dat1(abs); + abs = dat->real; + } + if (RB_TYPE_P(arg, T_COMPLEX)) { + get_dat1(arg); + arg = dat->real; } return f_complex_polar(klass, abs, arg); } @@ -596,8 +722,8 @@ nucomp_s_polar(int argc, VALUE *argv, VALUE klass) * Complex(7).real #=> 7 * Complex(9, -4).real #=> 9 */ -static VALUE -nucomp_real(VALUE self) +VALUE +rb_complex_real(VALUE self) { get_dat1(self); return dat->real; @@ -613,8 +739,8 @@ nucomp_real(VALUE self) * Complex(7).imaginary #=> 0 * Complex(9, -4).imaginary #=> -4 */ -static VALUE -nucomp_imag(VALUE self) +VALUE +rb_complex_imag(VALUE self) { get_dat1(self); return dat->imag; @@ -628,35 +754,12 @@ nucomp_imag(VALUE self) * * -Complex(1, 2) #=> (-1-2i) */ -static VALUE -nucomp_negate(VALUE self) -{ - get_dat1(self); - return f_complex_new2(CLASS_OF(self), - f_negate(dat->real), f_negate(dat->imag)); -} - -inline static VALUE -f_addsub(VALUE self, VALUE other, - VALUE (*func)(VALUE, VALUE), ID id) +VALUE +rb_complex_uminus(VALUE self) { - if (k_complex_p(other)) { - VALUE real, imag; - - get_dat2(self, other); - - real = (*func)(adat->real, bdat->real); - imag = (*func)(adat->imag, bdat->imag); - - return f_complex_new2(CLASS_OF(self), real, imag); - } - if (k_numeric_p(other) && f_real_p(other)) { - get_dat1(self); - - return f_complex_new2(CLASS_OF(self), - (*func)(dat->real, other), dat->imag); - } - return rb_num_coerce_bin(self, other, id); + get_dat1(self); + return f_complex_new2(CLASS_OF(self), + f_negate(dat->real), f_negate(dat->imag)); } /* @@ -671,10 +774,26 @@ f_addsub(VALUE self, VALUE other, * Complex(9, 8) + 4 #=> (13+8i) * Complex(20, 9) + 9.8 #=> (29.8+9i) */ -static VALUE -nucomp_add(VALUE self, VALUE other) +VALUE +rb_complex_plus(VALUE self, VALUE other) { - return f_addsub(self, other, f_add, '+'); + if (RB_TYPE_P(other, T_COMPLEX)) { + VALUE real, imag; + + get_dat2(self, other); + + real = f_add(adat->real, bdat->real); + imag = f_add(adat->imag, bdat->imag); + + return f_complex_new2(CLASS_OF(self), real, imag); + } + if (k_numeric_p(other) && f_real_p(other)) { + get_dat1(self); + + return f_complex_new2(CLASS_OF(self), + f_add(dat->real, other), dat->imag); + } + return rb_num_coerce_bin(self, other, '+'); } /* @@ -689,10 +808,52 @@ nucomp_add(VALUE self, VALUE other) * Complex(9, 8) - 4 #=> (5+8i) * Complex(20, 9) - 9.8 #=> (10.2+9i) */ +VALUE +rb_complex_minus(VALUE self, VALUE other) +{ + if (RB_TYPE_P(other, T_COMPLEX)) { + VALUE real, imag; + + get_dat2(self, other); + + real = f_sub(adat->real, bdat->real); + imag = f_sub(adat->imag, bdat->imag); + + return f_complex_new2(CLASS_OF(self), real, imag); + } + if (k_numeric_p(other) && f_real_p(other)) { + get_dat1(self); + + return f_complex_new2(CLASS_OF(self), + f_sub(dat->real, other), dat->imag); + } + return rb_num_coerce_bin(self, other, '-'); +} + static VALUE -nucomp_sub(VALUE self, VALUE other) +safe_mul(VALUE a, VALUE b, int az, int bz) +{ + double v; + if (!az && bz && RB_FLOAT_TYPE_P(a) && (v = RFLOAT_VALUE(a), !isnan(v))) { + a = signbit(v) ? DBL2NUM(-1.0) : DBL2NUM(1.0); + } + if (!bz && az && RB_FLOAT_TYPE_P(b) && (v = RFLOAT_VALUE(b), !isnan(v))) { + b = signbit(v) ? DBL2NUM(-1.0) : DBL2NUM(1.0); + } + return f_mul(a, b); +} + +static void +comp_mul(VALUE areal, VALUE aimag, VALUE breal, VALUE bimag, VALUE *real, VALUE *imag) { - return f_addsub(self, other, f_sub, '-'); + int arzero = f_zero_p(areal); + int aizero = f_zero_p(aimag); + int brzero = f_zero_p(breal); + int bizero = f_zero_p(bimag); + *real = f_sub(safe_mul(areal, breal, arzero, brzero), + safe_mul(aimag, bimag, aizero, bizero)); + *imag = f_add(safe_mul(areal, bimag, arzero, bizero), + safe_mul(aimag, breal, aizero, brzero)); } /* @@ -707,18 +868,14 @@ nucomp_sub(VALUE self, VALUE other) * Complex(9, 8) * 4 #=> (36+32i) * Complex(20, 9) * 9.8 #=> (196.0+88.2i) */ -static VALUE -nucomp_mul(VALUE self, VALUE other) +VALUE +rb_complex_mul(VALUE self, VALUE other) { - if (k_complex_p(other)) { + if (RB_TYPE_P(other, T_COMPLEX)) { VALUE real, imag; - get_dat2(self, other); - real = f_sub(f_mul(adat->real, bdat->real), - f_mul(adat->imag, bdat->imag)); - imag = f_add(f_mul(adat->real, bdat->imag), - f_mul(adat->imag, bdat->real)); + comp_mul(adat->real, adat->imag, bdat->real, bdat->imag, &real, &imag); return f_complex_new2(CLASS_OF(self), real, imag); } @@ -736,50 +893,38 @@ inline static VALUE f_divide(VALUE self, VALUE other, VALUE (*func)(VALUE, VALUE), ID id) { - if (k_complex_p(other)) { + if (RB_TYPE_P(other, T_COMPLEX)) { + VALUE r, n, x, y; int flo; get_dat2(self, other); - flo = (k_float_p(adat->real) || k_float_p(adat->imag) || - k_float_p(bdat->real) || k_float_p(bdat->imag)); + flo = (RB_FLOAT_TYPE_P(adat->real) || RB_FLOAT_TYPE_P(adat->imag) || + RB_FLOAT_TYPE_P(bdat->real) || RB_FLOAT_TYPE_P(bdat->imag)); if (f_gt_p(f_abs(bdat->real), f_abs(bdat->imag))) { - VALUE r, n; - r = (*func)(bdat->imag, bdat->real); n = f_mul(bdat->real, f_add(ONE, f_mul(r, r))); - if (flo) - return f_complex_new2(CLASS_OF(self), - (*func)(self, n), - (*func)(f_negate(f_mul(self, r)), n)); - return f_complex_new2(CLASS_OF(self), - (*func)(f_add(adat->real, - f_mul(adat->imag, r)), n), - (*func)(f_sub(adat->imag, - f_mul(adat->real, r)), n)); + x = (*func)(f_add(adat->real, f_mul(adat->imag, r)), n); + y = (*func)(f_sub(adat->imag, f_mul(adat->real, r)), n); } else { - VALUE r, n; - r = (*func)(bdat->real, bdat->imag); n = f_mul(bdat->imag, f_add(ONE, f_mul(r, r))); - if (flo) - return f_complex_new2(CLASS_OF(self), - (*func)(f_mul(self, r), n), - (*func)(f_negate(self), n)); - return f_complex_new2(CLASS_OF(self), - (*func)(f_add(f_mul(adat->real, r), - adat->imag), n), - (*func)(f_sub(f_mul(adat->imag, r), - adat->real), n)); + x = (*func)(f_add(f_mul(adat->real, r), adat->imag), n); + y = (*func)(f_sub(f_mul(adat->imag, r), adat->real), n); } + if (!flo) { + x = rb_rational_canonicalize(x); + y = rb_rational_canonicalize(y); + } + return f_complex_new2(CLASS_OF(self), x, y); } if (k_numeric_p(other) && f_real_p(other)) { + VALUE x, y; get_dat1(self); - - return f_complex_new2(CLASS_OF(self), - (*func)(dat->real, other), - (*func)(dat->imag, other)); + x = rb_rational_canonicalize((*func)(dat->real, other)); + y = rb_rational_canonicalize((*func)(dat->imag, other)); + return f_complex_new2(CLASS_OF(self), x, y); } return rb_num_coerce_bin(self, other, id); } @@ -799,13 +944,13 @@ f_divide(VALUE self, VALUE other, * Complex(9, 8) / 4 #=> ((9/4)+(2/1)*i) * Complex(20, 9) / 9.8 #=> (2.0408163265306123+0.9183673469387754i) */ -static VALUE -nucomp_div(VALUE self, VALUE other) +VALUE +rb_complex_div(VALUE self, VALUE other) { return f_divide(self, other, f_quo, id_quo); } -#define nucomp_quo nucomp_div +#define nucomp_quo rb_complex_div /* * call-seq: @@ -836,23 +981,23 @@ f_reciprocal(VALUE x) * Complex('i') ** 2 #=> (-1+0i) * Complex(-8) ** Rational(1, 3) #=> (1.0000000000000002+1.7320508075688772i) */ -static VALUE -nucomp_expt(VALUE self, VALUE other) +VALUE +rb_complex_pow(VALUE self, VALUE other) { if (k_numeric_p(other) && k_exact_zero_p(other)) return f_complex_new_bang1(CLASS_OF(self), ONE); - if (k_rational_p(other) && f_one_p(f_denominator(other))) - other = f_numerator(other); /* c14n */ + if (RB_TYPE_P(other, T_RATIONAL) && RRATIONAL(other)->den == LONG2FIX(1)) + other = RRATIONAL(other)->num; /* c14n */ - if (k_complex_p(other)) { + if (RB_TYPE_P(other, T_COMPLEX)) { get_dat1(other); if (k_exact_zero_p(dat->imag)) other = dat->real; /* c14n */ } - if (k_complex_p(other)) { + if (RB_TYPE_P(other, T_COMPLEX)) { VALUE r, theta, nr, ntheta; get_dat1(other); @@ -866,44 +1011,51 @@ nucomp_expt(VALUE self, VALUE other) f_mul(dat->imag, m_log_bang(r))); return f_complex_polar(CLASS_OF(self), nr, ntheta); } - if (k_fixnum_p(other)) { - if (f_gt_p(other, ZERO)) { - VALUE x, z; - long n; - - x = self; - z = x; - n = FIX2LONG(other) - 1; - - while (n) { - long q, r; - - while (1) { - get_dat1(x); - - q = n / 2; - r = n % 2; - - if (r) - break; - - x = nucomp_s_new_internal(CLASS_OF(self), - f_sub(f_mul(dat->real, dat->real), - f_mul(dat->imag, dat->imag)), - f_mul(f_mul(TWO, dat->real), dat->imag)); - n = q; - } - z = f_mul(z, x); - n--; - } - return z; + if (FIXNUM_P(other)) { + long n = FIX2LONG(other); + if (n == 0) { + return nucomp_s_new_internal(CLASS_OF(self), ONE, ZERO); + } + if (n < 0) { + self = f_reciprocal(self); + other = rb_int_uminus(other); + n = -n; + } + { + get_dat1(self); + VALUE xr = dat->real, xi = dat->imag, zr = xr, zi = xi; + + if (f_zero_p(xi)) { + zr = rb_num_pow(zr, other); + } + else if (f_zero_p(xr)) { + zi = rb_num_pow(zi, other); + if (n & 2) zi = f_negate(zi); + if (!(n & 1)) { + VALUE tmp = zr; + zr = zi; + zi = tmp; + } + } + else { + while (--n) { + long q, r; + + for (; q = n / 2, r = n % 2, r == 0; n = q) { + VALUE tmp = f_sub(f_mul(xr, xr), f_mul(xi, xi)); + xi = f_mul(f_mul(TWO, xr), xi); + xr = tmp; + } + comp_mul(zr, zi, xr, xi, &zr, &zi); + } + } + return nucomp_s_new_internal(CLASS_OF(self), zr, zi); } - return f_expt(f_reciprocal(self), f_negate(other)); } if (k_numeric_p(other) && f_real_p(other)) { VALUE r, theta; - if (k_bignum_p(other)) + if (RB_BIGNUM_TYPE_P(other)) rb_warn("in a**b, b may be too big"); r = f_abs(self); @@ -930,31 +1082,68 @@ nucomp_expt(VALUE self, VALUE other) static VALUE nucomp_eqeq_p(VALUE self, VALUE other) { - if (k_complex_p(other)) { + if (RB_TYPE_P(other, T_COMPLEX)) { get_dat2(self, other); - return f_boolcast(f_eqeq_p(adat->real, bdat->real) && + return RBOOL(f_eqeq_p(adat->real, bdat->real) && f_eqeq_p(adat->imag, bdat->imag)); } if (k_numeric_p(other) && f_real_p(other)) { get_dat1(self); - return f_boolcast(f_eqeq_p(dat->real, other) && f_zero_p(dat->imag)); + return RBOOL(f_eqeq_p(dat->real, other) && f_zero_p(dat->imag)); } - return f_eqeq_p(other, self); + return RBOOL(f_eqeq_p(other, self)); +} + +static bool +nucomp_real_p(VALUE self) +{ + get_dat1(self); + return(f_zero_p(dat->imag) ? true : false); +} + +/* + * call-seq: + * cmp <=> object -> 0, 1, -1, or nil + * + * If +cmp+'s imaginary part is zero, and +object+ is also a + * real number (or a Complex number where the imaginary part is zero), + * compare the real part of +cmp+ to object. Otherwise, return nil. + * + * Complex(2, 3) <=> Complex(2, 3) #=> nil + * Complex(2, 3) <=> 1 #=> nil + * Complex(2) <=> 1 #=> 1 + * Complex(2) <=> 2 #=> 0 + * Complex(2) <=> 3 #=> -1 + */ +static VALUE +nucomp_cmp(VALUE self, VALUE other) +{ + if (nucomp_real_p(self) && k_numeric_p(other)) { + if (RB_TYPE_P(other, T_COMPLEX) && nucomp_real_p(other)) { + get_dat2(self, other); + return rb_funcall(adat->real, idCmp, 1, bdat->real); + } + else if (f_real_p(other)) { + get_dat1(self); + return rb_funcall(dat->real, idCmp, 1, other); + } + } + return Qnil; } /* :nodoc: */ static VALUE nucomp_coerce(VALUE self, VALUE other) { - if (k_numeric_p(other) && f_real_p(other)) - return rb_assoc_new(f_complex_new_bang1(CLASS_OF(self), other), self); if (RB_TYPE_P(other, T_COMPLEX)) return rb_assoc_new(other, self); + if (k_numeric_p(other) && f_real_p(other)) + return rb_assoc_new(f_complex_new_bang1(CLASS_OF(self), other), self); - rb_raise(rb_eTypeError, "%s can't be coerced into %s", - rb_obj_classname(other), rb_obj_classname(self)); + rb_raise(rb_eTypeError, "%"PRIsVALUE" can't be coerced into %"PRIsVALUE, + rb_obj_class(other), rb_obj_class(self)); return Qnil; } @@ -968,24 +1157,24 @@ nucomp_coerce(VALUE self, VALUE other) * Complex(-1).abs #=> 1 * Complex(3.0, -4.0).abs #=> 5.0 */ -static VALUE -nucomp_abs(VALUE self) +VALUE +rb_complex_abs(VALUE self) { get_dat1(self); if (f_zero_p(dat->real)) { VALUE a = f_abs(dat->imag); - if (k_float_p(dat->real) && !k_float_p(dat->imag)) + if (RB_FLOAT_TYPE_P(dat->real) && !RB_FLOAT_TYPE_P(dat->imag)) a = f_to_f(a); return a; } if (f_zero_p(dat->imag)) { VALUE a = f_abs(dat->real); - if (!k_float_p(dat->real) && k_float_p(dat->imag)) + if (!RB_FLOAT_TYPE_P(dat->real) && RB_FLOAT_TYPE_P(dat->imag)) a = f_to_f(a); return a; } - return m_hypot(dat->real, dat->imag); + return rb_math_hypot(dat->real, dat->imag); } /* @@ -1015,11 +1204,11 @@ nucomp_abs2(VALUE self) * * Complex.polar(3, Math::PI/2).arg #=> 1.5707963267948966 */ -static VALUE -nucomp_arg(VALUE self) +VALUE +rb_complex_arg(VALUE self) { get_dat1(self); - return m_atan2_bang(dat->imag, dat->real); + return rb_math_atan2(dat->imag, dat->real); } /* @@ -1061,51 +1250,26 @@ nucomp_polar(VALUE self) * * Complex(1, 2).conjugate #=> (1-2i) */ -static VALUE -nucomp_conj(VALUE self) +VALUE +rb_complex_conjugate(VALUE self) { get_dat1(self); return f_complex_new2(CLASS_OF(self), dat->real, f_negate(dat->imag)); } -#if 0 -/* :nodoc: */ -static VALUE -nucomp_true(VALUE self) -{ - return Qtrue; -} -#endif - /* * call-seq: - * cmp.real? -> false + * Complex(1).real? -> false + * Complex(1, 2).real? -> false * - * Returns false. + * Returns false, even if the complex number has no imaginary part. */ static VALUE -nucomp_false(VALUE self) +nucomp_real_p_m(VALUE self) { return Qfalse; } -#if 0 -/* :nodoc: */ -static VALUE -nucomp_exact_p(VALUE self) -{ - get_dat1(self); - return f_boolcast(k_exact_p(dat->real) && k_exact_p(dat->imag)); -} - -/* :nodoc: */ -static VALUE -nucomp_inexact_p(VALUE self) -{ - return f_boolcast(!nucomp_exact_p(self)); -} -#endif - /* * call-seq: * cmp.denominator -> integer @@ -1146,7 +1310,7 @@ nucomp_numerator(VALUE self) get_dat1(self); - cd = f_denominator(self); + cd = nucomp_denominator(self); return f_complex_new2(CLASS_OF(self), f_mul(f_numerator(dat->real), f_div(cd, f_denominator(dat->real))), @@ -1155,8 +1319,8 @@ nucomp_numerator(VALUE self) } /* :nodoc: */ -static VALUE -nucomp_hash(VALUE self) +st_index_t +rb_complex_hash(VALUE self) { st_index_t v, h[2]; VALUE n; @@ -1167,17 +1331,23 @@ nucomp_hash(VALUE self) n = rb_hash(dat->imag); h[1] = NUM2LONG(n); v = rb_memhash(h, sizeof(h)); - return LONG2FIX(v); + return v; +} + +static VALUE +nucomp_hash(VALUE self) +{ + return ST2FIX(rb_complex_hash(self)); } /* :nodoc: */ static VALUE nucomp_eql_p(VALUE self, VALUE other) { - if (k_complex_p(other)) { + if (RB_TYPE_P(other, T_COMPLEX)) { get_dat2(self, other); - return f_boolcast((CLASS_OF(adat->real) == CLASS_OF(bdat->real)) && + return RBOOL((CLASS_OF(adat->real) == CLASS_OF(bdat->real)) && (CLASS_OF(adat->imag) == CLASS_OF(bdat->imag)) && f_eqeq_p(self, other)); @@ -1185,30 +1355,27 @@ nucomp_eql_p(VALUE self, VALUE other) return Qfalse; } -inline static VALUE +inline static int f_signbit(VALUE x) { -#if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun) && \ - !defined(signbit) - extern int signbit(double); -#endif - if (RB_TYPE_P(x, T_FLOAT)) { + if (RB_FLOAT_TYPE_P(x)) { double f = RFLOAT_VALUE(x); - return f_boolcast(!isnan(f) && signbit(f)); + return !isnan(f) && signbit(f); } return f_negative_p(x); } -inline static VALUE +inline static int f_tpositive_p(VALUE x) { - return f_boolcast(!f_signbit(x)); + return !f_signbit(x); } static VALUE f_format(VALUE self, VALUE (*func)(VALUE)) { - VALUE s, impos; + VALUE s; + int impos; get_dat1(self); @@ -1267,6 +1434,46 @@ nucomp_inspect(VALUE self) return s; } +#define FINITE_TYPE_P(v) (RB_INTEGER_TYPE_P(v) || RB_TYPE_P(v, T_RATIONAL)) + +/* + * call-seq: + * cmp.finite? -> true or false + * + * Returns +true+ if +cmp+'s real and imaginary parts are both finite numbers, + * otherwise returns +false+. + */ +static VALUE +rb_complex_finite_p(VALUE self) +{ + get_dat1(self); + + return RBOOL(f_finite_p(dat->real) && f_finite_p(dat->imag)); +} + +/* + * call-seq: + * cmp.infinite? -> nil or 1 + * + * Returns +1+ if +cmp+'s real or imaginary part is an infinite number, + * otherwise returns +nil+. + * + * For example: + * + * (1+1i).infinite? #=> nil + * (Float::INFINITY + 1i).infinite? #=> 1 + */ +static VALUE +rb_complex_infinite_p(VALUE self) +{ + get_dat1(self); + + if (!f_infinite_p(dat->real) && !f_infinite_p(dat->imag)) { + return Qnil; + } + return ONE; +} + /* :nodoc: */ static VALUE nucomp_dumper(VALUE self) @@ -1282,6 +1489,7 @@ nucomp_loader(VALUE self, VALUE a) RCOMPLEX_SET_REAL(dat, rb_ivar_get(a, id_i_real)); RCOMPLEX_SET_IMAG(dat, rb_ivar_get(a, id_i_imag)); + OBJ_FREEZE_RAW(self); return self; } @@ -1310,8 +1518,6 @@ nucomp_marshal_load(VALUE self, VALUE a) return self; } -/* --- */ - VALUE rb_complex_raw(VALUE x, VALUE y) { @@ -1325,12 +1531,16 @@ rb_complex_new(VALUE x, VALUE y) } VALUE -rb_complex_polar(VALUE x, VALUE y) +rb_complex_new_polar(VALUE x, VALUE y) { return f_complex_polar(rb_cComplex, x, y); } -static VALUE nucomp_s_convert(int argc, VALUE *argv, VALUE klass); +VALUE +rb_complex_polar(VALUE x, VALUE y) +{ + return rb_complex_new_polar(x, y); +} VALUE rb_Complex(VALUE x, VALUE y) @@ -1342,17 +1552,9 @@ rb_Complex(VALUE x, VALUE y) } VALUE -rb_complex_set_real(VALUE cmp, VALUE r) +rb_dbl_complex_new(double real, double imag) { - RCOMPLEX_SET_REAL(cmp, r); - return cmp; -} - -VALUE -rb_complex_set_imag(VALUE cmp, VALUE i) -{ - RCOMPLEX_SET_IMAG(cmp, i); - return cmp; + return rb_complex_raw(DBL2NUM(real), DBL2NUM(imag)); } /* @@ -1371,7 +1573,7 @@ nucomp_to_i(VALUE self) { get_dat1(self); - if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) { + if (!k_exact_zero_p(dat->imag)) { rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Integer", self); } @@ -1394,7 +1596,7 @@ nucomp_to_f(VALUE self) { get_dat1(self); - if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) { + if (!k_exact_zero_p(dat->imag)) { rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Float", self); } @@ -1419,7 +1621,7 @@ nucomp_to_r(VALUE self) { get_dat1(self); - if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) { + if (!k_exact_zero_p(dat->imag)) { rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational", self); } @@ -1444,13 +1646,13 @@ nucomp_rationalize(int argc, VALUE *argv, VALUE self) { get_dat1(self); - rb_scan_args(argc, argv, "01", NULL); + rb_check_arity(argc, 0, 1); - if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) { + if (!k_exact_zero_p(dat->imag)) { rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational", self); } - return rb_funcall2(dat->real, rb_intern("rationalize"), argc, argv); + return rb_funcallv(dat->real, id_rationalize, argc, argv); } /* @@ -1492,8 +1694,6 @@ numeric_to_c(VALUE self) return rb_complex_new1(self); } -#include <ctype.h> - inline static int issign(int c) { @@ -1690,7 +1890,7 @@ read_comp(const char **s, int strict, return 0; /* e.g. "1@-" */ } num2 = str2num(bb); - *ret = rb_complex_polar(num, num2); + *ret = rb_complex_new_polar(num, num2); if (!st) return 0; /* e.g. "1@2." */ else @@ -1733,8 +1933,7 @@ skip_ws(const char **s) } static int -parse_comp(const char *s, int strict, - VALUE *num) +parse_comp(const char *s, int strict, VALUE *num) { char *buf, *b; VALUE tmp; @@ -1745,14 +1944,14 @@ parse_comp(const char *s, int strict, skip_ws(&s); if (!read_comp(&s, strict, num, &b)) { - ret = 0; + ret = 0; } else { - skip_ws(&s); + skip_ws(&s); - if (strict) - if (*s != '\0') - ret = 0; + if (strict) + if (*s != '\0') + ret = 0; } ALLOCV_END(tmp); @@ -1760,7 +1959,7 @@ parse_comp(const char *s, int strict, } static VALUE -string_to_c_strict(VALUE self) +string_to_c_strict(VALUE self, int raise) { char *s; VALUE num; @@ -1769,8 +1968,10 @@ string_to_c_strict(VALUE self) s = RSTRING_PTR(self); - if (!s || memchr(s, '\0', RSTRING_LEN(self))) + if (!s || memchr(s, '\0', RSTRING_LEN(self))) { + if (!raise) return Qnil; rb_raise(rb_eArgError, "string contains null byte"); + } if (s && s[RSTRING_LEN(self)]) { rb_str_modify(self); @@ -1782,6 +1983,7 @@ string_to_c_strict(VALUE self) s = (char *)""; if (!parse_comp(s, 1, &num)) { + if (!raise) return Qnil; rb_raise(rb_eArgError, "invalid value for convert(): %+"PRIsVALUE, self); } @@ -1837,28 +2039,29 @@ string_to_c(VALUE self) } static VALUE -nucomp_s_convert(int argc, VALUE *argv, VALUE klass) +to_complex(VALUE val) { - VALUE a1, a2, backref; - - rb_scan_args(argc, argv, "11", &a1, &a2); + return rb_convert_type(val, T_COMPLEX, "Complex", "to_c"); +} - if (NIL_P(a1) || (argc == 2 && NIL_P(a2))) +static VALUE +nucomp_convert(VALUE klass, VALUE a1, VALUE a2, int raise) +{ + if (NIL_P(a1) || NIL_P(a2)) { + if (!raise) return Qnil; rb_raise(rb_eTypeError, "can't convert nil into Complex"); - - backref = rb_backref_get(); - rb_match_busy(backref); + } if (RB_TYPE_P(a1, T_STRING)) { - a1 = string_to_c_strict(a1); + a1 = string_to_c_strict(a1, raise); + if (NIL_P(a1)) return Qnil; } if (RB_TYPE_P(a2, T_STRING)) { - a2 = string_to_c_strict(a2); + a2 = string_to_c_strict(a2, raise); + if (NIL_P(a2)) return Qnil; } - rb_backref_set(backref); - if (RB_TYPE_P(a1, T_COMPLEX)) { { get_dat1(a1); @@ -1878,16 +2081,19 @@ nucomp_s_convert(int argc, VALUE *argv, VALUE klass) } if (RB_TYPE_P(a1, T_COMPLEX)) { - if (argc == 1 || (k_exact_zero_p(a2))) + if (a2 == Qundef || (k_exact_zero_p(a2))) return a1; } - if (argc == 1) { + if (a2 == Qundef) { if (k_numeric_p(a1) && !f_real_p(a1)) return a1; /* should raise exception for consistency */ - if (!k_numeric_p(a1)) - return rb_convert_type(a1, T_COMPLEX, "Complex", "to_c"); + if (!k_numeric_p(a1)) { + if (!raise) + return rb_protect(to_complex, a1, NULL); + return to_complex(a1); + } } else { if ((k_numeric_p(a1) && k_numeric_p(a2)) && @@ -1898,14 +2104,34 @@ nucomp_s_convert(int argc, VALUE *argv, VALUE klass) } { + int argc; VALUE argv2[2]; argv2[0] = a1; - argv2[1] = a2; + if (a2 == Qundef) { + argv2[1] = Qnil; + argc = 1; + } + else { + if (!raise && !RB_INTEGER_TYPE_P(a2) && !RB_FLOAT_TYPE_P(a2) && !RB_TYPE_P(a2, T_RATIONAL)) + return Qnil; + argv2[1] = a2; + argc = 2; + } return nucomp_s_new(argc, argv2, klass); } } -/* --- */ +static VALUE +nucomp_s_convert(int argc, VALUE *argv, VALUE klass) +{ + VALUE a1, a2; + + if (rb_scan_args(argc, argv, "11", &a1, &a2) == 1) { + a2 = Qundef; + } + + return nucomp_convert(klass, a1, a2, TRUE); +} /* * call-seq: @@ -1944,8 +2170,6 @@ numeric_abs2(VALUE self) return f_mul(self, self); } -#define id_PI rb_intern("PI") - /* * call-seq: * num.arg -> 0 or float @@ -1958,8 +2182,8 @@ static VALUE numeric_arg(VALUE self) { if (f_positive_p(self)) - return INT2FIX(0); - return rb_const_get(rb_mMath, id_PI); + return INT2FIX(0); + return DBL2NUM(M_PI); } /* @@ -1984,7 +2208,25 @@ numeric_rect(VALUE self) static VALUE numeric_polar(VALUE self) { - return rb_assoc_new(f_abs(self), f_arg(self)); + VALUE abs, arg; + + if (RB_INTEGER_TYPE_P(self)) { + abs = rb_int_abs(self); + arg = numeric_arg(self); + } + else if (RB_FLOAT_TYPE_P(self)) { + abs = rb_float_abs(self); + arg = float_arg(self); + } + else if (RB_TYPE_P(self, T_RATIONAL)) { + abs = rb_rational_abs(self); + arg = numeric_arg(self); + } + else { + abs = f_abs(self); + arg = f_arg(self); + } + return rb_assoc_new(abs, arg); } /* @@ -2024,9 +2266,18 @@ float_arg(VALUE self) * and i is imaginary unit. Real a equals complex a+0i * mathematically. * - * In ruby, you can create complex object with Complex, Complex::rect, - * Complex::polar or to_c method. + * You can create a \Complex object explicitly with: * + * - A {complex literal}[doc/syntax/literals_rdoc.html#label-Complex+Literals]. + * + * You can convert certain objects to \Complex objects with: + * + * - \Method {Complex}[Kernel.html#method-i-Complex]. + * + * Complex object can be created as literal, and also by using + * Kernel#Complex, Complex::rect, Complex::polar or to_c method. + * + * 2+1i #=> (2+1i) * Complex(1) #=> (1+0i) * Complex(2, 3) #=> (2+3i) * Complex.polar(2, 3) #=> (-1.9799849932008908+0.2822400161197344i) @@ -2054,39 +2305,24 @@ void Init_Complex(void) { VALUE compat; -#undef rb_intern -#define rb_intern(str) rb_intern_const(str) - - assert(fprintf(stderr, "assert() is now active\n")); - - id_abs = rb_intern("abs"); - id_arg = rb_intern("arg"); - id_convert = rb_intern("convert"); - id_denominator = rb_intern("denominator"); - id_eqeq_p = rb_intern("=="); - id_expt = rb_intern("**"); - id_fdiv = rb_intern("fdiv"); - id_negate = rb_intern("-@"); - id_numerator = rb_intern("numerator"); - id_quo = rb_intern("quo"); - id_real_p = rb_intern("real?"); - id_to_f = rb_intern("to_f"); - id_to_i = rb_intern("to_i"); - id_to_r = rb_intern("to_r"); - id_i_real = rb_intern("@real"); - id_i_imag = rb_intern("@image"); /* @image, not @imag */ + id_abs = rb_intern_const("abs"); + id_arg = rb_intern_const("arg"); + id_denominator = rb_intern_const("denominator"); + id_numerator = rb_intern_const("numerator"); + id_real_p = rb_intern_const("real?"); + id_i_real = rb_intern_const("@real"); + id_i_imag = rb_intern_const("@image"); /* @image, not @imag */ + id_finite_p = rb_intern_const("finite?"); + id_infinite_p = rb_intern_const("infinite?"); + id_rationalize = rb_intern_const("rationalize"); + id_PI = rb_intern_const("PI"); rb_cComplex = rb_define_class("Complex", rb_cNumeric); rb_define_alloc_func(rb_cComplex, nucomp_s_alloc); rb_undef_method(CLASS_OF(rb_cComplex), "allocate"); -#if 0 - rb_define_private_method(CLASS_OF(rb_cComplex), "new!", nucomp_s_new_bang, -1); - rb_define_private_method(CLASS_OF(rb_cComplex), "new", nucomp_s_new, -1); -#else rb_undef_method(CLASS_OF(rb_cComplex), "new"); -#endif rb_define_singleton_method(rb_cComplex, "rectangular", nucomp_s_new, -1); rb_define_singleton_method(rb_cComplex, "rect", nucomp_s_new, -1); @@ -2094,13 +2330,8 @@ Init_Complex(void) rb_define_global_function("Complex", nucomp_f_complex, -1); + rb_undef_methods_from(rb_cComplex, RCLASS_ORIGIN(rb_mComparable)); rb_undef_method(rb_cComplex, "%"); - rb_undef_method(rb_cComplex, "<"); - rb_undef_method(rb_cComplex, "<="); - rb_undef_method(rb_cComplex, "<=>"); - rb_undef_method(rb_cComplex, ">"); - rb_undef_method(rb_cComplex, ">="); - rb_undef_method(rb_cComplex, "between?"); rb_undef_method(rb_cComplex, "div"); rb_undef_method(rb_cComplex, "divmod"); rb_undef_method(rb_cComplex, "floor"); @@ -2112,47 +2343,36 @@ Init_Complex(void) rb_undef_method(rb_cComplex, "truncate"); rb_undef_method(rb_cComplex, "i"); -#if 0 /* NUBY */ - rb_undef_method(rb_cComplex, "//"); -#endif - - rb_define_method(rb_cComplex, "real", nucomp_real, 0); - rb_define_method(rb_cComplex, "imaginary", nucomp_imag, 0); - rb_define_method(rb_cComplex, "imag", nucomp_imag, 0); + rb_define_method(rb_cComplex, "real", rb_complex_real, 0); + rb_define_method(rb_cComplex, "imaginary", rb_complex_imag, 0); + rb_define_method(rb_cComplex, "imag", rb_complex_imag, 0); - rb_define_method(rb_cComplex, "-@", nucomp_negate, 0); - rb_define_method(rb_cComplex, "+", nucomp_add, 1); - rb_define_method(rb_cComplex, "-", nucomp_sub, 1); - rb_define_method(rb_cComplex, "*", nucomp_mul, 1); - rb_define_method(rb_cComplex, "/", nucomp_div, 1); + rb_define_method(rb_cComplex, "-@", rb_complex_uminus, 0); + rb_define_method(rb_cComplex, "+", rb_complex_plus, 1); + rb_define_method(rb_cComplex, "-", rb_complex_minus, 1); + rb_define_method(rb_cComplex, "*", rb_complex_mul, 1); + rb_define_method(rb_cComplex, "/", rb_complex_div, 1); rb_define_method(rb_cComplex, "quo", nucomp_quo, 1); rb_define_method(rb_cComplex, "fdiv", nucomp_fdiv, 1); - rb_define_method(rb_cComplex, "**", nucomp_expt, 1); + rb_define_method(rb_cComplex, "**", rb_complex_pow, 1); rb_define_method(rb_cComplex, "==", nucomp_eqeq_p, 1); + rb_define_method(rb_cComplex, "<=>", nucomp_cmp, 1); rb_define_method(rb_cComplex, "coerce", nucomp_coerce, 1); - rb_define_method(rb_cComplex, "abs", nucomp_abs, 0); - rb_define_method(rb_cComplex, "magnitude", nucomp_abs, 0); + rb_define_method(rb_cComplex, "abs", rb_complex_abs, 0); + rb_define_method(rb_cComplex, "magnitude", rb_complex_abs, 0); rb_define_method(rb_cComplex, "abs2", nucomp_abs2, 0); - rb_define_method(rb_cComplex, "arg", nucomp_arg, 0); - rb_define_method(rb_cComplex, "angle", nucomp_arg, 0); - rb_define_method(rb_cComplex, "phase", nucomp_arg, 0); + rb_define_method(rb_cComplex, "arg", rb_complex_arg, 0); + rb_define_method(rb_cComplex, "angle", rb_complex_arg, 0); + rb_define_method(rb_cComplex, "phase", rb_complex_arg, 0); rb_define_method(rb_cComplex, "rectangular", nucomp_rect, 0); rb_define_method(rb_cComplex, "rect", nucomp_rect, 0); rb_define_method(rb_cComplex, "polar", nucomp_polar, 0); - rb_define_method(rb_cComplex, "conjugate", nucomp_conj, 0); - rb_define_method(rb_cComplex, "conj", nucomp_conj, 0); -#if 0 - rb_define_method(rb_cComplex, "~", nucomp_conj, 0); /* gcc */ -#endif + rb_define_method(rb_cComplex, "conjugate", rb_complex_conjugate, 0); + rb_define_method(rb_cComplex, "conj", rb_complex_conjugate, 0); - rb_define_method(rb_cComplex, "real?", nucomp_false, 0); -#if 0 - rb_define_method(rb_cComplex, "complex?", nucomp_true, 0); - rb_define_method(rb_cComplex, "exact?", nucomp_exact_p, 0); - rb_define_method(rb_cComplex, "inexact?", nucomp_inexact_p, 0); -#endif + rb_define_method(rb_cComplex, "real?", nucomp_real_p_m, 0); rb_define_method(rb_cComplex, "numerator", nucomp_numerator, 0); rb_define_method(rb_cComplex, "denominator", nucomp_denominator, 0); @@ -2163,13 +2383,18 @@ Init_Complex(void) rb_define_method(rb_cComplex, "to_s", nucomp_to_s, 0); rb_define_method(rb_cComplex, "inspect", nucomp_inspect, 0); + rb_undef_method(rb_cComplex, "positive?"); + rb_undef_method(rb_cComplex, "negative?"); + + rb_define_method(rb_cComplex, "finite?", rb_complex_finite_p, 0); + rb_define_method(rb_cComplex, "infinite?", rb_complex_infinite_p, 0); + rb_define_private_method(rb_cComplex, "marshal_dump", nucomp_marshal_dump, 0); - compat = rb_define_class_under(rb_cComplex, "compatible", rb_cObject); /* :nodoc: */ + /* :nodoc: */ + compat = rb_define_class_under(rb_cComplex, "compatible", rb_cObject); rb_define_private_method(compat, "marshal_load", nucomp_marshal_load, 1); rb_marshal_define_compat(rb_cComplex, compat, nucomp_dumper, nucomp_loader); - /* --- */ - rb_define_method(rb_cComplex, "to_i", nucomp_to_i, 0); rb_define_method(rb_cComplex, "to_f", nucomp_to_f, 0); rb_define_method(rb_cComplex, "to_r", nucomp_to_r, 0); @@ -2182,8 +2407,6 @@ Init_Complex(void) rb_define_private_method(CLASS_OF(rb_cComplex), "convert", nucomp_s_convert, -1); - /* --- */ - rb_define_method(rb_cNumeric, "real", numeric_real, 0); rb_define_method(rb_cNumeric, "imaginary", numeric_imag, 0); rb_define_method(rb_cNumeric, "imag", numeric_imag, 0); @@ -2207,11 +2430,9 @@ Init_Complex(void) rb_define_const(rb_cComplex, "I", f_complex_new_bang2(rb_cComplex, ZERO, ONE)); +#if !USE_FLONUM + rb_gc_register_mark_object(RFLOAT_0 = DBL2NUM(0.0)); +#endif + rb_provide("complex.so"); /* for backward compatibility */ } - -/* -Local variables: -c-file-style: "ruby" -End: -*/ |