===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/cpexpr.c,v
retrieving revision 1.4
retrieving revision 1.7
diff -u -p -r1.4 -r1.7
--- OpenXM_contrib2/asir2000/io/cpexpr.c	2000/08/22 05:04:17	1.4
+++ OpenXM_contrib2/asir2000/io/cpexpr.c	2000/12/16 06:16:10	1.7
@@ -44,14 +44,14 @@
  * 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.3 2000/08/21 08:31:38 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/cpexpr.c,v 1.6 2000/11/10 08:28:53 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 #include "al.h"
 #include "base.h"
 
-extern int hex_output,fortran_output;
+extern int hex_output,fortran_output,double_output;
 
 #define PRINTHAT (fortran_output?PUTS("**"):PUTS("^"))
 
@@ -76,6 +76,7 @@ extern int hex_output,fortran_output;
 #define PRINTUI length_ui
 #define PRINTGF2MAT length_gf2mat
 #define PRINTGFMMAT length_gfmmat
+#define PRINTBYTEARRAY length_bytearray
 #define PRINTERR length_err
 #define PRINTLF length_lf
 #define PRINTLOP length_lop
@@ -99,6 +100,7 @@ void PRINTDP();
 void PRINTUI();
 void PRINTGF2MAT();
 void PRINTGFMMAT();
+void PRINTBYTEARRAY();
 void PRINTERR();
 void PRINTCPLX();
 void PRINTLM();
@@ -122,8 +124,14 @@ BF a;
 {
 	char *str;
 	char *GENtostr();
+	char *GENtostr0();
+	void myoutbrute();
 
-	str = GENtostr(a->body);
+	if ( double_output ) {
+		str = GENtostr0(a->body,myoutbrute);
+	} else {
+		str = GENtostr(a->body);
+	}
 	total_length += strlen(str);
 	free(str);
 }
@@ -169,6 +177,8 @@ pointer p;
 			PRINTLF(vl,(F)p); break;
 		case O_GFMMAT:
 			PRINTGFMMAT(vl,(GFMMAT)p); break;
+		case O_BYTEARRAY:
+			PRINTBYTEARRAY(vl,(BYTEARRAY)p); break;
 		default:
 			break;
 	}
@@ -204,7 +214,10 @@ Num q;
 			}
 			break;
 		case N_R:
-			total_length += 20; /* XXX */
+			if ( double_output )
+				total_length += 400; /* XXX */
+			else
+				total_length += 20; /* XXX */
 			break;
 		case N_A:
 			PUTS("("); PRINTR(ALG,(R)BDY((Alg)q)); PUTS(")");
@@ -526,6 +539,14 @@ GFMMAT mat;
 		}
 		PUTS("]\n");
 	}
+}
+
+void PRINTBYTEARRAY(vl,array)
+VL vl;
+BYTEARRAY array;
+{
+	/* |xx xx ... xx| */
+	total_length += 1+3*array->len;
 }
 
 void PRINTERR(vl,e)