===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/cpexpr.c,v
retrieving revision 1.8
retrieving revision 1.24
diff -u -p -r1.8 -r1.24
--- OpenXM_contrib2/asir2000/io/cpexpr.c	2001/03/09 01:44:10	1.8
+++ OpenXM_contrib2/asir2000/io/cpexpr.c	2004/12/10 07:36:35	1.24
@@ -44,17 +44,24 @@
  * 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/cpexpr.c,v 1.7 2000/12/16 06:16:10 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/cpexpr.c,v 1.23 2004/07/13 07:59:54 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 #include "al.h"
 #include "base.h"
+#if PARI
+#include "genpari.h"
+#endif
 
+#ifndef CPRINT
+#define CPRINT
+#endif
+
 extern int hex_output,fortran_output,double_output,real_digit;
+extern int hideargs,outputstyle;
+static int total_length;
 
-#define PRINTHAT (fortran_output?PUTS("**"):PUTS("^"))
-
 #define TAIL
 #define PUTS(s) (total_length+=strlen(s))
 #define PRINTN length_n
@@ -77,6 +84,12 @@ extern int hex_output,fortran_output,double_output,rea
 #define PRINTGF2MAT length_gf2mat
 #define PRINTGFMMAT length_gfmmat
 #define PRINTBYTEARRAY length_bytearray
+#define PRINTQUOTE length_QUOTE
+#define PRINTQUOTEARG length_QUOTEARG
+#define PRINTSYMBOL length_SYMBOL
+#define PRINTRANGE length_RANGE
+#define PRINTTB length_TB
+#define PRINTDPV length_DPV
 #define PRINTERR length_err
 #define PRINTLF length_lf
 #define PRINTLOP length_lop
@@ -84,46 +97,29 @@ extern int hex_output,fortran_output,double_output,rea
 #define PRINTEOP length_eop
 #define PRINTQOP length_qop
 #define PRINTUP length_up
+#define PRINTUM length_um
+#define PRINTSF length_sf
+#define PRINTFARGS length_fargs
+#define PRINTFNODENODE length_fnodenode
+#define PRINTFNODE length_fnode
 
-void PRINTEXPR();
-void PRINTNUM();
-void PRINTN();
-void PRINTV();
-void PRINTP();
-void PRINTR();
-void PRINTLIST();
-void PRINTVECT();
-void PRINTMAT();
-void PRINTSTR();
-void PRINTCOMP();
-void PRINTDP();
-void PRINTUI();
-void PRINTGF2MAT();
-void PRINTGFMMAT();
-void PRINTBYTEARRAY();
-void PRINTERR();
-void PRINTCPLX();
-void PRINTLM();
-void PRINTLF();
-void PRINTUP2();
+#include "pexpr_body.c"
 
+/* special functions for estimating length */
+
 static int total_length;
 
-int estimate_length(vl,p)
-VL vl;
-pointer p;
+int estimate_length(VL vl,pointer p)
 {
 	total_length = 0;
 	PRINTEXPR(vl,p);
 	return total_length;
 }
 
-#if PARI
-void PRINTBF(a)
-BF a;
+#if defined(PARI)
+void PRINTBF(BF a)
 {
 	char *str;
-	char *GENtostr();
 	char *GENtostr0();
 	void myoutbrute();
 
@@ -137,69 +133,12 @@ BF a;
 }
 #endif
 
-void PRINTEXPR(vl,p)
-VL vl;
-pointer p;
+void PRINTNUM(Num q)
 {
-	if ( !p ) {
-		total_length++;
-		return;
-	}
+	DAlg d;
+	DP nm;
+	Q dn;
 
-	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;
-		default:
-			break;
-	}
-}
-
-void PRINTN(n)
-N n;
-{
-	double ceil();
-
-	if ( !n )
-		PUTS("0");
-	else if ( hex_output )
-		total_length += 2+(int)(PL(n)*8);
-	else
-		total_length += (int)(ceil(0.31*((double)(BSH*PL(n))))+1);
-}
-
-void PRINTNUM(q)
-Num q;
-{
 	if ( !q ) {
 		PUTS("0");
 		return;
@@ -222,7 +161,7 @@ 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
@@ -242,87 +181,32 @@ Num q;
 		case N_GFPN:
 			PRINTUP((UP)(((GFPN)q)->body));
 			break;
+		case N_GFS:
+			total_length += 13; /* XXX */
+			break;
+		case N_GFSN:
+			PRINTUM(BDY((GFSN)q));
+			break;
+		case N_DA:
+			d = (DAlg)q;
+			nm = d->nm;
+			dn = d->dn;
+			if ( SGN((Q)dn) == -1 ) PUTS("-");
+			PUTS("(");
+			PRINTDP(CO,((DAlg)q)->nm);
+			PUTS(")");
+			if ( !UNIN(NM(dn)) ) {
+				PUTS("/");
+				PRINTN(NM(dn));
+			}
+			break;
 		default:
 			break;
 	}
 }
 
