=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2018/io/pexpr.c,v retrieving revision 1.2 retrieving revision 1.6 diff -u -p -r1.2 -r1.6 --- OpenXM_contrib2/asir2018/io/pexpr.c 2018/10/01 05:49:06 1.2 +++ OpenXM_contrib2/asir2018/io/pexpr.c 2020/02/01 14:20:42 1.6 @@ -44,7 +44,7 @@ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. - * $OpenXM: OpenXM_contrib2/asir2018/io/pexpr.c,v 1.1 2018/09/19 05:45:08 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2018/io/pexpr.c,v 1.5 2019/12/24 10:26:39 kondoh Exp $ */ #include "ca.h" #include "al.h" @@ -123,6 +123,10 @@ int printmode = PRINTF_G; #define PRINTFNODENODE printfnodenode #define PRINTFARGS printfargs +#if defined(INTERVAL) +#define PRINTBF4ITV printbf4itv +#endif + #include "pexpr_body.c" /* spetial functions for file output */ @@ -164,21 +168,50 @@ void printbf(BF a) mpfr_free_str(s); } +#if defined(INTERVAL) +void printbf4itv(BF a) +{ + int dprec; + char fbuf[BUFSIZ]; + char *s; + + if ( !a ) { + TAIL PUTS("0"); + } + else { + dprec = (a->body->_mpfr_prec)*0.30103; + if ( !dprec ) dprec = 1; + dprec += 1; + sprintf(fbuf,"%%.%dR%c",dprec,(double_output==1)?'f':(double_output==2)?'e':'g'); + mpfr_asprintf(&s,fbuf,a->body); + TAIL PUTS(s); + mpfr_free_str(s); + } +} +#endif + void printz(Z n) { - if ( hex_output == 1 ) { - TAIL PUTS("0x"); - mpz_out_str(OUT,16,BDY(n)); - } else - mpz_out_str(OUT,10,BDY(n)); + printmpz(BDY(n)); } void printmpz(mpz_t z) { +#if !defined(VISUAL) if ( hex_output == 1 ) { TAIL PUTS("0x"); mpz_out_str(OUT,16,z); } else mpz_out_str(OUT,10,z); +#else + char *s; + if ( hex_output == 1 ) { + TAIL PUTS("0x"); + s = mpz_get_str(0,16,z); + } else { + s = mpz_get_str(0,10,z); + } + TAIL PUTS(s); +#endif }