===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/cpexpr.c,v
retrieving revision 1.16
retrieving revision 1.22
diff -u -p -r1.16 -r1.22
--- OpenXM_contrib2/asir2000/io/cpexpr.c	2003/12/25 02:40:24	1.16
+++ OpenXM_contrib2/asir2000/io/cpexpr.c	2004/05/14 06:02:54	1.22
@@ -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/cpexpr.c,v 1.15 2003/02/14 22:29:15 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/cpexpr.c,v 1.21 2004/03/17 03:22:47 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -54,10 +54,14 @@
 #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
@@ -81,6 +85,10 @@ extern int hex_output,fortran_output,double_output,rea
 #define PRINTGFMMAT length_gfmmat
 #define PRINTBYTEARRAY length_bytearray
 #define PRINTQUOTE length_QUOTE
+#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
@@ -90,37 +98,14 @@ extern int hex_output,fortran_output,double_output,rea
 #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 PRINTQUOTE();
-void PRINTERR();
-void PRINTCPLX();
-void PRINTLM();
-void PRINTLF();
-void PRINTUP();
-void PRINTUM();
-void PRINTUP2();
-void PRINTFOP();
-void PRINTEOP();
-void PRINTLOP();
-void PRINTQOP();
-void PRINTSF();
+#include "pexpr_body.c"
 
+/* special functions for estimating length */
+
 static int total_length;
 
 int estimate_length(VL vl,pointer p)
@@ -147,65 +132,6 @@ void PRINTBF(BF a)
 }
 #endif
 
-void PRINTEXPR(VL vl,pointer p)
-{
-	if ( !p ) {
-		total_length++;
-		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:
-			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;
-	}
-}
-
-void PRINTN(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(Num q)
 {
 	if ( !q ) {
@@ -261,74 +187,6 @@ void PRINTNUM(Num q)
 	}
 }
 
-void PRINTCPLX(C a)
-{
-	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 vl,P p)
-{
-	V v;
-	DCP dc;
-
-	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 vl,V v)
 {
 	PF pf;
@@ -385,61 +243,18 @@ void PRINTV(VL vl,V v)
 	}
 }
 
-void PRINTR(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 vl,VECT vect)
-{
-	int i;
-	pointer *ptr;
-
-	PUTS("[ ");
-	for ( i = 0, ptr = BDY(vect); i < vect->len; i++ ) {
-		PRINTEXPR(vl,ptr[i]); PUTS(" ");
-	}
-	PUTS("]");
-}
-
-void PRINTMAT(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 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(STRING str)
 {
 	char *p;
@@ -452,20 +267,6 @@ void PRINTSTR(STRING str)
 		}
 }
 
-void PRINTCOMP(VL vl,COMP c)
-{
-	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 vl,DP d)
 {
 	int n,i;
@@ -489,29 +290,6 @@ void PRINTUI(VL vl,USINT u)
 	total_length += 10;
 }
 
-void PRINTGF2MAT(VL vl,GF2MAT 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 vl,GFMMAT mat)
 {
 	int row,col,i,j;
@@ -535,17 +313,38 @@ void PRINTBYTEARRAY(VL vl,BYTEARRAY array)
 	total_length += 1+3*array->len;
 }
 
+extern int print_quote;
+
 void PRINTQUOTE(VL vl,QUOTE quote)
 {
-	/* <...quoted...> */
-	total_length += 20;
+	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 PRINTERR(VL vl,ERR e)
+void PRINTSYMBOL(SYMBOL sym)
 {
-	PUTS("error("); PRINTEXPR(vl,e->body); PUTS(")");
+	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;
@@ -578,94 +377,6 @@ void PRINTUP2(UP2 p)
 	}
 }
 
-void PRINTLF(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;
-	}
-}
-
-void PRINTFOP(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(")");
-	}
-}
-
-void PRINTEOP(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(")");
-}
-
-void PRINTLOP(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");
-}
-
 void PRINTQOP(VL vl,F f)
 {
 	char *op;
@@ -750,4 +461,8 @@ void PRINTSF(unsigned int i)
 		PUTS("0");
 	} else
 		total_length += 15;
+
+#ifndef CPRINT
+#define CPRINT
+#endif
 }