-void PRINTCPLX(a)
-C a;
+void PRINTV(VL vl,V v)
 {
-	PUTS("(");
-	if ( a->r )
-		PRINTNUM(a->r);
-	if ( a->i ) {
-		if ( a->r && (compnum(0,a->i,0) > 0) )
-			PUTS("+");
-		PRINTNUM(a->i); PUTS("*@i");
-	}
-	PUTS(")");
-}
-
-void PRINTP(vl,p)
-VL vl;
-P p;
-{
-	V v;
-	DCP dc;
-	int t;
-
-	if ( !p )
-		PUTS("0");
-	else if ( NUM(p) ) 
-		PRINTNUM((Num)p);
-	else
-		for ( dc = DC(p), v = VR(p); dc; dc = NEXT(dc) ) {
-			if ( !DEG(dc) )
-				PRINTP(vl,COEF(dc));
-			else {
-				if ( NUM(COEF(dc)) && UNIQ((Q)COEF(dc)) ) {
-					;
-				} else if ( NUM(COEF(dc)) && MUNIQ((Q)COEF(dc)) )
-					PUTS("-"); 
-				else if ( NUM(COEF(dc)) || !NEXT(DC(COEF(dc)))) {
-					PRINTP(vl,COEF(dc)); PUTS("*"); 
-				} else {
-					PUTS("("); PRINTP(vl,COEF(dc)); PUTS(")*"); 
-				}
-				PRINTV(vl,v); 
-				if ( cmpq(DEG(dc),ONE) ) {
-					PRINTHAT;
-					if ( INT(DEG(dc)) && SGN(DEG(dc))>0 )
-						PRINTNUM((Num)DEG(dc));
-					else {
-						PUTS("("); PRINTNUM((Num)DEG(dc)); PUTS(")");
-					}
-				}
-			}
-			if ( NEXT(dc) ) {
-				P t;
-
-				t = COEF(NEXT(dc));
-				if (!DEG(NEXT(dc))) {
-					if ( NUM(t) ) {
-						if ( !mmono(t) )
-							PUTS("+");
-					} else {
-						if (!mmono(COEF(DC(t))))
-							PUTS("+");
-					}
-				} else {
-					if ( !mmono(t) )
-						PUTS("+");
-				}
-			}
-		}
-}
-
-extern int hideargs;
-
-void PRINTV(vl,v)
-VL vl;
-V v;
-{
 	PF pf;
 	PFAD ad;
 	int i;
@@ -332,8 +216,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 )
 			PUTS(NAME(pf));
 		else {
@@ -377,72 +261,20 @@ V v;
 	}
 }
 
-void PRINTR(vl,a)
-VL vl;
-R a;
+void PRINTN(N n)
 {
-	if ( !a ) 
+	double ceil();
+
+	if ( !n )
 		PUTS("0");
+	else if ( hex_output )
+		total_length += 2+(int)(PL(n)*8);
 	else
-		switch (OID(a)) {
-			case O_N: case O_P:
-				PRINTP(vl,(P)a); break;
-			default:
-				PUTS("("); PRINTP(vl,NM((R)a)); PUTS(")/("); PRINTP(vl,DN((R)a)); PUTS(")");
-				break;
-		}
+		total_length += (int)(ceil(0.31*((double)(BSH*PL(n))))+1);
 }
 
