===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/pexpr.c,v
retrieving revision 1.9
retrieving revision 1.28
diff -u -p -r1.9 -r1.28
--- OpenXM_contrib2/asir2000/io/pexpr.c	2000/12/22 10:03:30	1.9
+++ OpenXM_contrib2/asir2000/io/pexpr.c	2004/02/04 07:42:07	1.28
@@ -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.8 2000/12/16 06:16:10 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/pexpr.c,v 1.27 2003/12/25 02:40:24 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;
@@ -65,6 +70,9 @@ char DFORMAT[BUFSIZ];
 int hex_output;
 int fortran_output;
 int double_output;
+int real_digit;
+int real_binary;
+int print_quote;
 
 #define TAIL
 #define PUTS(s) fputs(s,OUT)
@@ -77,7 +85,7 @@ int double_output;
 #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
@@ -89,6 +97,7 @@ int double_output;
 #define PRINTGF2MAT printgf2mat
 #define PRINTGFMMAT printgfmmat
 #define PRINTBYTEARRAY printbytearray
+#define PRINTQUOTE printquote
 #define PRINTERR printerr
 #define PRINTLF printlf
 #define PRINTLOP printlop
@@ -96,6 +105,9 @@ int double_output;
 #define PRINTEOP printeop
 #define PRINTQOP printqop
 #define PRINTUP printup
+#define PRINTUM printum
+#define PRINTSF printsf
+#define PRINTSYMBOL printsymbol
 #endif
 
 #ifdef SPRINT
@@ -104,7 +116,12 @@ static char *buf;
 extern char DFORMAT[BUFSIZ];
 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
@@ -116,7 +133,7 @@ extern int fortran_output;
 #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
@@ -128,6 +145,7 @@ extern int fortran_output;
 #define PRINTGF2MAT sprintgf2mat
 #define PRINTGFMMAT sprintgfmmat
 #define PRINTBYTEARRAY sprintbytearray
+#define PRINTQUOTE sprintquote
 #define PRINTERR sprinterr
 #define PRINTLF sprintlf
 #define PRINTLOP sprintlop
@@ -135,6 +153,9 @@ extern int fortran_output;
 #define PRINTEOP sprinteop
 #define PRINTQOP sprintqop
 #define PRINTUP sprintup
+#define PRINTUM sprintum
+#define PRINTSF sprintsf
+#define PRINTSYMBOL sprintsymbol
 #endif
 
 void PRINTEXPR();
@@ -153,11 +174,20 @@ void PRINTUI();
 void PRINTGF2MAT();
 void PRINTGFMMAT();
 void PRINTBYTEARRAY();
+void PRINTQUOTE();
 void PRINTERR();
 void PRINTCPLX();
 void PRINTLM();
 void PRINTLF();
 void PRINTUP2();
+void PRINTUP();
+void PRINTUM();
+void PRINTFOP();
+void PRINTEOP();
+void PRINTLOP();
+void PRINTQOP();
+void PRINTSF();
+void PRINTSYMBOL();
 
 #ifdef FPRINT
 void output_init() {
@@ -170,7 +200,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 ) 
@@ -184,7 +214,7 @@ P p;
 		return (mmono(COEF(DC(p))));
 }
 
-#if PARI
+#if defined(PARI)
 void printbf(a)
 BF a;
 {
@@ -200,9 +230,7 @@ char *s;
 	s[0] = 0; buf = s;
 }
 
-#if PARI
-#include "genpari.h"
-
+#if defined(PARI)
 void myoutbrute(g)
 GEN g;
 {
@@ -213,7 +241,6 @@ void sprintbf(a)
 BF a;
 {
 	char *str;
-	char *GENtostr();
 	char *GENtostr0();
 
 	if ( double_output ) {
@@ -269,6 +296,10 @@ Obj p;
 			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;
 		default:
 			break;
 	}
@@ -305,6 +336,7 @@ N n;
 	}
 }
 
+#if defined(FPRINT)
 #if defined(ITVDEBUG)
 void printbin(double z)
 {
@@ -326,16 +358,23 @@ 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;
 {
+	char real_format[20];
+
 	if ( !q ) {
 		PUTS("0");
 		return;
@@ -362,44 +401,175 @@ Num q;
 				case MID_PRINTF_G:
 #endif
 				default:
-					TAIL PRINTF(OUT,"%g",BDY((Real)q));
+					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));
+					} else {
+						TAIL PRINTF(OUT,double_output?"%f":"%g",BDY((Real)q));
+					}
 					break;
 			}
 			break;
 		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;
@@ -419,6 +589,12 @@ Num q;
 		case N_GFPN:
 			PRINTUP((UP)(((GFPN)q)->body));
 			break;
+		case N_GFS:
+			TAIL PRINTF(OUT,"@_%d",CONT((GFS)q));
+			break;
+		case N_GFSN:
+			PRINTUM(BDY((GFSN)q));
+			break;
 	}
 }
 
@@ -431,8 +607,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
@@ -512,8 +688,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 {
@@ -576,11 +752,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)
@@ -590,14 +779,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;
 	}
 }
 
@@ -702,7 +909,6 @@ VL vl;
 GFMMAT mat;
 {
 	int row,col,i,j;
-	unsigned int t;
 	unsigned int **b;
 
 	row = mat->row;
@@ -722,7 +928,6 @@ VL vl;
 BYTEARRAY array;
 {
 	int len,i;
-	unsigned int t;
 	unsigned char *b;
 
 	len = array->len;
@@ -735,6 +940,20 @@ BYTEARRAY array;
 	PUTS("|");
 }
 
+void PRINTQUOTE(vl,quote)
+VL vl;
+QUOTE quote;
+{
+	LIST list;
+
+	if ( print_quote ) {
+		fnodetotree(BDY(quote),&list);
+		PRINTEXPR(vl,(Obj)list);
+	} else {
+		PUTS("<...quoted...>");
+	}
+}
+
 void PRINTERR(vl,e)
 VL vl;
 ERR e;
@@ -801,7 +1020,7 @@ F f;
 	}
 }
 
-PRINTFOP(vl,f)
+void PRINTFOP(vl,f)
 VL vl;
 F f;
 {
@@ -816,7 +1035,7 @@ F f;
 	}
 }
 
-PRINTEOP(vl,f)
+void PRINTEOP(vl,f)
 VL vl;
 F f;
 {
@@ -843,7 +1062,7 @@ F f;
 	PUTS(")");
 }
 
-PRINTLOP(vl,f)
+void PRINTLOP(vl,f)
 VL vl;
 F f;
 {
@@ -869,7 +1088,7 @@ F f;
 	PRINTEXPR(vl,(Obj)FPL(f)); PUTS(op); PUTS("0");
 }
 
-PRINTQOP(vl,f)
+void PRINTQOP(vl,f)
 VL vl;
 F f;
 {
@@ -880,7 +1099,7 @@ F f;
 	PRINTEXPR(vl,(Obj)FQMAT(f)); PUTS(")");
 }
 
-PRINTUP(n)
+void PRINTUP(n)
 UP n;
 {
 	int i,d;
@@ -912,4 +1131,53 @@ 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));
+	}
+}
+
+void PRINTSYMBOL(Symbol p)
+{
+	PUTS(p->name);
 }