replaced MPC_RE by mpc_realref and MPC_IM by mpc_imagref everywhere

git-svn-id: svn://scm.gforge.inria.fr/svn/mpc/trunk@1112 211d60ee-9f03-0410-a15a-8952a2c7a4e4

1 files changed, 55 insertions, 55 deletions

diff --git a/tests/tset.c b/tests/tset.c
index e0fe94d..0049436 100644
--- a/tests/tset.c
+++ b/tests/tset.c
@@ -95,56 +95,56 @@ check_set (void)
       mpfr_set_d (fr, 1.23456789, GMP_RNDN);
 
       mpc_set_d (z, 1.23456789, MPC_RNDNN);
-      if (mpfr_cmp (MPC_RE(z), fr) != 0 || mpfr_cmp_si (MPC_IM(z), 0) != 0)
+      if (mpfr_cmp (mpc_realref(z), fr) != 0 || mpfr_cmp_si (mpc_imagref(z), 0) != 0)
         PRINT_ERROR ("mpc_set_d", prec, z);
 
 #if defined HAVE_COMPLEX_H
       mpc_set_dc (z, I*1.23456789+1.23456789, MPC_RNDNN);
-      if (mpfr_cmp (MPC_RE(z), fr) != 0 || mpfr_cmp (MPC_IM(z), fr) != 0)
+      if (mpfr_cmp (mpc_realref(z), fr) != 0 || mpfr_cmp (mpc_imagref(z), fr) != 0)
         PRINT_ERROR ("mpc_set_c", prec, z);
 #endif
 
       mpc_set_ui (z, u, MPC_RNDNN);
-      if (mpfr_cmp_ui (MPC_RE(z), u) != 0
-          || mpfr_cmp_ui (MPC_IM(z), 0) != 0)
+      if (mpfr_cmp_ui (mpc_realref(z), u) != 0
+          || mpfr_cmp_ui (mpc_imagref(z), 0) != 0)
         PRINT_ERROR ("mpc_set_ui", prec, z);
 
       mpc_set_d_d (z, 1.23456789, 1.23456789, MPC_RNDNN);
-      if (mpfr_cmp (MPC_RE(z), fr) != 0 || mpfr_cmp (MPC_IM(z), fr) != 0)
+      if (mpfr_cmp (mpc_realref(z), fr) != 0 || mpfr_cmp (mpc_imagref(z), fr) != 0)
         PRINT_ERROR ("mpc_set_d_d", prec, z);
 
       mpc_set_si (z, lo, MPC_RNDNN);
-      if (mpfr_cmp_si (MPC_RE(z), lo) != 0 || mpfr_cmp_ui (MPC_IM(z), 0) != 0)
+      if (mpfr_cmp_si (mpc_realref(z), lo) != 0 || mpfr_cmp_ui (mpc_imagref(z), 0) != 0)
         PRINT_ERROR ("mpc_set_si", prec, z);
 
       mpfr_set_ld (fr, 1.23456789L, GMP_RNDN);
 
       mpc_set_ld_ld (z, 1.23456789L, 1.23456789L, MPC_RNDNN);
-      if (mpfr_cmp (MPC_RE(z), fr) != 0 || mpfr_cmp (MPC_IM(z), fr) != 0)
+      if (mpfr_cmp (mpc_realref(z), fr) != 0 || mpfr_cmp (mpc_imagref(z), fr) != 0)
         PRINT_ERROR ("mpc_set_ld_ld", prec, z);
 
 #if defined HAVE_COMPLEX_H
       mpc_set_ldc (z, I*1.23456789L+1.23456789L, MPC_RNDNN);
-      if (mpfr_cmp (MPC_RE(z), fr) != 0 || mpfr_cmp (MPC_IM(z), fr) != 0)
+      if (mpfr_cmp (mpc_realref(z), fr) != 0 || mpfr_cmp (mpc_imagref(z), fr) != 0)
         PRINT_ERROR ("mpc_set_lc", prec, z);
 #endif
       mpc_set_ui_ui (z, u, u, MPC_RNDNN);
