=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/pexpr.c,v retrieving revision 1.21 retrieving revision 1.32 diff -u -p -r1.21 -r1.32 --- OpenXM_contrib2/asir2000/io/pexpr.c 2003/02/14 22:29:15 1.21 +++ OpenXM_contrib2/asir2000/io/pexpr.c 2004/03/03 09:25:30 1.32 @@ -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/asir2000/io/pexpr.c,v 1.20 2002/09/11 07:23:27 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/pexpr.c,v 1.31 2004/02/27 09:13:04 noro Exp $ */ #include "ca.h" #include "al.h" @@ -52,11 +52,16 @@ #include "comp.h" #include "base.h" +#if defined(PARI) +#include "genpari.h" +#endif + #ifndef FPRINT #define FPRINT #endif #define PRINTHAT (fortran_output?PUTS("**"):PUTS("^")) +extern int outputstyle; #ifdef FPRINT FILE *asir_out; @@ -66,7 +71,9 @@ int hex_output; int fortran_output; int double_output; int real_digit; +int real_binary; int print_quote; +extern int asir_texmacs; #define TAIL #define PUTS(s) fputs(s,OUT) @@ -101,6 +108,9 @@ int print_quote; #define PRINTUP printup #define PRINTUM printum #define PRINTSF printsf +#define PRINTSYMBOL printsymbol +#define PRINTRANGE printrange +#define PRINTTB printtb #endif #ifdef SPRINT @@ -111,8 +121,10 @@ extern int hex_output; extern int fortran_output; extern int double_output; extern int real_digit; +extern int real_binary; extern int print_quote; + #define TAIL while ( *OUT ) OUT++; #define PUTS(s) strcat(OUT,s) #define PRINTF sprintf @@ -146,6 +158,9 @@ extern int print_quote; #define PRINTUP sprintup #define PRINTUM sprintum #define PRINTSF sprintsf +#define PRINTSYMBOL sprintsymbol +#define PRINTRANGE sprintrange +#define PRINTTB sprinttb #endif void PRINTEXPR(); @@ -177,6 +192,9 @@ void PRINTEOP(); void PRINTLOP(); void PRINTQOP(); void PRINTSF(); +void PRINTSYMBOL(); +void PRINTRANGE(); +void PRINTTB(); #ifdef FPRINT void output_init() { @@ -207,8 +225,6 @@ P p; void printbf(a) BF a; { - void sor(); - sor(a->body,double_output ? 'f' : 'g',-1,0); } #endif @@ -222,19 +238,20 @@ char *s; } #if defined(PARI) -#include "genpari.h" - void myoutbrute(g) GEN g; { +# if PARI_VERSION_CODE > 131588 + brute(g, 'f',-1); +# else bruteall(g,'f',-1,1); +# endif } void sprintbf(a) BF a; { char *str; - char *GENtostr(); char *GENtostr0(); if ( double_output ) { @@ -248,53 +265,64 @@ BF a; #endif #endif +#define DATA_BEGIN 2 +#define DATA_END 5 + +extern FUNC user_print_function; + void PRINTEXPR(vl,p) VL vl; Obj p; { + if ( asir_texmacs && !user_print_function ) printf("\2verbatim:"); if ( !p ) { PRINTR(vl,(R)p); - return; - } - - switch ( OID(p) ) { - case O_N: - PRINTNUM((Num)p); break; - case O_P: - PRINTP(vl,(P)p); break; - case O_R: - PRINTR(vl,(R)p); break; - case O_LIST: - PRINTLIST(vl,(LIST)p); break; - case O_VECT: - PRINTVECT(vl,(VECT)p); break; - case O_MAT: - PRINTMAT(vl,(MAT)p); break; - case O_STR: - PRINTSTR((STRING)p); break; - case O_COMP: - PRINTCOMP(vl,(COMP)p); break; - case O_DP: - PRINTDP(vl,(DP)p); break; - case O_USINT: - PRINTUI(vl,(USINT)p); break; - case O_GF2MAT: - PRINTGF2MAT(vl,(GF2MAT)p); break; - case O_ERR: + } else + switch ( OID(p) ) { + case O_N: + PRINTNUM((Num)p); break; + case O_P: + PRINTP(vl,(P)p); break; + case O_R: + PRINTR(vl,(R)p); break; + case O_LIST: + PRINTLIST(vl,(LIST)p); break; + case O_VECT: + PRINTVECT(vl,(VECT)p); break; + case O_MAT: + PRINTMAT(vl,(MAT)p); break; + case O_STR: + PRINTSTR((STRING)p); break; + case O_COMP: + PRINTCOMP(vl,(COMP)p); break; + case O_DP: + PRINTDP(vl,(DP)p); break; + case O_USINT: + PRINTUI(vl,(USINT)p); break; + case O_GF2MAT: + PRINTGF2MAT(vl,(GF2MAT)p); break; + case O_ERR: PRINTERR(vl,(ERR)p); break; - case O_MATHCAP: - PRINTLIST(vl,((MATHCAP)p)->body); break; - case O_F: - PRINTLF(vl,(F)p); break; - case O_GFMMAT: - PRINTGFMMAT(vl,(GFMMAT)p); break; - case O_BYTEARRAY: - PRINTBYTEARRAY(vl,(BYTEARRAY)p); break; - case O_QUOTE: - PRINTQUOTE(vl,(QUOTE)p); break; - default: - break; - } + case O_MATHCAP: + PRINTLIST(vl,((MATHCAP)p)->body); break; + case O_F: + PRINTLF(vl,(F)p); break; + case O_GFMMAT: + PRINTGFMMAT(vl,(GFMMAT)p); break; + case O_BYTEARRAY: + PRINTBYTEARRAY(vl,(BYTEARRAY)p); break; + case O_QUOTE: + PRINTQUOTE(vl,(QUOTE)p); break; + case O_SYMBOL: + PRINTSYMBOL((SYMBOL)p); break; + case O_RANGE: + PRINTRANGE(vl,(RANGE)p); break; + case O_TB: + PRINTTB(vl,(TB)p); break; + default: + break; + } + if ( asir_texmacs && !user_print_function ) { putchar('\5'); fflush(stdout); } } void PRINTN(n) @@ -393,7 +421,76 @@ Num q; case MID_PRINTF_G: #endif default: - if ( real_digit ) { + if ( real_binary ) { + unsigned int *m; + unsigned int u,l,mask; + int i,expo; + + m = (unsigned int *)&BDY((Real)q); +#if defined(__i386__) || defined(MIPSEL) || defined(VISUAL) || defined(__alpha) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__x86_64) + u = m[1]; l = m[0]; +#else + u = m[0]; l = m[1]; +#endif + if (u&0x80000000) { + TAIL PRINTF(OUT,"-"); + } + u &= 0x7fffffff; + expo = ((int)(u>>20)); + u &= 0xfffff; + if ( expo == 2047 ) { + if ( u || l ) { + TAIL PRINTF(OUT,"NaN"); + } else { + TAIL PRINTF(OUT,"Inf"); + } + } else if ( expo == 0 ) { + if ( u || l ) { + TAIL PRINTF(OUT,"0b0."); + for ( i = 0, mask = 0x80000; i < 20; + i++, mask >>= 1) { + TAIL + if ( u&mask ) + PRINTF(OUT,"1"); + else + PRINTF(OUT,"0"); + } + for ( i = 0, mask = 0x80000000; i < 32; + i++, mask >>= 1) { + TAIL + if ( l&mask ) + PRINTF(OUT,"1"); + else + PRINTF(OUT,"0"); + } + TAIL PRINTF(OUT,"*2^%d",-1022); + } else { + TAIL PRINTF(OUT,"0"); + } + } else { + expo -= 1023; + TAIL PRINTF(OUT,"0b1."); + for ( i = 0, mask = 0x80000; i < 20; + i++, mask >>= 1) { + TAIL + if ( u&mask ) + PRINTF(OUT,"1"); + else + PRINTF(OUT,"0"); + } + for ( i = 0, mask = 0x80000000; i < 32; + i++, mask >>= 1) { + TAIL + if ( l&mask ) + PRINTF(OUT,"1"); + else + PRINTF(OUT,"0"); + } + if ( expo ) { + TAIL PRINTF(OUT,"*2^%d",expo); + } + } + } else if ( real_digit ) { sprintf(real_format, double_output?"%%.%df":"%%.%dg",real_digit); TAIL PRINTF(OUT,real_format,BDY((Real)q)); @@ -413,30 +510,86 @@ Num q; #if defined(INTERVAL) case N_IP: case N_IntervalBigFloat: - PUTS("["); - PRINTNUM(INF((Itv)q)); - PUTS(","); - PRINTNUM(SUP((Itv)q)); - PUTS("]"); + switch ( outputstyle ) { + case 1: + PUTS("intval("); + PRINTNUM(INF((Itv)q)); + PUTS(","); + PRINTNUM(SUP((Itv)q)); + PUTS(")"); + break; + case 0: + default: + PUTS("["); + PRINTNUM(INF((Itv)q)); + PUTS(","); + PRINTNUM(SUP((Itv)q)); + PUTS("]"); + break; + } break; case N_IntervalDouble: switch (printmode) { case PRINTF_E: - TAIL PRINTF(OUT, "[%.16e,%.16e]",INF((IntervalDouble)q),SUP((IntervalDouble)q)); + switch ( outputstyle ) { + case 1: + TAIL PRINTF(OUT, "intval(%.16e,%.16e)", + INF((IntervalDouble)q),SUP((IntervalDouble)q)); + break; + case 0: + default: + TAIL PRINTF(OUT, "[%.16e,%.16e]", + INF((IntervalDouble)q),SUP((IntervalDouble)q)); + break; + } #if defined(ITVDEBUG) printbin(INF((IntervalDouble)q)); printbin(SUP((IntervalDouble)q)); #endif break; case MID_PRINTF_G: - TAIL PRINTF(OUT, "<%g,%g>", (SUP((IntervalDouble)q)+INF((IntervalDouble)q))*0.5,(SUP((IntervalDouble)q)-INF((IntervalDouble)q))*0.5); + switch ( outputstyle ) { + case 1: + TAIL PRINTF(OUT, "intvalm(%g,%g)", + (SUP((IntervalDouble)q)+INF((IntervalDouble)q))*0.5, + (SUP((IntervalDouble)q)-INF((IntervalDouble)q))*0.5); + break; + case 0: + default: + TAIL PRINTF(OUT, "<%g,%g>", + (SUP((IntervalDouble)q)+INF((IntervalDouble)q))*0.5, + (SUP((IntervalDouble)q)-INF((IntervalDouble)q))*0.5); + break; + } break; case MID_PRINTF_E: - TAIL PRINTF(OUT, "<%.16e,%.16e>", (SUP((IntervalDouble)q)+INF((IntervalDouble)q))*0.5,(SUP((IntervalDouble)q)-INF((IntervalDouble)q))*0.5); + switch ( outputstyle ) { + case 1: + TAIL PRINTF(OUT, "intvalm(%.16e,%.16e)", + (SUP((IntervalDouble)q)+INF((IntervalDouble)q))*0.5, + (SUP((IntervalDouble)q)-INF((IntervalDouble)q))*0.5); + break; + case 0: + default: + TAIL PRINTF(OUT, "<%.16e,%.16e>", + (SUP((IntervalDouble)q)+INF((IntervalDouble)q))*0.5, + (SUP((IntervalDouble)q)-INF((IntervalDouble)q))*0.5); + break; + } break; case PRINTF_G: default: - TAIL PRINTF(OUT, "[%g,%g]",INF((IntervalDouble)q),SUP((IntervalDouble)q)); + switch ( outputstyle ) { + case 1: + TAIL PRINTF(OUT, "intval(%g,%g)", + INF((IntervalDouble)q),SUP((IntervalDouble)q)); + break; + case 0: + default: + TAIL PRINTF(OUT, "[%g,%g]", + INF((IntervalDouble)q),SUP((IntervalDouble)q)); + break; + } break; } break; @@ -619,11 +772,24 @@ VECT vect; int i; pointer *ptr; - PUTS("[ "); - for ( i = 0, ptr = BDY(vect); i < vect->len; i++ ) { - PRINTEXPR(vl,ptr[i]); PUTS(" "); + switch ( outputstyle ) { + case 1: + PUTS("vect("); + for ( i = 0, ptr = BDY(vect); i < vect->len; i++ ) { + if ( i != 0 ) PUTS(","); + PRINTEXPR(vl,ptr[i]); + } + PUTS(")"); + break; + case 0: + default: + PUTS("[ "); + for ( i = 0, ptr = BDY(vect); i < vect->len; i++ ) { + PRINTEXPR(vl,ptr[i]); PUTS(" "); + } + PUTS("]"); + break; } - PUTS("]"); } void PRINTMAT(vl,mat) @@ -633,14 +799,32 @@ MAT mat; int i,j,r,c; pointer *ptr; - for ( i = 0, r = mat->row, c = mat->col; i < r; i++ ) { - PUTS("[ "); - for ( j = 0, ptr = BDY(mat)[i]; j < c; j++ ) { - PRINTEXPR(vl,ptr[j]); PUTS(" "); - } - PUTS("]"); - if ( i < r - 1 ) - PUTS("\n"); + switch ( outputstyle ) { + case 1: + PUTS("mat(\n"); + for ( i = 0, r = mat->row, c = mat->col; i < r; i++ ) { + if ( i != 0 ) PUTS(",\n"); + PUTS("[ "); + for ( j = 0, ptr = BDY(mat)[i]; j < c; j++ ) { + if ( j != 0 ) PUTS(","); + PRINTEXPR(vl,ptr[j]); + } + PUTS(" ]"); + } + PUTS(")"); + break; + case 0: + default: + for ( i = 0, r = mat->row, c = mat->col; i < r; i++ ) { + PUTS("[ "); + for ( j = 0, ptr = BDY(mat)[i]; j < c; j++ ) { + PRINTEXPR(vl,ptr[j]); PUTS(" "); + } + PUTS("]"); + if ( i < r - 1 ) + PUTS("\n"); + } + break; } } @@ -1010,5 +1194,28 @@ unsigned int i; PUTS("0"); } else { TAIL PRINTF(OUT,"@_%d",IFTOF(i)); + } +} + +void PRINTSYMBOL(SYMBOL sym) +{ + PUTS(sym->name); +} + +void PRINTRANGE(VL vl,RANGE p) +{ + PUTS("range("); + PRINTEXPR(vl,p->start); + PUTS(","); + PRINTEXPR(vl,p->end); + PUTS(")"); +} + +void PRINTTB(VL vl,TB p) +{ + int i; + + for ( i = 0; i < p->next; i++ ) { + PUTS(p->body[i]); } }