===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/pexpr.c,v
retrieving revision 1.19
retrieving revision 1.29
diff -u -p -r1.19 -r1.29
--- OpenXM_contrib2/asir2000/io/pexpr.c	2002/09/02 05:16:07	1.19
+++ OpenXM_contrib2/asir2000/io/pexpr.c	2004/02/09 08:23:30	1.29
@@ -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.18 2002/01/08 04:14:39 kondoh Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/io/pexpr.c,v 1.28 2004/02/04 07:42:07 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
@@ -101,6 +107,8 @@ int print_quote;
 #define PRINTUP printup
 #define PRINTUM printum
 #define PRINTSF printsf
+#define PRINTSYMBOL printsymbol
+#define PRINTRANGE printrange
 #endif
 
 #ifdef SPRINT
@@ -111,8 +119,10 @@ 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
@@ -124,7 +134,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
@@ -146,6 +156,8 @@ extern int print_quote;
 #define PRINTUP sprintup
 #define PRINTUM sprintum
 #define PRINTSF sprintsf
+#define PRINTSYMBOL sprintsymbol
+#define PRINTRANGE sprintrange
 #endif
 
 void PRINTEXPR();
@@ -177,6 +189,8 @@ void PRINTEOP();
 void PRINTLOP();
 void PRINTQOP();
 void PRINTSF();
+void PRINTSYMBOL();
+void PRINTRANGE();
 
 #ifdef FPRINT
 void output_init() {
@@ -203,12 +217,10 @@ P p;
 		return (mmono(COEF(DC(p))));
 }
 
-#if PARI
+#if defined(PARI)
 void printbf(a)
 BF a;
 {
-	void sor();
-
 	sor(a->body,double_output ? 'f' : 'g',-1,0);
 }
 #endif
@@ -221,9 +233,7 @@ char *s;
 	s[0] = 0; buf = s;
 }
 
-#if PARI
-#include "genpari.h"
-
+#if defined(PARI)
 void myoutbrute(g)
 GEN g;
 {
@@ -234,7 +244,6 @@ void sprintbf(a)
 BF a;
 {
 	char *str;
-	char *GENtostr();
 	char *GENtostr0();
 
 	if ( double_output ) {
@@ -292,6 +301,10 @@ Obj p;
 			PRINTBYTEARRAY(vl,(BYTEARRAY)p); break;
 		case O_QUOTE:
 			PRINTQUOTE(vl,(QUOTE)p); break;
+		case O_SYMBOL:
+			PRINTSYMBOL((SYMBOL)p); break;
+		case O_RANGE:
+			PRINTRANGE(vl,(RANGE)p); break;
 		default:
 			break;
 	}
@@ -393,7 +406,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));
@@ -406,37 +488,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_IntervalBigFloat:
-			PUTS("[");
-			PRINTNUM(INF((Itv)q));
-			PUTS(",");
-			PRINTNUM(SUP((Itv)q));
-			PUTS("]");
+			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_IntervalDouble:
 			switch (printmode) {
 				case PRINTF_E:
-					TAIL PRINTF(OUT, "[%.16e,%.16e]",INF((IntervalDouble)q),SUP((IntervalDouble)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((IntervalDouble)q));
 					printbin(SUP((IntervalDouble)q));
 #endif
 					break;
 				case MID_PRINTF_G:
-					TAIL PRINTF(OUT, "<%g,%g>", (SUP((IntervalDouble)q)+INF((IntervalDouble)q))*0.5,(SUP((IntervalDouble)q)-INF((IntervalDouble)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((IntervalDouble)q)+INF((IntervalDouble)q))*0.5,(SUP((IntervalDouble)q)-INF((IntervalDouble)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((IntervalDouble)q),SUP((IntervalDouble)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;
@@ -619,11 +757,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)
@@ -633,14 +784,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;
 	}
 }
 
@@ -1011,4 +1180,18 @@ unsigned int i;
 	} else {
 		TAIL PRINTF(OUT,"@_%d",IFTOF(i));
 	}
+}
+
+void PRINTSYMBOL(SYMBOL sym)
+{
+	PUTS(sym->name);
+}
+
+void PRINTRANGE(VL vl,RANGE p)
+{
+	PUTS("range(");
+	PRINTEXPR(vl,p->start);
+	PUTS(",");
+	PRINTEXPR(vl,p->end);
+	PUTS(")");
 }