===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/pexpr.c,v
retrieving revision 1.14
retrieving revision 1.27
diff -u -p -r1.14 -r1.27
--- OpenXM_contrib2/asir2000/io/pexpr.c	2001/08/06 01:48:33	1.14
+++ OpenXM_contrib2/asir2000/io/pexpr.c	2003/12/25 02:40:24	1.27
@@ -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.13 2001/04/20 02:34:23 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/pexpr.c,v 1.26 2003/12/24 08:00:38 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,6 +71,7 @@ int hex_output;
 int fortran_output;
 int double_output;
 int real_digit;
+int real_binary;
 int print_quote;
 
 #define TAIL
@@ -79,7 +85,7 @@ int print_quote;
 #define PRINTV printv
 #define PRINTEXPR printexpr
 #define PRINTNUM printnum
-#define PRINTP printp
+#define PRINTP asir_printp
 #define PRINTR printr
 #define PRINTLIST printlist
 #define PRINTVECT printvect
@@ -99,6 +105,8 @@ int print_quote;
 #define PRINTEOP printeop
 #define PRINTQOP printqop
 #define PRINTUP printup
+#define PRINTUM printum
+#define PRINTSF printsf
 #endif
 
 #ifdef SPRINT
@@ -111,6 +119,7 @@ extern int double_output;
 extern int real_digit;
 extern int print_quote;
 
+
 #define TAIL while ( *OUT ) OUT++;
 #define PUTS(s) strcat(OUT,s)
 #define PRINTF sprintf
@@ -122,7 +131,7 @@ extern int print_quote;
 #define PRINTV sprintv
 #define PRINTEXPR sprintexpr
 #define PRINTNUM sprintnum
-#define PRINTP sprintp
+#define PRINTP asir_sprintp
 #define PRINTR sprintr
 #define PRINTLIST sprintlist
 #define PRINTVECT sprintvect
@@ -142,6 +151,8 @@ extern int print_quote;
 #define PRINTEOP sprinteop
 #define PRINTQOP sprintqop
 #define PRINTUP sprintup
+#define PRINTUM sprintum
+#define PRINTSF sprintsf
 #endif
 
 void PRINTEXPR();
@@ -166,6 +177,13 @@ void PRINTCPLX();
 void PRINTLM();
 void PRINTLF();
 void PRINTUP2();
