===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/pexpr.c,v
retrieving revision 1.15
retrieving revision 1.19
diff -u -p -r1.15 -r1.19
--- OpenXM_contrib2/asir2000/io/pexpr.c	2001/08/28 05:46:26	1.15
+++ OpenXM_contrib2/asir2000/io/pexpr.c	2002/09/02 05:16:07	1.19
@@ -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.14 2001/08/06 01:48:33 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/pexpr.c,v 1.18 2002/01/08 04:14:39 kondoh Exp $
 */
 #include "ca.h"
 #include "al.h"
@@ -99,6 +99,8 @@ int print_quote;
 #define PRINTEOP printeop
 #define PRINTQOP printqop
 #define PRINTUP printup
+#define PRINTUM printum
+#define PRINTSF printsf
 #endif
 
 #ifdef SPRINT
@@ -142,6 +144,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 +170,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 +189,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 ) 
@@ -196,6 +207,8 @@ P p;
 void printbf(a)
 BF a;
 {
+	void sor();
+
 	sor(a->body,double_output ? 'f' : 'g',-1,0);
 }
 #endif
@@ -399,31 +412,31 @@ Num q;
 #endif
 #if defined(INTERVAL)
 		case N_IP:
-		case N_IF:
+		case N_IntervalBigFloat:
 			PUTS("[");
 			PRINTNUM(INF((Itv)q));
 			PUTS(",");
 			PRINTNUM(SUP((Itv)q));
 			PUTS("]");
 			break;
-		case N_ID:
+		case N_IntervalDouble:
 			switch (printmode) {
 				case PRINTF_E:
-					TAIL PRINTF(OUT, "[%.16e,%.16e]",INF((ItvD)q),SUP((ItvD)q));
+					TAIL PRINTF(OUT, "[%.16e,%.16e]",INF((IntervalDouble)q),SUP((IntervalDouble)q));
 #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);
+					TAIL PRINTF(OUT, "<%g,%g>", (SUP((IntervalDouble)q)+INF((IntervalDouble)q))*0.5,(SUP((IntervalDouble)q)-INF((IntervalDouble)q))*0.5);
 					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);
+					TAIL PRINTF(OUT, "<%.16e,%.16e>", (SUP((IntervalDouble)q)+INF((IntervalDouble)q))*0.5,(SUP((IntervalDouble)q)-INF((IntervalDouble)q))*0.5);
 					break;
 				case PRINTF_G:
 				default:
-					TAIL PRINTF(OUT, "[%g,%g]",INF((ItvD)q),SUP((ItvD)q));
+					TAIL PRINTF(OUT, "[%g,%g]",INF((IntervalDouble)q),SUP((IntervalDouble)q));
 				break;
 			}
 			break;
@@ -446,6 +459,9 @@ Num q;
 		case N_GFS:
 			TAIL PRINTF(OUT,"@_%d",CONT((GFS)q));
 			break;
+		case N_GFSN:
+			PRINTUM(BDY((GFSN)q));
+			break;
 	}
 }
 
@@ -458,8 +474,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
@@ -539,8 +555,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 {
@@ -729,7 +745,6 @@ VL vl;
 GFMMAT mat;
 {
 	int row,col,i,j;
-	unsigned int t;
 	unsigned int **b;
 
 	row = mat->row;
@@ -749,7 +764,6 @@ VL vl;
 BYTEARRAY array;
 {
 	int len,i;
-	unsigned int t;
 	unsigned char *b;
 
 	len = array->len;
@@ -842,7 +856,7 @@ F f;
 	}
 }
 
-PRINTFOP(vl,f)
+void PRINTFOP(vl,f)
 VL vl;
 F f;
 {
@@ -857,7 +871,7 @@ F f;
 	}
 }
 
-PRINTEOP(vl,f)
+void PRINTEOP(vl,f)
 VL vl;
 F f;
 {
@@ -884,7 +898,7 @@ F f;
 	PUTS(")");
 }
 
-PRINTLOP(vl,f)
+void PRINTLOP(vl,f)
 VL vl;
 F f;
 {
@@ -910,7 +924,7 @@ F f;
 	PRINTEXPR(vl,(Obj)FPL(f)); PUTS(op); PUTS("0");
 }
 
-PRINTQOP(vl,f)
+void PRINTQOP(vl,f)
 VL vl;
 F f;
 {
@@ -921,7 +935,7 @@ F f;
 	PRINTEXPR(vl,(Obj)FQMAT(f)); PUTS(")");
 }
 
-PRINTUP(n)
+void PRINTUP(n)
 UP n;
 {
 	int i,d;
@@ -952,5 +966,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));
 	}
 }