diff options
Diffstat (limited to 'tests')
52 files changed, 138 insertions, 138 deletions
diff --git a/tests/mpfr-test.h b/tests/mpfr-test.h index b8df10e30..3c88ced10 100644 --- a/tests/mpfr-test.h +++ b/tests/mpfr-test.h @@ -87,7 +87,7 @@ void tests_default_random _MPFR_PROTO ((mpfr_ptr, int, mp_exp_t, mp_exp_t)); void data_check _MPFR_PROTO ((char *, int (*) (FLIST), char *)); void bad_cases _MPFR_PROTO ((int (*)(FLIST), int (*)(FLIST), char *, int, mp_exp_t, mp_exp_t, - mp_prec_t, mp_prec_t, mp_prec_t, int)); + mpfr_prec_t, mpfr_prec_t, mpfr_prec_t, int)); int mpfr_cmp_str _MPFR_PROTO ((mpfr_srcptr x, const char *, int, mpfr_rnd_t)); #define mpfr_cmp_str1(x,s) mpfr_cmp_str(x,s,10,MPFR_RNDN) @@ -132,7 +132,7 @@ mpfr_print_raw (mpfr_srcptr x) else { mp_limb_t *mx; - mp_prec_t px; + mpfr_prec_t px; mp_size_t n; mx = MPFR_MANT (x); diff --git a/tests/reuse.c b/tests/reuse.c index bfc360ab3..05fb9c8fd 100644 --- a/tests/reuse.c +++ b/tests/reuse.c @@ -89,7 +89,7 @@ mpfr_compare (mpfr_srcptr a, mpfr_srcptr b) static void test3 (int (*testfunc)(mpfr_ptr, mpfr_srcptr, mpfr_srcptr, mpfr_rnd_t), - char *foo, mp_prec_t prec, mpfr_rnd_t rnd) + char *foo, mpfr_prec_t prec, mpfr_rnd_t rnd) { mpfr_t ref1, ref2, ref3; mpfr_t res1; @@ -160,7 +160,7 @@ test3 (int (*testfunc)(mpfr_ptr, mpfr_srcptr, mpfr_srcptr, mpfr_rnd_t), static void test4 (int (*testfunc)(mpfr_ptr, mpfr_srcptr, mpfr_srcptr, mpfr_srcptr, mpfr_rnd_t), - char *foo, mp_prec_t prec, mpfr_rnd_t rnd) + char *foo, mpfr_prec_t prec, mpfr_rnd_t rnd) { mpfr_t ref, op1, op2, op3; mpfr_t res; @@ -288,7 +288,7 @@ test4 (int (*testfunc)(mpfr_ptr, mpfr_srcptr, mpfr_srcptr, mpfr_srcptr, static void test2ui (int (*testfunc)(mpfr_ptr, mpfr_srcptr, unsigned long int, mpfr_rnd_t), - char *foo, mp_prec_t prec, mpfr_rnd_t rnd) + char *foo, mpfr_prec_t prec, mpfr_rnd_t rnd) { mpfr_t ref1, ref2; unsigned int ref3; @@ -333,7 +333,7 @@ test2ui (int (*testfunc)(mpfr_ptr, mpfr_srcptr, unsigned long int, mpfr_rnd_t), static void testui2 (int (*testfunc)(mpfr_ptr, unsigned long int, mpfr_srcptr, mpfr_rnd_t), - char *foo, mp_prec_t prec, mpfr_rnd_t rnd) + char *foo, mpfr_prec_t prec, mpfr_rnd_t rnd) { mpfr_t ref1, ref3; unsigned int ref2; @@ -374,7 +374,7 @@ testui2 (int (*testfunc)(mpfr_ptr, unsigned long int, mpfr_srcptr, mpfr_rnd_t), /* foo(mpfr_ptr, mpfr_srcptr, mp_rndt) */ static void test2 (int (*testfunc)(mpfr_ptr, mpfr_srcptr, mpfr_rnd_t), - char *foo, mp_prec_t prec, mpfr_rnd_t rnd) + char *foo, mpfr_prec_t prec, mpfr_rnd_t rnd) { mpfr_t ref1, ref2; mpfr_t res1; @@ -414,7 +414,7 @@ test2 (int (*testfunc)(mpfr_ptr, mpfr_srcptr, mpfr_rnd_t), /* foo(mpfr_ptr, mpfr_srcptr) */ static void test2a (int (*testfunc)(mpfr_ptr, mpfr_srcptr), - char *foo, mp_prec_t prec) + char *foo, mpfr_prec_t prec) { mpfr_t ref1, ref2; mpfr_t res1; @@ -454,7 +454,7 @@ test2a (int (*testfunc)(mpfr_ptr, mpfr_srcptr), /* one operand, two results */ static void test3a (int (*testfunc)(mpfr_ptr, mpfr_ptr, mpfr_srcptr, mpfr_rnd_t), - char *foo, mp_prec_t prec, mpfr_rnd_t rnd) + char *foo, mpfr_prec_t prec, mpfr_rnd_t rnd) { mpfr_t ref1, ref2, ref3; mpfr_t res1, res2; @@ -520,7 +520,7 @@ int main (void) { int rnd; - mp_prec_t p; + mpfr_prec_t p; tests_start_mpfr (); p = (randlimb () % 200)+ MPFR_PREC_MIN; diff --git a/tests/tabs.c b/tests/tabs.c index b107f3449..345ff9586 100644 --- a/tests/tabs.c +++ b/tests/tabs.c @@ -29,7 +29,7 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., static void check_inexact (void) { - mp_prec_t p, q; + mpfr_prec_t p, q; mpfr_t x, y, absx; int rnd; int inexact, cmp; diff --git a/tests/tadd.c b/tests/tadd.c index 5779e6ef6..983dacf70 100644 --- a/tests/tadd.c +++ b/tests/tadd.c @@ -467,7 +467,7 @@ static void check_inexact (void) { mpfr_t x, y, z, u; - mp_prec_t px, py, pu, pz; + mpfr_prec_t px, py, pu, pz; int inexact, cmp; mpfr_rnd_t rnd; @@ -627,7 +627,7 @@ static void check_overflow (void) { mpfr_t a, b, c; - mp_prec_t prec_a; + mpfr_prec_t prec_a; int r; mpfr_init2 (a, 256); @@ -676,7 +676,7 @@ check_1111 (void) mpfr_set_ui (one, 1, MPFR_RNDN); for (n = 0; n < NUM; n++) { - mp_prec_t prec_a, prec_b, prec_c; + mpfr_prec_t prec_a, prec_b, prec_c; mp_exp_t tb=0, tc, diff; mpfr_t a, b, c, s; int m = 512; @@ -747,7 +747,7 @@ check_1111 (void) static void check_1minuseps (void) { - static mp_prec_t prec_a[] = { + static mpfr_prec_t prec_a[] = { MPFR_PREC_MIN, 30, 31, 32, 33, 62, 63, 64, 65, 126, 127, 128, 129 }; static int supp_b[] = { @@ -761,7 +761,7 @@ check_1minuseps (void) for (ia = 0; ia < numberof (prec_a); ia++) for (ib = 0; ib < numberof(supp_b); ib++) { - mp_prec_t prec_b; + mpfr_prec_t prec_b; int rnd_mode; prec_b = prec_a[ia] + supp_b[ib]; diff --git a/tests/tadd1sp.c b/tests/tadd1sp.c index d11b2baa6..ba545e597 100644 --- a/tests/tadd1sp.c +++ b/tests/tadd1sp.c @@ -105,7 +105,7 @@ main (void) } static void -check_random (mp_prec_t p) +check_random (mpfr_prec_t p) { mpfr_t a1,b,c,a2; int r; diff --git a/tests/taway.c b/tests/taway.c index d900f9e0f..34c6a7c57 100644 --- a/tests/taway.c +++ b/tests/taway.c @@ -94,7 +94,7 @@ test3 (int (*testfunc)(mpfr_ptr, mpfr_srcptr, mpfr_srcptr, mpfr_rnd_t), { mpfr_t ref1, ref2, ref3; mpfr_t res1; - mp_prec_t p1, p2, p3; + mpfr_prec_t p1, p2, p3; int i, inexa, inexd; mpfr_rnd_t r; @@ -140,7 +140,7 @@ test4 (int (*testfunc)(mpfr_ptr, mpfr_srcptr, mpfr_srcptr, mpfr_srcptr, mpfr_rnd_t), char *foo) { mpfr_t ref, op1, op2, op3; - mp_prec_t pout, p1, p2, p3; + mpfr_prec_t pout, p1, p2, p3; mpfr_t res; int i, j, k, inexa, inexd; mpfr_rnd_t r; @@ -199,7 +199,7 @@ test2ui (int (*testfunc)(mpfr_ptr, mpfr_srcptr, unsigned long int, mpfr_rnd_t), mpfr_t ref1, ref2; unsigned int ref3; mpfr_t res1; - mp_prec_t p1, p2; + mpfr_prec_t p1, p2; int i, inexa, inexd; mpfr_rnd_t r; @@ -244,7 +244,7 @@ testui2 (int (*testfunc)(mpfr_ptr, unsigned long int, mpfr_srcptr, mpfr_rnd_t), mpfr_t ref1, ref3; unsigned int ref2; mpfr_t res1; - mp_prec_t p1, p3; + mpfr_prec_t p1, p3; int i, inexa, inexd; mpfr_rnd_t r; @@ -285,7 +285,7 @@ test2 (int (*testfunc)(mpfr_ptr, mpfr_srcptr, mpfr_rnd_t), char *foo) { mpfr_t ref1, ref2; mpfr_t res1; - mp_prec_t p1, p2; + mpfr_prec_t p1, p2; int i, inexa, inexd; mpfr_rnd_t r; @@ -326,7 +326,7 @@ test3a (int (*testfunc)(mpfr_ptr, mpfr_ptr, mpfr_srcptr, mpfr_rnd_t), char *foo) { mpfr_t ref1, ref2, ref3; mpfr_t res1, res2; - mp_prec_t p1, p2, p3; + mpfr_prec_t p1, p2, p3; int i, inexa, inexd; mpfr_rnd_t r; diff --git a/tests/tcan_round.c b/tests/tcan_round.c index dd5caac5b..4809a120c 100644 --- a/tests/tcan_round.c +++ b/tests/tcan_round.c @@ -32,7 +32,7 @@ check_round_p (void) { mp_limb_t buf[MAX_LIMB_SIZE]; mp_size_t n, i; - mp_prec_t p; + mpfr_prec_t p; mp_exp_t err; int r1, r2; @@ -41,7 +41,7 @@ check_round_p (void) /* avoid mpn_random which leaks memory */ for (i = 0; i < n; i++) buf[i] = randlimb (); - p = (mp_prec_t) randlimb() % ((n-1) * GMP_NUMB_BITS) + MPFR_PREC_MIN; + p = (mpfr_prec_t) randlimb() % ((n-1) * GMP_NUMB_BITS) + MPFR_PREC_MIN; err = p + randlimb () % GMP_NUMB_BITS; r1 = mpfr_round_p (buf, n, err, p); r2 = mpfr_can_round_raw (buf, n, MPFR_SIGN_POS, err, @@ -61,7 +61,7 @@ int main (void) { mpfr_t x; - mp_prec_t i, j; + mpfr_prec_t i, j; tests_start_mpfr (); diff --git a/tests/tcbrt.c b/tests/tcbrt.c index 359b9d785..13fed4507 100644 --- a/tests/tcbrt.c +++ b/tests/tcbrt.c @@ -153,7 +153,7 @@ main (void) { mpfr_t x; int r; - mp_prec_t p; + mpfr_prec_t p; tests_start_mpfr (); diff --git a/tests/tcmp.c b/tests/tcmp.c index 435842316..5f5b2e73d 100644 --- a/tests/tcmp.c +++ b/tests/tcmp.c @@ -32,7 +32,7 @@ main (void) mpfr_t xx, yy; int c; long i; - mp_prec_t p; + mpfr_prec_t p; tests_start_mpfr (); diff --git a/tests/tcmp2.c b/tests/tcmp2.c index e99706c57..05a2e9491 100644 --- a/tests/tcmp2.c +++ b/tests/tcmp2.c @@ -51,7 +51,7 @@ worst_cases (void) { mpfr_t x, y; unsigned int i, j, k, b, expected; - mp_prec_t l; + mpfr_prec_t l; mpfr_init2 (x, 200); mpfr_init2 (y, 200); @@ -142,7 +142,7 @@ static void tcmp2 (double x, double y, int i) { mpfr_t xx, yy; - mp_prec_t j; + mpfr_prec_t j; if (i == -1) { @@ -183,7 +183,7 @@ static void special (void) { mpfr_t x, y; - mp_prec_t j; + mpfr_prec_t j; mpfr_init (x); mpfr_init (y); diff --git a/tests/tcomparisons.c b/tests/tcomparisons.c index 8eed7bf6a..adccfe7e8 100644 --- a/tests/tcomparisons.c +++ b/tests/tcomparisons.c @@ -36,7 +36,7 @@ cmp_tests (void) mpfr_inits (x, y, (mpfr_ptr) 0); for (i = 0; i < 80000; i++) { - mp_prec_t precx, precy; + mpfr_prec_t precx, precy; int signx, signy, cmp; unsigned int cmpbool = 0; @@ -97,7 +97,7 @@ eq_tests (void) mpfr_inits (x, y, (mpfr_ptr) 0); for (i = 0; i < 20000; i++) { - mp_prec_t precx; + mpfr_prec_t precx; precx = (randlimb () % 17) * 11 + MPFR_PREC_MIN; mpfr_set_prec (x, precx); diff --git a/tests/tconst_log2.c b/tests/tconst_log2.c index 140c78d4c..d0acb89e5 100644 --- a/tests/tconst_log2.c +++ b/tests/tconst_log2.c @@ -28,7 +28,7 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., /* tlog2 [prec] [rnd] [0 = no print] */ static void -check (mp_prec_t p0, mp_prec_t p1) +check (mpfr_prec_t p0, mpfr_prec_t p1) { mpfr_t x, y, z; mpfr_rnd_t rnd; diff --git a/tests/tconst_pi.c b/tests/tconst_pi.c index 24a244097..6a2322f56 100644 --- a/tests/tconst_pi.c +++ b/tests/tconst_pi.c @@ -76,7 +76,7 @@ bug20091030 (void) { mpfr_t x, x_ref; int inex, inex_ref; - mp_prec_t p; + mpfr_prec_t p; int r; mpfr_free_cache (); @@ -129,7 +129,7 @@ int main (int argc, char *argv[]) { mpfr_t x; - mp_prec_t p; + mpfr_prec_t p; mpfr_rnd_t rnd; tests_start_mpfr (); diff --git a/tests/tdiv.c b/tests/tdiv.c index d1d534579..4fbe3bed1 100644 --- a/tests/tdiv.c +++ b/tests/tdiv.c @@ -288,7 +288,7 @@ static void check_hard (void) { mpfr_t u, v, q, q2; - mp_prec_t precu, precv, precq; + mpfr_prec_t precu, precv, precq; int rnd; int inex, inex2, i, j; @@ -515,7 +515,7 @@ static void check_inexact (void) { mpfr_t x, y, z, u; - mp_prec_t px, py, pu; + mpfr_prec_t px, py, pu; int inexact, cmp; mpfr_rnd_t rnd; @@ -768,7 +768,7 @@ consistency (void) for (i = 0; i < 10000; i++) { mpfr_rnd_t rnd; - mp_prec_t px, py, pz, p; + mpfr_prec_t px, py, pz, p; int inex1, inex2; rnd = RND_RAND (); diff --git a/tests/tdiv_ui.c b/tests/tdiv_ui.c index ee976d1b2..e78e4b623 100644 --- a/tests/tdiv_ui.c +++ b/tests/tdiv_ui.c @@ -144,7 +144,7 @@ static void check_inexact (void) { mpfr_t x, y, z; - mp_prec_t px, py; + mpfr_prec_t px, py; int inexact, cmp; unsigned long int u; int rnd; diff --git a/tests/teint.c b/tests/teint.c index e31be56e0..2869c5cce 100644 --- a/tests/teint.c +++ b/tests/teint.c @@ -192,7 +192,7 @@ main (int argc, char *argv[]) if (argc != 1) /* teint x [prec] */ { mpfr_t x; - mp_prec_t p; + mpfr_prec_t p; p = (argc < 3) ? 53 : atoi (argv[2]); mpfr_init2 (x, p); mpfr_set_str (x, argv[1], 10, MPFR_RNDN); diff --git a/tests/tests.c b/tests/tests.c index 2f6856b67..7143777a5 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -539,7 +539,7 @@ static void test5rm (int (*fct) (FLIST), mpfr_srcptr x, mpfr_ptr y, mpfr_ptr z, mpfr_rnd_t rnd, int test_one, char *name) { - mp_prec_t yprec = MPFR_PREC (y); + mpfr_prec_t yprec = MPFR_PREC (y); mpfr_rnd_t rndnext = MPFR_RND_MAX; /* means uninitialized */ MPFR_ASSERTN (test_one || rnd == MPFR_RNDZ); @@ -637,7 +637,7 @@ void data_check (char *f, int (*foo) (FLIST), char *name) { FILE *fp; - mp_prec_t xprec, yprec; + mpfr_prec_t xprec, yprec; mpfr_t x, y, z; mpfr_rnd_t rnd; char r; @@ -792,7 +792,7 @@ data_check (char *f, int (*foo) (FLIST), char *name) void bad_cases (int (*fct)(FLIST), int (*inv)(FLIST), char *name, int pos, mp_exp_t emin, mp_exp_t emax, - mp_prec_t pymin, mp_prec_t pymax, mp_prec_t psup, + mpfr_prec_t pymin, mpfr_prec_t pymax, mpfr_prec_t psup, int n) { mpfr_t x, y, z; @@ -808,7 +808,7 @@ bad_cases (int (*fct)(FLIST), int (*inv)(FLIST), char *name, mpfr_inits (x, y, z, (mpfr_ptr) 0); for (i = 0; i < n; i++) { - mp_prec_t px, py, pz; + mpfr_prec_t px, py, pz; int inex; if (dbg) diff --git a/tests/texp.c b/tests/texp.c index f3187b04e..dc75cad65 100644 --- a/tests/texp.c +++ b/tests/texp.c @@ -156,10 +156,10 @@ check_worst_cases (void) } static void -compare_exp2_exp3 (mp_prec_t p0, mp_prec_t p1) +compare_exp2_exp3 (mpfr_prec_t p0, mpfr_prec_t p1) { mpfr_t x, y, z; - mp_prec_t prec; + mpfr_prec_t prec; mpfr_rnd_t rnd; mpfr_init (x); @@ -199,7 +199,7 @@ static void check_large (void) { mpfr_t x, z; - mp_prec_t prec; + mpfr_prec_t prec; /* bug found by Patrick Pe'lissier on 7 Jun 2004 */ prec = 203780; @@ -596,7 +596,7 @@ bug20080731 (void) { mp_exp_t emin; mpfr_t x, y1, y2; - mp_prec_t prec = 64; + mpfr_prec_t prec = 64; emin = mpfr_get_emin (); set_emin (MPFR_EMIN_MIN); diff --git a/tests/tfactorial.c b/tests/tfactorial.c index ef507b140..6763f95d3 100644 --- a/tests/tfactorial.c +++ b/tests/tfactorial.c @@ -74,7 +74,7 @@ test_int (void) unsigned long n0 = 1, n1 = 80, n; mpz_t f; mpfr_t x, y; - mp_prec_t prec_f, p; + mpfr_prec_t prec_f, p; int r; int inex1, inex2; diff --git a/tests/tfma.c b/tests/tfma.c index 01e872664..a1d95fa1d 100644 --- a/tests/tfma.c +++ b/tests/tfma.c @@ -539,13 +539,13 @@ main (int argc, char *argv[]) } { - mp_prec_t prec; + mpfr_prec_t prec; mpfr_t t, slong; mpfr_rnd_t rnd; int inexact, compare; unsigned int n; - mp_prec_t p0=2, p1=200; + mpfr_prec_t p0=2, p1=200; unsigned int N=200; mpfr_init (t); diff --git a/tests/tfms.c b/tests/tfms.c index a9ef94141..888432a7c 100644 --- a/tests/tfms.c +++ b/tests/tfms.c @@ -542,13 +542,13 @@ main (int argc, char *argv[]) } { - mp_prec_t prec; + mpfr_prec_t prec; mpfr_t t, slong; mpfr_rnd_t rnd; int inexact, compare; unsigned int n; - mp_prec_t p0=2, p1=200; + mpfr_prec_t p0=2, p1=200; unsigned int N=200; mpfr_init (t); diff --git a/tests/tfrac.c b/tests/tfrac.c index 259f95ca5..fabe5c7c9 100644 --- a/tests/tfrac.c +++ b/tests/tfrac.c @@ -30,7 +30,7 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., #define PMAX (PIP+2*PFP) static void -check0 (mpfr_ptr ip, mpfr_ptr fp, mp_prec_t prec, mpfr_rnd_t rnd) +check0 (mpfr_ptr ip, mpfr_ptr fp, mpfr_prec_t prec, mpfr_rnd_t rnd) { mpfr_t sum, tmp, dst, fp2; int inex1, inex2; diff --git a/tests/tgeneric.c b/tests/tgeneric.c index 3b374a41a..2f9804b62 100644 --- a/tests/tgeneric.c +++ b/tests/tgeneric.c @@ -108,9 +108,9 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., #endif static void -test_generic (mp_prec_t p0, mp_prec_t p1, unsigned int N) +test_generic (mpfr_prec_t p0, mpfr_prec_t p1, unsigned int N) { - mp_prec_t prec, xprec, yprec; + mpfr_prec_t prec, xprec, yprec; mpfr_t x, y, z, t; #ifdef TWO_ARGS mpfr_t u; diff --git a/tests/tgeneric_ui.c b/tests/tgeneric_ui.c index e2b405dd0..cccbf55af 100644 --- a/tests/tgeneric_ui.c +++ b/tests/tgeneric_ui.c @@ -32,9 +32,9 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., #endif static void -test_generic_ui (mp_prec_t p0, mp_prec_t p1, unsigned int N) +test_generic_ui (mpfr_prec_t p0, mpfr_prec_t p1, unsigned int N) { - mp_prec_t prec, yprec; + mpfr_prec_t prec, yprec; mpfr_t x, y, z, t; INTEGER_TYPE u; mpfr_rnd_t rnd; diff --git a/tests/tget_sj.c b/tests/tget_sj.c index fbefc2b49..2a0cff20e 100644 --- a/tests/tget_sj.c +++ b/tests/tget_sj.c @@ -211,7 +211,7 @@ check_erange (void) int main (void) { - mp_prec_t prec; + mpfr_prec_t prec; mpfr_t x, y; intmax_t s; uintmax_t u; diff --git a/tests/tget_str.c b/tests/tget_str.c index 3b2913bec..76072a807 100644 --- a/tests/tget_str.c +++ b/tests/tget_str.c @@ -50,7 +50,7 @@ check_small (void) mpfr_t x; char *s; mp_exp_t e; - mp_prec_t p; + mpfr_prec_t p; mpfr_init (x); @@ -1072,7 +1072,7 @@ check_large (void) #define MAX_DIGITS 100 static void -check_special (int b, mp_prec_t p) +check_special (int b, mpfr_prec_t p) { mpfr_t x; int i, j; @@ -1210,7 +1210,7 @@ main (int argc, char *argv[]) char s[MAX_DIGITS + 2]; mp_exp_t e, f; size_t m; - mp_prec_t p; + mpfr_prec_t p; int i; tests_start_mpfr (); diff --git a/tests/tgmpop.c b/tests/tgmpop.c index 28fd80842..093f63d92 100644 --- a/tests/tgmpop.c +++ b/tests/tgmpop.c @@ -199,11 +199,11 @@ check_for_zero (void) } static void -test_cmp_z (mp_prec_t pmin, mp_prec_t pmax, int nmax) +test_cmp_z (mpfr_prec_t pmin, mpfr_prec_t pmax, int nmax) { mpfr_t x, z; mpz_t y; - mp_prec_t p; + mpfr_prec_t p; int res1, res2; int n; @@ -237,11 +237,11 @@ test_cmp_z (mp_prec_t pmin, mp_prec_t pmax, int nmax) } static void -test_cmp_q (mp_prec_t pmin, mp_prec_t pmax, int nmax) +test_cmp_q (mpfr_prec_t pmin, mpfr_prec_t pmax, int nmax) { mpfr_t x, z; mpq_t y; - mp_prec_t p; + mpfr_prec_t p; int res1, res2; int n; @@ -275,11 +275,11 @@ test_cmp_q (mp_prec_t pmin, mp_prec_t pmax, int nmax) } static void -test_cmp_f (mp_prec_t pmin, mp_prec_t pmax, int nmax) +test_cmp_f (mpfr_prec_t pmin, mpfr_prec_t pmax, int nmax) { mpfr_t x, z; mpf_t y; - mp_prec_t p; + mpfr_prec_t p; int res1, res2; int n; @@ -390,11 +390,11 @@ test_specialz (int (*mpfr_func)(mpfr_ptr, mpfr_srcptr, mpz_srcptr, mpfr_rnd_t), } static void -test_genericz (mp_prec_t p0, mp_prec_t p1, unsigned int N, +test_genericz (mpfr_prec_t p0, mpfr_prec_t p1, unsigned int N, int (*func)(mpfr_ptr, mpfr_srcptr, mpz_srcptr, mpfr_rnd_t), const char *op) { - mp_prec_t prec; + mpfr_prec_t prec; mpfr_t arg1, dst_big, dst_small, tmp; mpz_t arg2; mpfr_rnd_t rnd; @@ -467,11 +467,11 @@ test_genericz (mp_prec_t p0, mp_prec_t p1, unsigned int N, } static void -test_genericq (mp_prec_t p0, mp_prec_t p1, unsigned int N, +test_genericq (mpfr_prec_t p0, mpfr_prec_t p1, unsigned int N, int (*func)(mpfr_ptr, mpfr_srcptr, mpq_srcptr, mpfr_rnd_t), const char *op) { - mp_prec_t prec; + mpfr_prec_t prec; mpfr_t arg1, dst_big, dst_small, tmp; mpq_t arg2; mpfr_rnd_t rnd; @@ -547,7 +547,7 @@ test_genericq (mp_prec_t p0, mp_prec_t p1, unsigned int N, } static void -test_specialq (mp_prec_t p0, mp_prec_t p1, unsigned int N, +test_specialq (mpfr_prec_t p0, mpfr_prec_t p1, unsigned int N, int (*mpfr_func)(mpfr_ptr, mpfr_srcptr, mpq_srcptr, mpfr_rnd_t), void (*mpq_func)(mpq_ptr, mpq_srcptr, mpq_srcptr), const char *op) @@ -555,7 +555,7 @@ test_specialq (mp_prec_t p0, mp_prec_t p1, unsigned int N, mpfr_t fra, frb, frq; mpq_t q1, q2, qr; unsigned int n; - mp_prec_t prec; + mpfr_prec_t prec; for (prec = p0 ; prec < p1 ; prec++) { diff --git a/tests/tmodf.c b/tests/tmodf.c index bf83dcf12..8c47370b5 100644 --- a/tests/tmodf.c +++ b/tests/tmodf.c @@ -29,7 +29,7 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., static void check (const char *xis, const char *xfs, const char *xs, - mp_prec_t xip, mp_prec_t xfp, mp_prec_t xp, + mpfr_prec_t xip, mpfr_prec_t xfp, mpfr_prec_t xp, int expected_return, mpfr_rnd_t rnd_mode) { int inexact; diff --git a/tests/tmul.c b/tests/tmul.c index b5da995b2..6689cda39 100644 --- a/tests/tmul.c +++ b/tests/tmul.c @@ -210,7 +210,7 @@ static void check_exact (void) { mpfr_t a, b, c, d; - mp_prec_t prec; + mpfr_prec_t prec; int i, inexact; mpfr_rnd_t rnd; diff --git a/tests/tmul_ui.c b/tests/tmul_ui.c index 2441a021b..6aca85ccb 100644 --- a/tests/tmul_ui.c +++ b/tests/tmul_ui.c @@ -26,11 +26,11 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., #include "mpfr-test.h" static void -check_inexact (mp_prec_t p) +check_inexact (mpfr_prec_t p) { mpfr_t x, y, z; unsigned long u; - mp_prec_t q; + mpfr_prec_t q; int inexact, cmp; int rnd; @@ -85,7 +85,7 @@ main (int argc, char *argv[]) { mpfr_t x, y; unsigned int xprec, yprec, i; - mp_prec_t p; + mpfr_prec_t p; mp_exp_t emax; tests_start_mpfr (); diff --git a/tests/tnext.c b/tests/tnext.c index 1301d8c50..64772c4e0 100644 --- a/tests/tnext.c +++ b/tests/tnext.c @@ -34,7 +34,7 @@ generic_abovebelow (void) for (i = 0; i < 20000; i++) { mpfr_t x, y, z, t; - mp_prec_t prec; + mpfr_prec_t prec; int neg, below; prec = (randlimb () % 300) + MPFR_PREC_MIN; @@ -97,7 +97,7 @@ inverse_test (void) { static const char *tests[] = { "0", "1", "2", "3.1", "Inf" }; int i, neg, below; - mp_prec_t prec; + mpfr_prec_t prec; for (i = 0; i < (int) (sizeof(tests) / sizeof(tests[0])); i++) for (neg = 0; neg <= 1; neg++) diff --git a/tests/tpow.c b/tests/tpow.c index fbc5147b1..982d741ac 100644 --- a/tests/tpow.c +++ b/tests/tpow.c @@ -411,11 +411,11 @@ pow_si_long_min (void) } static void -check_inexact (mp_prec_t p) +check_inexact (mpfr_prec_t p) { mpfr_t x, y, z, t; unsigned long u; - mp_prec_t q; + mpfr_prec_t q; int inexact, cmp; int rnd; @@ -1371,7 +1371,7 @@ bug20080820 (void) int main (int argc, char **argv) { - mp_prec_t p; + mpfr_prec_t p; tests_start_mpfr (); diff --git a/tests/tpow3.c b/tests/tpow3.c index 17f97bcc5..28fcaff86 100644 --- a/tests/tpow3.c +++ b/tests/tpow3.c @@ -32,13 +32,13 @@ main (int argc, char *argv[]) { mpfr_t x, y, z; - mp_prec_t prec, yprec; + mpfr_prec_t prec, yprec; mpfr_t t, s; mpfr_rnd_t rnd; int inexact, compare, compare2; unsigned int n, err; - mp_prec_t p0=2, p1=100; + mpfr_prec_t p0=2, p1=100; unsigned int N=25; tests_start_mpfr (); diff --git a/tests/tpow_z.c b/tests/tpow_z.c index baa8b9434..6f6baf50b 100644 --- a/tests/tpow_z.c +++ b/tests/tpow_z.c @@ -138,12 +138,12 @@ check_special (void) } static void -check_integer (mp_prec_t begin, mp_prec_t end, unsigned long max) +check_integer (mpfr_prec_t begin, mpfr_prec_t end, unsigned long max) { mpfr_t x, y1, y2; mpz_t z; unsigned long i, n; - mp_prec_t p; + mpfr_prec_t p; int res1, res2; mpfr_rnd_t rnd; diff --git a/tests/trandom.c b/tests/trandom.c index 6741e9b30..72df33d68 100644 --- a/tests/trandom.c +++ b/tests/trandom.c @@ -27,7 +27,7 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., static void -test_urandomb (long nbtests, mp_prec_t prec, int verbose) +test_urandomb (long nbtests, mpfr_prec_t prec, int verbose) { mpfr_t x; int *tab, size_tab, k, sh, xn; @@ -107,7 +107,7 @@ int main (int argc, char *argv[]) { long nbtests; - mp_prec_t prec; + mpfr_prec_t prec; int verbose = 0; tests_start_mpfr (); diff --git a/tests/trint.c b/tests/trint.c index f015b9eac..19b12f42b 100644 --- a/tests/trint.c +++ b/tests/trint.c @@ -211,7 +211,7 @@ test_against_libc (void) #endif static void -err (char *str, mp_size_t s, mpfr_t x, mpfr_t y, mp_prec_t p, mpfr_rnd_t r, +err (char *str, mp_size_t s, mpfr_t x, mpfr_t y, mpfr_prec_t p, mpfr_rnd_t r, int trint, int inexact) { printf ("Error: %s\ns = %u, p = %u, r = %s, trint = %d, inexact = %d\nx = ", @@ -229,7 +229,7 @@ main (int argc, char *argv[]) { mp_size_t s; mpz_t z; - mp_prec_t p; + mpfr_prec_t p; mpfr_t x, y, t, u, v; int r; int inexact, sign_t; diff --git a/tests/troot.c b/tests/troot.c index c1a848989..28ab0a1fa 100644 --- a/tests/troot.c +++ b/tests/troot.c @@ -265,7 +265,7 @@ main (void) { mpfr_t x; int r; - mp_prec_t p; + mpfr_prec_t p; unsigned long k; tests_start_mpfr (); diff --git a/tests/tset_sj.c b/tests/tset_sj.c index 20bbac2c7..6834baf1a 100644 --- a/tests/tset_sj.c +++ b/tests/tset_sj.c @@ -63,10 +63,10 @@ inexact_sign (int x) } static void -check_set_uj (mp_prec_t pmin, mp_prec_t pmax, int N) +check_set_uj (mpfr_prec_t pmin, mpfr_prec_t pmax, int N) { mpfr_t x, y; - mp_prec_t p; + mpfr_prec_t p; int inex1, inex2, n; mp_limb_t limb; diff --git a/tests/tsin.c b/tests/tsin.c index 9ae5bb6f4..29e1bf1c4 100644 --- a/tests/tsin.c +++ b/tests/tsin.c @@ -205,7 +205,7 @@ static void check_regression (void) { mpfr_t x, y; - mp_prec_t p; + mpfr_prec_t p; int i; p = strlen (xs) - 2 - 3; diff --git a/tests/tsin_cos.c b/tests/tsin_cos.c index 87b334340..2fc45b3c2 100644 --- a/tests/tsin_cos.c +++ b/tests/tsin_cos.c @@ -312,7 +312,7 @@ static void test_mpfr_sincos_fast (void) { mpfr_t x, y, z, yref, zref, h; - mp_prec_t p = 1000; + mpfr_prec_t p = 1000; int i, inex, inexref; mpfr_rnd_t r; @@ -372,7 +372,7 @@ static void bug20091007 (void) { mpfr_t x, y, z, yref, zref; - mp_prec_t p = 1000; + mpfr_prec_t p = 1000; int inex, inexref; mpfr_rnd_t r = MPFR_RNDZ; @@ -420,7 +420,7 @@ static void bug20091008 (void) { mpfr_t x, y, z, yref, zref; - mp_prec_t p = 1000; + mpfr_prec_t p = 1000; int inex, inexref; mpfr_rnd_t r = MPFR_RNDN; @@ -468,7 +468,7 @@ static void bug20091013 (void) { mpfr_t x, y, z, yref, zref; - mp_prec_t p = 1000; + mpfr_prec_t p = 1000; int inex, inexref; mpfr_rnd_t r = MPFR_RNDN; @@ -519,7 +519,7 @@ static void bug20091122 (void) { mpfr_t x, y, z, yref, zref; - mp_prec_t p = 3; + mpfr_prec_t p = 3; mpfr_rnd_t r = MPFR_RNDN; mpfr_init2 (x, 5); diff --git a/tests/tsqrt.c b/tests/tsqrt.c index 9c147ddcf..505c53c32 100644 --- a/tests/tsqrt.c +++ b/tests/tsqrt.c @@ -110,7 +110,7 @@ check24 (const char *as, mpfr_rnd_t rnd_mode, const char *qs) } static void -check_diverse (const char *as, mp_prec_t p, const char *qs) +check_diverse (const char *as, mpfr_prec_t p, const char *qs) { mpfr_t q; @@ -187,7 +187,7 @@ special (void) { mpfr_t x, y, z; int inexact; - mp_prec_t p; + mpfr_prec_t p; mpfr_init (x); mpfr_init (y); @@ -419,7 +419,7 @@ special (void) } static void -check_inexact (mp_prec_t p) +check_inexact (mpfr_prec_t p) { mpfr_t x, y, z; mpfr_rnd_t rnd; @@ -499,7 +499,7 @@ check_nan (void) /* check that -1 <= x/sqrt(x^2+s*y^2) <= 1 for rounding to nearest or up with s = 0 and s = 1 */ static void -test_property1 (mp_prec_t p, mpfr_rnd_t r, int s) +test_property1 (mpfr_prec_t p, mpfr_rnd_t r, int s) { mpfr_t x, y, z, t; @@ -538,7 +538,7 @@ test_property1 (mp_prec_t p, mpfr_rnd_t r, int s) /* check sqrt(x^2) = x */ static void -test_property2 (mp_prec_t p, mpfr_rnd_t r) +test_property2 (mpfr_prec_t p, mpfr_rnd_t r) { mpfr_t x, y; @@ -568,7 +568,7 @@ test_property2 (mp_prec_t p, mpfr_rnd_t r) int main (void) { - mp_prec_t p; + mpfr_prec_t p; int k; tests_start_mpfr (); diff --git a/tests/tstckintc.c b/tests/tstckintc.c index a7e0dfa35..84321b918 100644 --- a/tests/tstckintc.c +++ b/tests/tstckintc.c @@ -29,7 +29,7 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., long Buffer[BUFFER_SIZE]; char *stack = (char *) Buffer; -mp_prec_t p = PREC_TESTED; +mpfr_prec_t p = PREC_TESTED; #define ALIGNED(s) (((s) + sizeof (long) - 1) / sizeof (long) * sizeof (long)) @@ -48,7 +48,7 @@ new_st (size_t s) /* Alloc a new mpfr_t on the main stack */ static mpfr_ptr -new_mpfr (mp_prec_t p) +new_mpfr (mpfr_prec_t p) { mpfr_ptr x = (mpfr_ptr) new_st (sizeof (mpfr_t)); void *mantissa = new_st (mpfr_custom_get_size (p)); diff --git a/tests/tstrtofr.c b/tests/tstrtofr.c index d88abfd00..0620a3724 100644 --- a/tests/tstrtofr.c +++ b/tests/tstrtofr.c @@ -256,12 +256,12 @@ main (void) { int i, base; mpfr_t x; - mp_prec_t p; + mpfr_prec_t p; mp_exp_t e; mpfr_init (x); printf ("struct dymmy_test { \n" - " mp_prec_t prec; \n" + " mpfr_prec_t prec; \n" " int base; \n" " const char *str; \n" " const char *binstr; \n" @@ -286,7 +286,7 @@ main (void) #endif static struct dymmy_test { - mp_prec_t prec; + mpfr_prec_t prec; int base; const char *str; const char *binstr; @@ -598,7 +598,7 @@ check_reftable (void) { int i, base; mpfr_t x, y; - mp_prec_t p; + mpfr_prec_t p; char *s; mpfr_init2 (x, 200); diff --git a/tests/tsub.c b/tests/tsub.c index de4a35543..331aca41c 100644 --- a/tests/tsub.c +++ b/tests/tsub.c @@ -351,7 +351,7 @@ bug_ddefour(void) /* if u = o(x-y), v = o(u-x), w = o(v+y), then x-y = u-w */ static void -check_two_sum (mp_prec_t p) +check_two_sum (mpfr_prec_t p) { mpfr_t x, y, u, v, w; mpfr_rnd_t rnd; @@ -398,7 +398,7 @@ static void check_inexact (void) { mpfr_t x, y, z, u; - mp_prec_t px, py, pu, pz; + mpfr_prec_t px, py, pu, pz; int inexact, cmp; mpfr_rnd_t rnd; @@ -486,7 +486,7 @@ check_inexact (void) int main (void) { - mp_prec_t p; + mpfr_prec_t p; unsigned int i; tests_start_mpfr (); diff --git a/tests/tsub_ui.c b/tests/tsub_ui.c index 5f91a026a..da16620de 100644 --- a/tests/tsub_ui.c +++ b/tests/tsub_ui.c @@ -50,7 +50,7 @@ check3 (const char *xs, unsigned long y, mpfr_rnd_t rnd_mode, const char *zs) then x + y = u + w thus if u = o(y-x), v = o(u+x), w = o(v-y), then y-x = u-w */ static void -check_two_sum (mp_prec_t p) +check_two_sum (mpfr_prec_t p) { unsigned int x; mpfr_t y, u, v, w; @@ -123,7 +123,7 @@ check_nans (void) int main (int argc, char *argv[]) { - mp_prec_t p; + mpfr_prec_t p; int k; tests_start_mpfr (); diff --git a/tests/tsum.c b/tests/tsum.c index 27a2e9ea1..51c5ce936 100644 --- a/tests/tsum.c +++ b/tests/tsum.c @@ -54,10 +54,10 @@ sum_tab (mpfr_ptr ret, mpfr_t *tab, unsigned long n, mpfr_rnd_t rnd) } -static mp_prec_t -get_prec_max (mpfr_t *tab, unsigned long n, mp_prec_t f) +static mpfr_prec_t +get_prec_max (mpfr_t *tab, unsigned long n, mpfr_prec_t f) { - mp_prec_t res; + mpfr_prec_t res; mp_exp_t min, max; unsigned long i; @@ -81,10 +81,10 @@ get_prec_max (mpfr_t *tab, unsigned long n, mp_prec_t f) static void -algo_exact (mpfr_t somme, mpfr_t *tab, unsigned long n, mp_prec_t f) +algo_exact (mpfr_t somme, mpfr_t *tab, unsigned long n, mpfr_prec_t f) { unsigned long i; - mp_prec_t prec_max; + mpfr_prec_t prec_max; prec_max = get_prec_max(tab, n, f); mpfr_set_prec (somme, prec_max); @@ -101,7 +101,7 @@ algo_exact (mpfr_t somme, mpfr_t *tab, unsigned long n, mp_prec_t f) /* Test the sorting function */ static void -test_sort (mp_prec_t f, unsigned long n) +test_sort (mpfr_prec_t f, unsigned long n) { mpfr_t *tab; mpfr_ptr *tabtmp; @@ -140,7 +140,7 @@ test_sort (mp_prec_t f, unsigned long n) } static void -test_sum (mp_prec_t f, unsigned long n) +test_sum (mpfr_prec_t f, unsigned long n) { mpfr_t sum, real_sum, real_non_rounded; mpfr_t *tab; @@ -284,7 +284,7 @@ void check_special (void) int main (void) { - mp_prec_t p; + mpfr_prec_t p; unsigned long n; tests_start_mpfr (); diff --git a/tests/tui_div.c b/tests/tui_div.c index e9203765c..d26170d31 100644 --- a/tests/tui_div.c +++ b/tests/tui_div.c @@ -49,7 +49,7 @@ static void check_inexact (void) { mpfr_t x, y, z; - mp_prec_t px, py; + mpfr_prec_t px, py; int inexact, cmp; unsigned long int u; int rnd; diff --git a/tests/tui_pow.c b/tests/tui_pow.c index d9741f686..7fc8f7f69 100644 --- a/tests/tui_pow.c +++ b/tests/tui_pow.c @@ -84,11 +84,11 @@ test1 (void) } static void -check1 (mpfr_ptr x, mp_prec_t prec, unsigned long nt, mpfr_rnd_t rnd) +check1 (mpfr_ptr x, mpfr_prec_t prec, unsigned long nt, mpfr_rnd_t rnd) { mpfr_t y, z, t; int inexact, compare, compare2; - mp_prec_t yprec; + mpfr_prec_t yprec; mp_exp_t err; yprec = prec + 10; @@ -190,11 +190,11 @@ main (int argc, char *argv[]) { mpfr_t z, t; - mp_prec_t prec; + mpfr_prec_t prec; mpfr_rnd_t rnd; unsigned int n; - mp_prec_t p0=2, p1=100; + mpfr_prec_t p0=2, p1=100; unsigned int N=20; mpfr_init2 (z, 38); diff --git a/tests/tui_sub.c b/tests/tui_sub.c index df06cf402..69532753c 100644 --- a/tests/tui_sub.c +++ b/tests/tui_sub.c @@ -162,7 +162,7 @@ check (unsigned long y, const char *xs, mpfr_rnd_t rnd_mode, const char *zs) /* if u = o(x-y), v = o(u-x), w = o(v+y), then x-y = u-w */ static void -check_two_sum (mp_prec_t p) +check_two_sum (mpfr_prec_t p) { unsigned int x; mpfr_t y, u, v, w; @@ -265,7 +265,7 @@ static void check_neg (void) int main (int argc, char *argv[]) { - mp_prec_t p; + mpfr_prec_t p; unsigned k; tests_start_mpfr (); diff --git a/tests/turandom.c b/tests/turandom.c index 8e324362c..519bd886b 100644 --- a/tests/turandom.c +++ b/tests/turandom.c @@ -26,7 +26,7 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., #include "mpfr-test.h" static void -test_urandom (long nbtests, mp_prec_t prec, mpfr_rnd_t rnd, long bit_index, +test_urandom (long nbtests, mpfr_prec_t prec, mpfr_rnd_t rnd, long bit_index, int verbose) { mpfr_t x; @@ -158,7 +158,7 @@ int main (int argc, char *argv[]) { long nbtests; - mp_prec_t prec; + mpfr_prec_t prec; int verbose = 0; mpfr_rnd_t rnd; long bit_index; diff --git a/tests/tyn.c b/tests/tyn.c index 62db69aab..5618aa8d5 100644 --- a/tests/tyn.c +++ b/tests/tyn.c @@ -30,7 +30,7 @@ main (int argc, char *argv[]) { mpfr_t x, y; long n; - mp_prec_t prec = 53; + mpfr_prec_t prec = 53; tests_start_mpfr (); diff --git a/tests/tzeta.c b/tests/tzeta.c index b278b3a52..c75292a99 100644 --- a/tests/tzeta.c +++ b/tests/tzeta.c @@ -199,7 +199,7 @@ int main (int argc, char *argv[]) { mpfr_t s, y, z; - mp_prec_t prec; + mpfr_prec_t prec; mpfr_rnd_t rnd_mode; int inex; |