+void PRINTUP();
+void PRINTUM();
+void PRINTFOP();
+void PRINTEOP();
+void PRINTLOP();
+void PRINTQOP();
+void PRINTSF();
 
 #ifdef FPRINT
 void output_init() {
@@ -178,7 +196,7 @@ P p;
 {
 	if ( NUM(p) )
 #if defined(INTERVAL)
-		if ( NID(p) != N_IP && NID(p) != N_ID && NID(p) != N_IT && NID(p) != N_IF
+		if ( NID(p) != N_IP && NID(p) != N_IntervalDouble && NID(p) != N_IntervalQuad && NID(p) != N_IntervalBigFloat
 			&& compnum(CO,(Num)p,0) < 0 ) 
 #else
 		if ( compnum(CO,(Num)p,0) < 0 ) 
@@ -192,7 +210,7 @@ P p;
 		return (mmono(COEF(DC(p))));
 }
 
-#if PARI
+#if defined(PARI)
 void printbf(a)
 BF a;
 {
@@ -208,9 +226,7 @@ char *s;
 	s[0] = 0; buf = s;
 }
 
-#if PARI
-#include "genpari.h"
-
+#if defined(PARI)
 void myoutbrute(g)
 GEN g;
 {
@@ -221,7 +237,6 @@ void sprintbf(a)
 BF a;
 {
 	char *str;
-	char *GENtostr();
 	char *GENtostr0();
 
 	if ( double_output ) {
@@ -315,6 +330,7 @@ N n;
 	}
 }
 
+#if defined(FPRINT)
 #if defined(ITVDEBUG)
 void printbin(double z)
 {
@@ -336,12 +352,17 @@ void printbin(double z)
 	fprintf(stderr,"\n");
 }
 #endif
+#endif
 
+#if defined(FPRINT)
 #if 0
 int	printmode = PRINTF_E;
 #else
 int	printmode = PRINTF_G;
 #endif
+#else
+extern int printmode;
+#endif
 
 void PRINTNUM(q)
 Num q;
@@ -374,7 +395,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));
@@ -387,37 +477,93 @@ Num q;
 		case N_A:
 			PUTS("("); PRINTR(ALG,(R)BDY((Alg)q)); PUTS(")");
 			break;
-#if PARI
+#if defined(PARI)
 		case N_B:
 			PRINTBF((BF)q); break;
 #endif
 #if defined(INTERVAL)
 		case N_IP:
-		case N_IF:
-			PUTS("[");
-			PRINTNUM(INF((Itv)q));
-			PUTS(",");
-			PRINTNUM(SUP((Itv)q));
-			PUTS("]");
+		case N_IntervalBigFloat:
+			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_ID:
+		case N_IntervalDouble:
 			switch (printmode) {
 				case PRINTF_E:
-					TAIL PRINTF(OUT, "[%.16e,%.16e]",INF((ItvD)q),SUP((ItvD)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((ItvD)q));
-					printbin(SUP((ItvD)q));
+					printbin(INF((IntervalDouble)q));
+					printbin(SUP((IntervalDouble)q));
 #endif
 					break;
 				case MID_PRINTF_G:
-					TAIL PRINTF(OUT, "<%g,%g>", (SUP((ItvD)q)+INF((ItvD)q))*0.5,(SUP((ItvD)q)-INF((ItvD)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((ItvD)q)+INF((ItvD)q))*0.5,(SUP((ItvD)q)-INF((ItvD)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((ItvD)q),SUP((ItvD)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;
@@ -440,6 +586,9 @@ Num q;
 		case N_GFS:
 			TAIL PRINTF(OUT,"@_%d",CONT((GFS)q));
 			break;
+		case N_GFSN:
+			PRINTUM(BDY((GFSN)q));
+			break;
 	}
 }
 
@@ -452,8 +601,8 @@ C a;
 	if ( a->i ) {
 #if defined(INTERVAL)
 		if ( a->r && ((compnum(0,a->i,0) > 0)
-			|| NID(a->i) == N_IP || NID(a->i) == N_ID
-			|| NID(a->i) == N_IT || NID(a->i) == N_IF) )
+			|| NID(a->i) == N_IP || NID(a->i) == N_IntervalDouble
+			|| NID(a->i) == N_IntervalQuad || NID(a->i) == N_IntervalBigFloat) )
 #else
 		if ( a->r && (compnum(0,a->i,0) > 0) )
 #endif
@@ -533,8 +682,8 @@ V v;
 	else if ( (vid)v->attr == V_PF ) {
 		pf = ((PFINS)v->priv)->pf; ad = ((PFINS)v->priv)->ad;
 		if ( !strcmp(NAME(pf),"pow") ) {
-			PUTS("("); PRINTR(vl,(R)ad[0].arg); PUTS(")"); PRINTHAT; PUTS("(");
-			PRINTR(vl,(R)ad[1].arg); PUTS(")");
+			PUTS("(("); PRINTR(vl,(R)ad[0].arg); PUTS(")"); PRINTHAT; PUTS("(");
+			PRINTR(vl,(R)ad[1].arg); PUTS("))");
 		} else if ( !pf->argc ) {
 			TAIL PRINTF(OUT,"%s",NAME(pf));
 		} else {
@@ -597,11 +746,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)
@@ -611,14 +773,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;
 	}
 }
 
@@ -723,7 +903,6 @@ VL vl;
 GFMMAT mat;
 {
 	int row,col,i,j;
-	unsigned int t;
 	unsigned int **b;
 
 	row = mat->row;
@@ -743,7 +922,6 @@ VL vl;
 BYTEARRAY array;
 {
 	int len,i;
-	unsigned int t;
 	unsigned char *b;
 
 	len = array->len;
@@ -836,7 +1014,7 @@ F f;
 	}
 }
 
-PRINTFOP(vl,f)
+void PRINTFOP(vl,f)
 VL vl;
 F f;
 {
@@ -851,7 +1029,7 @@ F f;
 	}
 }
 
-PRINTEOP(vl,f)
+void PRINTEOP(vl,f)
 VL vl;
 F f;
 {
@@ -878,7 +1056,7 @@ F f;
 	PUTS(")");
 }
 
-PRINTLOP(vl,f)
+void PRINTLOP(vl,f)
 VL vl;
 F f;
 {
@@ -904,7 +1082,7 @@ F f;
 	PRINTEXPR(vl,(Obj)FPL(f)); PUTS(op); PUTS("0");
 }
 
-PRINTQOP(vl,f)
+void PRINTQOP(vl,f)
 VL vl;
 F f;
 {
@@ -915,7 +1093,7 @@ F f;
 	PRINTEXPR(vl,(Obj)FQMAT(f)); PUTS(")");
 }
 
-PRINTUP(n)
+void PRINTUP(n)
 UP n;
 {
 	int i,d;
@@ -946,5 +1124,49 @@ UP n;
 			}
 		}
 		PUTS(")");
+	}
+}
+
+void PRINTUM(n)
+UM n;
+{
+	int i,d;
+
+	if ( !n )
+		PUTS("0");
+	else if ( !n->d )
+		PRINTSF(n->c[0]);
+	else {
+		d = n->d;
+		PUTS("(");
+		if ( !d ) {
+			PRINTSF(n->c[d]);
+		} else if ( d == 1 ) {
+			PRINTSF(n->c[d]);
+			PUTS("*@s");
+		} else {
+			PRINTSF(n->c[d]);
+			PUTS("*@s"); PRINTHAT; TAIL PRINTF(OUT,"%d",d);
+		}
+		for ( i = d-1; i >= 0; i-- ) {
+			if ( n->c[i] ) {
+				PUTS("+("); PRINTSF(n->c[i]); PUTS(")");
+				if ( i >= 2 ) {
+					PUTS("*@s"); PRINTHAT; TAIL PRINTF(OUT,"%d",i);
+				} else if ( i == 1 )
+					PUTS("*@s");
+			}
+		}
+		PUTS(")");
+	}
+}
+
+void PRINTSF(i)
+unsigned int i;
+{
+	if ( !i ) {
+		PUTS("0");
+	} else {
+		TAIL PRINTF(OUT,"@_%d",IFTOF(i));
 	}
 }