diff options
| author | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2021-12-08 12:12:23 -0500 |
|---|---|---|
| committer | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2021-12-08 12:12:23 -0500 |
| commit | 322381086cf947e540e454bd427c214b1eaf6ed1 (patch) | |
| tree | 293d4166995973359fee87f37f058ffceaf5aff7 | |
| parent | def992b66951abf1d1f6200d2af9e16ebd81365e (diff) | |
| parent | 09e98ee95fb453adc0f1783937477cd065611581 (diff) | |
| download | egawk-322381086cf947e540e454bd427c214b1eaf6ed1.tar.gz egawk-322381086cf947e540e454bd427c214b1eaf6ed1.tar.bz2 egawk-322381086cf947e540e454bd427c214b1eaf6ed1.zip | |
Merge commit '09e98ee95fb453adc0f1783937477cd065611581' into feature/readall to get rwarray to work with mpfr values.
| -rw-r--r-- | extension/ChangeLog | 8 | ||||
| -rw-r--r-- | extension/rwarray.c | 22 |
2 files changed, 30 insertions, 0 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index 90defbfc..15a2f5b1 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,11 @@ +2021-12-08 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * rwarray.c (write_number): Since mpfr_fpif_export is experimental + and not available in older versions of mpfr, add an ifdef to + use mpfr_out_str instead. + (read_number): Similarly, use mpfr_inp_str instead of + mpfr_fpif_import. + 2021-11-18 Arnold D. Robbins <arnold@skeeve.com> * rwarray.c: Add support for writing/reading GMP and MPFR values. diff --git a/extension/rwarray.c b/extension/rwarray.c index 9a8c1e4a..ecc0c4a9 100644 --- a/extension/rwarray.c +++ b/extension/rwarray.c @@ -330,7 +330,22 @@ write_number(FILE *fp, awk_value_t *val) if (fwrite(& code, 1, sizeof(code), fp) != sizeof(code)) return awk_false; +#ifdef USE_MPFR_FPIF + /* This would be preferable, but it is not available + * on older platforms with mpfr 3.x. It's also marked + * experimental in mpfr 4.1, so perhaps not ready for + * production use yet. */ if (mpfr_fpif_export(fp, val->num_ptr) != 0) +#else +#define MPFR_STR_BASE 62 /* maximize base to minimize string len */ +#define MPFR_STR_ROUND MPFR_RNDN + /* XXX does the choice of MPFR_RNDN matter, given + * that the precision is 0, so we should be rendering + * in full precision? */ + /* We need to write a terminating space, since + * mpfr_inp_str reads until it hits a space or EOF */ + if ((mpfr_out_str(fp, MPFR_STR_BASE, 0, val->num_ptr, MPFR_STR_ROUND) == 0) || (putc(' ', fp) == EOF)) +#endif return awk_false; } else { code = htonl(VT_GMP); @@ -624,7 +639,14 @@ read_number(FILE *fp, awk_value_t *value, uint32_t code) mpfr_t mpfr_val; mpfr_init(mpfr_val); +#ifdef USE_MPFR_FPIF + /* preferable if widely available and stable */ if (mpfr_fpif_import(mpfr_val, fp) != 0) +#else + /* N.B. need to consume the terminating space we wrote + * after mpfr_out_str */ + if ((mpfr_inp_str(mpfr_val, fp, MPFR_STR_BASE, MPFR_STR_ROUND) == 0) || (getc(fp) != ' ')) +#endif return awk_false; value = make_number_mpfr(& mpfr_val, value); |