-void PRINTVECT(vl,vect)
-VL vl;
-VECT vect;
+void PRINTSTR(STRING str)
 {
-	int i;
-	pointer *ptr;
-
-	PUTS("[ ");
-	for ( i = 0, ptr = BDY(vect); i < vect->len; i++ ) {
-		PRINTEXPR(vl,ptr[i]); PUTS(" ");
-	}
-	PUTS("]");
-}
-
-void PRINTMAT(vl,mat)
-VL vl;
-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");
-	}
-}
-
-void PRINTLIST(vl,list)
-VL vl;
-LIST list;
-{
-	NODE tnode;
-
-	PUTS("[");
-	for ( tnode = (NODE)list->body; tnode; tnode = NEXT(tnode) ) {
-		PRINTEXPR(vl,tnode->body);
-		if ( NEXT(tnode) )
-			PUTS(",");
-	}
-	PUTS("]");
-}
-
-void PRINTSTR(str)
-STRING str;
-{
 	char *p;
 
 	for ( p = BDY(str); *p; p++ )
@@ -453,27 +285,9 @@ STRING str;
 		}
 }
 
-void PRINTCOMP(vl,c)
-VL vl;
-COMP c;
+void PRINTDP(VL vl,DP d)
 {
 	int n,i;
-
-	n = getcompsize((int)c->type);
-	PUTS("{");
-	for ( i = 0; i < n; i++ ) {
-		PRINTEXPR(vl,(pointer)c->member[i]);
-		if ( i < n-1 )
-			PUTS(",");
-	}
-	PUTS("}");
-}
-
-void PRINTDP(vl,d)
-VL vl;
-DP d;
-{
-	int n,i;
 	MP m;
 	DL dl;
 
@@ -489,44 +303,14 @@ DP d;
 	}
 }
 
-void PRINTUI(vl,u)
-VL vl;
-USINT u;
+void PRINTUI(VL vl,USINT u)
 {
 	total_length += 10;
 }
 
-void PRINTGF2MAT(vl,mat)
-VL vl;
-GF2MAT mat;
+void PRINTGFMMAT(VL vl,GFMMAT mat)
 {
-	int row,col,w,i,j,k,m;
-	unsigned int t;
-	unsigned int **b;
-
-	row = mat->row;
-	col = mat->col;
-	w = (col+BSH-1)/BSH;
-	b = mat->body;
-	for ( i = 0; i < row; i++ ) {
-		for ( j = 0, m = 0; j < w; j++ ) {
-			t = b[i][j];
-			for ( k = 0; m < col && k < BSH; k++, m++ )
-				if ( t & (1<<k) )
-					PUTS("1");
-				else
-					PUTS("0");
-		}
-		PUTS("\n");
-	}
-}
-
-void PRINTGFMMAT(vl,mat)
-VL vl;
-GFMMAT mat;
-{
 	int row,col,i,j;
-	unsigned int t;
 	unsigned int **b;
 
 	row = mat->row;
@@ -541,24 +325,53 @@ GFMMAT mat;
 	}
 }
 
-void PRINTBYTEARRAY(vl,array)
-VL vl;
-BYTEARRAY array;
+void PRINTBYTEARRAY(VL vl,BYTEARRAY array)
 {
 	/* |xx xx ... xx| */
 	total_length += 1+3*array->len;
 }
 
-void PRINTERR(vl,e)
-VL vl;
-ERR e;
+extern int print_quote;
+
+void PRINTQUOTE(VL vl,QUOTE quote)
 {
-	PUTS("error("); PRINTEXPR(vl,e->body); PUTS(")");
+	LIST list;
+
+	if ( print_quote == 2 ) {
+		PRINTFNODE(BDY(quote),0);
+	} else if ( print_quote == 1 ) {
+		/* XXX */
+		fnodetotree(BDY(quote),&list);
+		PRINTEXPR(vl,(Obj)list);
+	} else {
+		/* <...quoted...> */
+		total_length += 20;
+	}
 }
 
-void PRINTUP2(p)
-UP2 p;
+void PRINTQUOTEARG(VL vl,QUOTEARG quote)
 {
+	/* XXX */
+	/* <...quoted...> */
+	total_length += 20;
+}
+
+void PRINTSYMBOL(SYMBOL sym)
+{
+	total_length += strlen(sym->name);
+}
+
+void PRINTTB(VL vl,TB p)
+{
+	int i;
+
+	for ( i = 0; i < p->next; i++ ) {
+		total_length += strlen(p->body[i]);
+	}
+}
+
+void PRINTUP2(UP2 p)
+{
 	int d,i;
 
 	if ( !p ) {
@@ -589,116 +402,17 @@ UP2 p;
 	}
 }
 
