===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/spexpr.c,v
retrieving revision 1.4
retrieving revision 1.8
diff -u -p -r1.4 -r1.8
--- OpenXM_contrib2/asir2000/io/spexpr.c	2000/08/22 05:04:18	1.4
+++ OpenXM_contrib2/asir2000/io/spexpr.c	2000/12/16 06:16:10	1.8
@@ -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/spexpr.c,v 1.3 2000/08/21 08:31:39 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/spexpr.c,v 1.7 2000/12/15 05:30:08 noro Exp $ 
 */
 #include "ca.h"
 #include "al.h"
@@ -87,6 +87,7 @@ int fortran_output;
 #define PRINTUI printui
 #define PRINTGF2MAT printgf2mat
 #define PRINTGFMMAT printgfmmat
+#define PRINTBYTEARRAY printbytearray
 #define PRINTERR printerr
 #define PRINTLF printlf
 #define PRINTLOP printlop
@@ -102,6 +103,7 @@ static char *buf;
 extern char DFORMAT[BUFSIZ];
 extern int hex_output;
 extern int fortran_output;
+extern int double_output;
 
 #define TAIL while ( *OUT ) OUT++;
 #define PUTS(s) strcat(OUT,s)
@@ -125,6 +127,7 @@ extern int fortran_output;
 #define PRINTUI sprintui
 #define PRINTGF2MAT sprintgf2mat
 #define PRINTGFMMAT sprintgfmmat
+#define PRINTBYTEARRAY sprintbytearray
 #define PRINTERR sprinterr
 #define PRINTLF sprintlf
 #define PRINTLOP sprintlop
@@ -149,6 +152,7 @@ void PRINTDP();
 void PRINTUI();
 void PRINTGF2MAT();
 void PRINTGFMMAT();
+void PRINTBYTEARRAY();
 void PRINTERR();
 void PRINTCPLX();
 void PRINTLM();
@@ -179,7 +183,7 @@ P p;
 void printbf(a)
 BF a;
 {
-	sor(a->body,'g',-1,0);
+	sor(a->body,double_output ? 'f' : 'g',-1,0);
 }
 #endif
 #endif
@@ -192,13 +196,26 @@ char *s;
 }
 
 #if PARI
+#include "genpari.h"
+
+void myoutbrute(g)
+GEN g;
+{
+	bruteall(g,'f',-1,1);
+}
+
 void sprintbf(a)
 BF a;
 {
 	char *str;
 	char *GENtostr();
+	char *GENtostr0();
 
-	str = GENtostr(a->body);
+	if ( double_output ) {
+		str = GENtostr0(a->body,myoutbrute);
+	} else {
+		str = GENtostr(a->body);
+	}
 	TAIL PRINTF(OUT,"%s",str);
 	free(str);
 }
@@ -245,6 +262,8 @@ Obj p;
 			PRINTLF(vl,(F)p); break;
 		case O_GFMMAT:
 			PRINTGFMMAT(vl,(GFMMAT)p); break;
+		case O_BYTEARRAY:
+			PRINTBYTEARRAY(vl,(BYTEARRAY)p); break;
 		default:
 			break;
 	}
@@ -298,7 +317,7 @@ Num q;
 			}
 			break;
 		case N_R:
-			TAIL PRINTF(OUT,"%g",BDY((Real)q));
+			TAIL PRINTF(OUT,double_output?"%f":"%g",BDY((Real)q));
 			break;
 		case N_A:
 			PUTS("("); PRINTR(ALG,(R)BDY((Alg)q)); PUTS(")");
@@ -612,6 +631,24 @@ GFMMAT mat;
 		}
 		PUTS("]\n");
 	}
+}
+
+void PRINTBYTEARRAY(vl,array)
+VL vl;
+BYTEARRAY array;
+{
+	int len,i;
+	unsigned int t;
+	unsigned char *b;
+
+	len = array->len;
+	b = array->body;
+	PUTS("|");
+	for ( i = 0; i < len-1; i++ ) {
+		TAIL PRINTF(OUT,"%02x ",(unsigned int)b[i]);
+	}
+	TAIL PRINTF(OUT,"%02x",(unsigned int)b[i]);
+	PUTS("|");
 }
 
 void PRINTERR(vl,e)