-      if (mpfr_cmp_ui (MPC_RE(z), u) != 0
-          || mpfr_cmp_ui (MPC_IM(z), u) != 0)
+      if (mpfr_cmp_ui (mpc_realref(z), u) != 0
+          || mpfr_cmp_ui (mpc_imagref(z), u) != 0)
         PRINT_ERROR ("mpc_set_ui_ui", prec, z);
 
       mpc_set_ld (z, 1.23456789L, MPC_RNDNN);
       mpfr_clear_flags ();
-      if (mpfr_cmp (MPC_RE(z), fr) != 0
-          || mpfr_cmp_ui (MPC_IM(z), 0) != 0
+      if (mpfr_cmp (mpc_realref(z), fr) != 0
+          || mpfr_cmp_ui (mpc_imagref(z), 0) != 0
           || mpfr_erangeflag_p())
         PRINT_ERROR ("mpc_set_ld", prec, z);
 
       mpc_set_prec (x, prec);
       mpfr_set_ui(fr, 1, GMP_RNDN);
       mpfr_div_ui(fr, fr, 3, GMP_RNDN);
-      mpfr_set(MPC_RE(x), fr, GMP_RNDN);
-      mpfr_set(MPC_IM(x), fr, GMP_RNDN);
+      mpfr_set(mpc_realref(x), fr, GMP_RNDN);
+      mpfr_set(mpc_imagref(x), fr, GMP_RNDN);
 
       mpc_set (z, x, MPC_RNDNN);
       mpfr_clear_flags (); /* mpc_cmp set erange flag when an operand is a
@@ -159,92 +159,92 @@ check_set (void)
         }
 
       mpc_set_si_si (z, lo, lo, MPC_RNDNN);
-      if (mpfr_cmp_si (MPC_RE(z), lo) != 0
-          || mpfr_cmp_si (MPC_IM(z), lo) != 0)
+      if (mpfr_cmp_si (mpc_realref(z), lo) != 0
+          || mpfr_cmp_si (mpc_imagref(z), lo) != 0)
         PRINT_ERROR ("mpc_set_si_si", prec, z);
 
       mpc_set_fr (z, fr, MPC_RNDNN);
       mpfr_clear_flags ();
-      if (mpfr_cmp (MPC_RE(z), fr) != 0
-          || mpfr_cmp_ui (MPC_IM(z), 0) != 0
+      if (mpfr_cmp (mpc_realref(z), fr) != 0
+          || mpfr_cmp_ui (mpc_imagref(z), 0) != 0
           || mpfr_erangeflag_p())
         PRINT_ERROR ("mpc_set_fr", prec, z);
 
       mpfr_set_z (fr, mpz, GMP_RNDN);
       mpc_set_z_z (z, mpz, mpz, MPC_RNDNN);
       mpfr_clear_flags ();
-      if (mpfr_cmp (MPC_RE(z), fr) != 0
-          || mpfr_cmp (MPC_IM(z), fr) != 0
+      if (mpfr_cmp (mpc_realref(z), fr) != 0
+          || mpfr_cmp (mpc_imagref(z), fr) != 0
           || mpfr_erangeflag_p())
         PRINT_ERROR ("mpc_set_z_z", prec, z);
 
       mpc_set_fr_fr (z, fr, fr, MPC_RNDNN);
       mpfr_clear_flags ();
-      if (mpfr_cmp (MPC_RE(z), fr) != 0
-          || mpfr_cmp (MPC_IM(z), fr) != 0
+      if (mpfr_cmp (mpc_realref(z), fr) != 0
+          || mpfr_cmp (mpc_imagref(z), fr) != 0
           || mpfr_erangeflag_p())
         PRINT_ERROR ("mpc_set_fr_fr", prec, z);
 
       mpc_set_z (z, mpz, MPC_RNDNN);
       mpfr_clear_flags ();
-      if (mpfr_cmp (MPC_RE(z), fr) != 0
-          || mpfr_cmp_ui (MPC_IM(z), 0) != 0
+      if (mpfr_cmp (mpc_realref(z), fr) != 0
+          || mpfr_cmp_ui (mpc_imagref(z), 0) != 0
           || mpfr_erangeflag_p())
         PRINT_ERROR ("mpc_set_z", prec, z);
 
       mpfr_set_q (fr, mpq, GMP_RNDN);
       mpc_set_q_q (z, mpq, mpq, MPC_RNDNN);
       mpfr_clear_flags ();
-      if (mpfr_cmp (MPC_RE(z), fr) != 0
-          || mpfr_cmp (MPC_IM(z), fr) != 0
+      if (mpfr_cmp (mpc_realref(z), fr) != 0
+          || mpfr_cmp (mpc_imagref(z), fr) != 0
           || mpfr_erangeflag_p())
         PRINT_ERROR ("mpc_set_q_q", prec, z);
 
       mpc_set_ui_fr (z, u, fr, MPC_RNDNN);
       mpfr_clear_flags ();
-      if (mpfr_cmp_ui (MPC_RE (z), u) != 0
-          || mpfr_cmp (MPC_IM (z), fr) != 0
+      if (mpfr_cmp_ui (mpc_realref (z), u) != 0
+          || mpfr_cmp (mpc_imagref (z), fr) != 0
           || mpfr_erangeflag_p ())
         PRINT_ERROR ("mpc_set_ui_fr", prec, z);
 
       mpc_set_fr_ui (z, fr, u, MPC_RNDNN);
       mpfr_clear_flags ();
-      if (mpfr_cmp (MPC_RE (z), fr) != 0
-          || mpfr_cmp_ui (MPC_IM (z), u) != 0
+      if (mpfr_cmp (mpc_realref (z), fr) != 0
+          || mpfr_cmp_ui (mpc_imagref (z), u) != 0
           || mpfr_erangeflag_p())
         PRINT_ERROR ("mpc_set_fr_ui", prec, z);
 
       mpc_set_q (z, mpq, MPC_RNDNN);
       mpfr_clear_flags ();
-      if (mpfr_cmp (MPC_RE(z), fr) != 0
-          || mpfr_cmp_ui (MPC_IM(z), 0) != 0
+      if (mpfr_cmp (mpc_realref(z), fr) != 0
+          || mpfr_cmp_ui (mpc_imagref(z), 0) != 0
           || mpfr_erangeflag_p())
         PRINT_ERROR ("mpc_set_q", prec, z);
 
       mpfr_set_f (fr, mpf, GMP_RNDN);
       mpc_set_f_f (z, mpf, mpf, MPC_RNDNN);
       mpfr_clear_flags ();
-      if (mpfr_cmp (MPC_RE(z), fr) != 0
-          || mpfr_cmp (MPC_IM(z), fr) != 0
+      if (mpfr_cmp (mpc_realref(z), fr) != 0
+          || mpfr_cmp (mpc_imagref(z), fr) != 0
           || mpfr_erangeflag_p())
         PRINT_ERROR ("mpc_set_f_f", prec, z);
 
       mpc_set_f (z, mpf, MPC_RNDNN);
       mpfr_clear_flags ();
-      if (mpfr_cmp (MPC_RE(z), fr) != 0
-          || mpfr_cmp_ui (MPC_IM(z), 0) != 0
+      if (mpfr_cmp (mpc_realref(z), fr) != 0
+          || mpfr_cmp_ui (mpc_imagref(z), 0) != 0
           || mpfr_erangeflag_p())
         PRINT_ERROR ("mpc_set_f", prec, z);
 
       mpc_set_f_si (z, mpf, lo, MPC_RNDNN);
       mpfr_clear_flags ();
-      if (mpfr_cmp (MPC_RE (z), fr) != 0
-          || mpfr_cmp_si (MPC_IM (z), lo) != 0
+      if (mpfr_cmp (mpc_realref (z), fr) != 0
+          || mpfr_cmp_si (mpc_imagref (z), lo) != 0
           || mpfr_erangeflag_p ())
         PRINT_ERROR ("mpc_set_f", prec, z);
 
       mpc_set_nan (z);
-      if (!mpfr_nan_p (MPC_RE(z)) || !mpfr_nan_p (MPC_IM(z)))
+      if (!mpfr_nan_p (mpc_realref(z)) || !mpfr_nan_p (mpc_imagref(z)))
         PRINT_ERROR ("mpc_set_nan", prec, z);
 
 #ifdef _MPC_H_HAVE_INTMAX_T
@@ -253,23 +253,23 @@ check_set (void)
         intmax_t im = (intmax_t) prec;
 
         mpc_set_uj (z, uim, MPC_RNDNN);
-        if (mpfr_cmp_ui (MPC_RE(z), u) != 0
-            || mpfr_cmp_ui (MPC_IM(z), 0) != 0)
+        if (mpfr_cmp_ui (mpc_realref(z), u) != 0
+            || mpfr_cmp_ui (mpc_imagref(z), 0) != 0)
           PRINT_ERROR ("mpc_set_uj", prec, z);
 
         mpc_set_sj (z, im, MPC_RNDNN);
-        if (mpfr_cmp_ui (MPC_RE(z), u) != 0
-            || mpfr_cmp_ui (MPC_IM(z), 0) != 0)
+        if (mpfr_cmp_ui (mpc_realref(z), u) != 0
+            || mpfr_cmp_ui (mpc_imagref(z), 0) != 0)
           PRINT_ERROR ("mpc_set_sj (1)", prec, z);
 
         mpc_set_uj_uj (z, uim, uim, MPC_RNDNN);
-        if (mpfr_cmp_ui (MPC_RE(z), u) != 0
-            || mpfr_cmp_ui (MPC_IM(z), u) != 0)
+        if (mpfr_cmp_ui (mpc_realref(z), u) != 0
+            || mpfr_cmp_ui (mpc_imagref(z), u) != 0)
           PRINT_ERROR ("mpc_set_uj_uj", prec, z);
 
         mpc_set_sj_sj (z, im, im, MPC_RNDNN);
-        if (mpfr_cmp_ui (MPC_RE(z), u) != 0
-            || mpfr_cmp_ui (MPC_IM(z), u) != 0)
+        if (mpfr_cmp_ui (mpc_realref(z), u) != 0
+            || mpfr_cmp_ui (mpc_imagref(z), u) != 0)
           PRINT_ERROR ("mpc_set_sj_sj (1)", prec, z);
 
         im = LONG_MAX;
@@ -277,13 +277,13 @@ check_set (void)
           im = 2 * im * im + 4 * im + 1; /* gives 2^(2n-1)-1 from 2^(n-1)-1 */
 
         mpc_set_sj (z, im, MPC_RNDNN);
-        if (mpfr_get_sj (MPC_RE(z), GMP_RNDN) != im ||
-            mpfr_cmp_ui (MPC_IM(z), 0) != 0)
+        if (mpfr_get_sj (mpc_realref(z), GMP_RNDN) != im ||
+            mpfr_cmp_ui (mpc_imagref(z), 0) != 0)
           PRINT_ERROR ("mpc_set_sj (2)", im, z);
 
         mpc_set_sj_sj (z, im, im, MPC_RNDNN);
-        if (mpfr_get_sj (MPC_RE(z), GMP_RNDN) != im ||
-            mpfr_get_sj (MPC_IM(z), GMP_RNDN) != im)
+        if (mpfr_get_sj (mpc_realref(z), GMP_RNDN) != im ||
+            mpfr_get_sj (mpc_imagref(z), GMP_RNDN) != im)
           PRINT_ERROR ("mpc_set_sj_sj (2)", im, z);
       }
 #endif /* _MPC_H_HAVE_INTMAX_T */
@@ -349,11 +349,11 @@ check_set_str (mpfr_exp_t exp_max)
       base = 2 + (int) gmp_urandomm_ui (rands, 35);
          /* uses external variable rands from random.c */
 
-      mpfr_set_nan (MPC_RE (expected));
-      mpfr_set_inf (MPC_IM (expected), prec % 2 - 1);
+      mpfr_set_nan (mpc_realref (expected));
+      mpfr_set_inf (mpc_imagref (expected), prec % 2 - 1);
       str = mpc_get_str (base, 0, expected, MPC_RNDNN);
-      if (mpfr_nan_p (MPC_RE (got)) == 0
-          || mpfr_cmp (MPC_IM (got), MPC_IM (expected)) != 0)
+      if (mpfr_nan_p (mpc_realref (got)) == 0
+          || mpfr_cmp (mpc_imagref (got), mpc_imagref (expected)) != 0)
         {
           printf ("Error: mpc_set_str o mpc_get_str != Id\n"
                   "in base %u with str=\"%s\"\n", base, str);