diff options
author | Damien George <damien.p.george@gmail.com> | 2014-07-03 13:25:24 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-07-03 13:25:24 +0100 |
commit | 40f3c026823f8951a2fa04e9c7fc93c75bc27bec (patch) | |
tree | c9c8210654c7114f00c5234a8481d9b5fbd28ce0 /py/mpz.h | |
parent | 065aba587571150074ea79483ffa72c0fe6bc8c8 (diff) |
Rename machine_(u)int_t to mp_(u)int_t.
See discussion in issue #50.
Diffstat (limited to 'py/mpz.h')
-rw-r--r-- | py/mpz.h | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -29,27 +29,27 @@ typedef uint32_t mpz_dbl_dig_t; typedef int32_t mpz_dbl_dig_signed_t; typedef struct _mpz_t { - machine_uint_t neg : 1; - machine_uint_t fixed_dig : 1; - machine_uint_t alloc : 30; - machine_uint_t len; + mp_uint_t neg : 1; + mp_uint_t fixed_dig : 1; + mp_uint_t alloc : 30; + mp_uint_t len; mpz_dig_t *dig; } mpz_t; #define MPZ_DIG_SIZE (15) // see mpn_div for why this needs to be at most 15 -#define MPZ_NUM_DIG_FOR_INT (sizeof(machine_int_t) * 8 / MPZ_DIG_SIZE + 1) +#define MPZ_NUM_DIG_FOR_INT (sizeof(mp_int_t) * 8 / MPZ_DIG_SIZE + 1) #define MPZ_NUM_DIG_FOR_LL (sizeof(long long) * 8 / MPZ_DIG_SIZE + 1) // convenience macro to declare an mpz with a digit array from the stack, initialised by an integer #define MPZ_CONST_INT(z, val) mpz_t z; mpz_dig_t z ## _digits[MPZ_NUM_DIG_FOR_INT]; mpz_init_fixed_from_int(&z, z_digits, MPZ_NUM_DIG_FOR_INT, val); void mpz_init_zero(mpz_t *z); -void mpz_init_from_int(mpz_t *z, machine_int_t val); -void mpz_init_fixed_from_int(mpz_t *z, mpz_dig_t *dig, uint dig_alloc, machine_int_t val); +void mpz_init_from_int(mpz_t *z, mp_int_t val); +void mpz_init_fixed_from_int(mpz_t *z, mpz_dig_t *dig, uint dig_alloc, mp_int_t val); void mpz_deinit(mpz_t *z); mpz_t *mpz_zero(); -mpz_t *mpz_from_int(machine_int_t i); +mpz_t *mpz_from_int(mp_int_t i); mpz_t *mpz_from_ll(long long i); mpz_t *mpz_from_str(const char *str, uint len, bool neg, uint base); void mpz_free(mpz_t *z); @@ -57,7 +57,7 @@ void mpz_free(mpz_t *z); mpz_t *mpz_clone(const mpz_t *src); void mpz_set(mpz_t *dest, const mpz_t *src); -void mpz_set_from_int(mpz_t *z, machine_int_t src); +void mpz_set_from_int(mpz_t *z, mp_int_t src); void mpz_set_from_ll(mpz_t *z, long long i); uint mpz_set_from_str(mpz_t *z, const char *str, uint len, bool neg, uint base); @@ -79,8 +79,8 @@ mpz_t *mpz_pow(const mpz_t *lhs, const mpz_t *rhs); void mpz_abs_inpl(mpz_t *dest, const mpz_t *z); void mpz_neg_inpl(mpz_t *dest, const mpz_t *z); void mpz_not_inpl(mpz_t *dest, const mpz_t *z); -void mpz_shl_inpl(mpz_t *dest, const mpz_t *lhs, machine_int_t rhs); -void mpz_shr_inpl(mpz_t *dest, const mpz_t *lhs, machine_int_t rhs); +void mpz_shl_inpl(mpz_t *dest, const mpz_t *lhs, mp_int_t rhs); +void mpz_shr_inpl(mpz_t *dest, const mpz_t *lhs, mp_int_t rhs); void mpz_add_inpl(mpz_t *dest, const mpz_t *lhs, const mpz_t *rhs); void mpz_sub_inpl(mpz_t *dest, const mpz_t *lhs, const mpz_t *rhs); void mpz_mul_inpl(mpz_t *dest, const mpz_t *lhs, const mpz_t *rhs); @@ -96,8 +96,8 @@ void mpz_divmod_inpl(mpz_t *dest_quo, mpz_t *dest_rem, const mpz_t *lhs, const m mpz_t *mpz_div(const mpz_t *lhs, const mpz_t *rhs); mpz_t *mpz_mod(const mpz_t *lhs, const mpz_t *rhs); -machine_int_t mpz_as_int(const mpz_t *z); -bool mpz_as_int_checked(const mpz_t *z, machine_int_t *value); +mp_int_t mpz_as_int(const mpz_t *z); +bool mpz_as_int_checked(const mpz_t *z, mp_int_t *value); #if MICROPY_PY_BUILTINS_FLOAT mp_float_t mpz_as_float(const mpz_t *z); #endif |