-void PRINTLF(vl,f)
-VL vl;
-F f;
+void PRINTQOP(VL vl,F f)
 {
-	switch ( FOP(f) ) {
-		case AL_TRUE:
-			PUTS("@true");
-			break;
-		case AL_FALSE:
-			PUTS("@false");
-			break;
-
-		case AL_OR: case AL_AND:
-			PRINTFOP(vl,f); break;
-		case AL_NOT: case AL_IMPL: case AL_REPL: case AL_EQUIV:
-			PRINTEOP(vl,f); break;
-
-		case AL_EQUAL: case AL_NEQ: case AL_LESSP:
-		case AL_GREATERP: case AL_LEQ: case AL_GEQ:
-			PRINTLOP(vl,f); break;
-
-		case AL_EX: case AL_ALL:
-			PRINTQOP(vl,f); break;
-		default:
-			break;
-	}
-}
-
-PRINTFOP(vl,f)
-VL vl;
-F f;
-{
 	char *op;
-	NODE n;
 
-	op = FOP(f)==AL_OR?" @|| ":" @&& ";
-	n = FJARG(f);
-	PUTS("("); PRINTEXPR(vl,BDY(n)); PUTS(")");
-	for ( n = NEXT(n); n; n = NEXT(n) ) {
-		PUTS(op); PUTS("("); PRINTEXPR(vl,BDY(n)); PUTS(")");
-	}
-}
-
-PRINTEOP(vl,f)
-VL vl;
-F f;
-{
-	oFOP op;
-	char *sop;
-
-	if ( (op = FOP(f)) == AL_NOT ) {
-		PUTS("(@! "); PRINTEXPR(vl,(Obj)FARG(f)); PUTS(")"); return;
-	}
-	switch ( op ) {
-		case AL_IMPL:
-			sop = " @impl "; break;
-		case AL_REPL:
-			sop = " @repl "; break;
-		case AL_EQUIV:
-			sop = " @equiv "; break;
-		default:
-			break;
-	}
-	PUTS("("); 
-	PRINTEXPR(vl,(Obj)FLHS(f)); 
-	PUTS(sop);
-	PRINTEXPR(vl,(Obj)FRHS(f)); 
-	PUTS(")");
-}
-
-PRINTLOP(vl,f)
-VL vl;
-F f;
-{
-	char *op;
-
-	switch ( FOP(f) ) {
-		case AL_EQUAL:
-			op = " @== "; break;
-		case AL_NEQ:
-			op = " @!= "; break;
-		case AL_LESSP:
-			op = " @< "; break;
-		case AL_GREATERP:
-			op = " @> "; break;
-		case AL_LEQ:
-			op = " @<= "; break;
-		case AL_GEQ:
-			op = " @>= "; break;
-		default:
-			error("PRINTLOP : invalid operator");
-			break;
-	}
-	PRINTEXPR(vl,(Obj)FPL(f)); PUTS(op); PUTS("0");
-}
-
-PRINTQOP(vl,f)
-VL vl;
-F f;
-{
-	char *op;
-
 	op = FOP(f)==AL_EX?"ex":"all";
 	PUTS(op); PUTS(NAME(FQVR(f)));
 	total_length += 2;
 	PRINTEXPR(vl,(Obj)FQMAT(f)); PUTS(")");
 }
 
-PRINTUP(n)
-UP n;
+void PRINTUP(UP n)
 {
 	int i,d;
 
@@ -731,4 +445,49 @@ UP n;
 		}
 		PUTS(")");
 	}
+}
+
+void PRINTUM(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; total_length += 13;
+		}
+		for ( i = d-1; i >= 0; i-- ) {
+			if ( n->c[i] ) {
+				PUTS("+("); PRINTSF(n->c[i]); PUTS(")");
+				if ( i >= 2 ) {
+					PUTS("*@s"); PRINTHAT; total_length += 13;
+				} else if ( i == 1 )
+					PUTS("*@s");
+			}
+		}
+		PUTS(")");
+	}
+}
+
+void PRINTSF(unsigned int i)
+{
+	if ( !i ) {
+		PUTS("0");
+	} else
+		total_length += 15;
+
+#ifndef CPRINT
+#define CPRINT
+#endif
 }