===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/cpexpr.c,v
retrieving revision 1.2
retrieving revision 1.12
diff -u -p -r1.2 -r1.12
--- OpenXM_contrib2/asir2000/io/cpexpr.c	2000/02/07 03:14:39	1.2
+++ OpenXM_contrib2/asir2000/io/cpexpr.c	2001/09/03 07:01:08	1.12
@@ -1,10 +1,57 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/io/cpexpr.c,v 1.1.1.1 1999/12/03 07:39:11 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+ * non-exclusive and royalty-free license to use, copy, modify and
+ * redistribute, solely for non-commercial and non-profit purposes, the
+ * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+ * conditions of this Agreement. For the avoidance of doubt, you acquire
+ * only a limited right to use the SOFTWARE hereunder, and FLL or any
+ * third party developer retains all rights, including but not limited to
+ * copyrights, in and to the SOFTWARE.
+ * 
+ * (1) FLL does not grant you a license in any way for commercial
+ * purposes. You may use the SOFTWARE only for non-commercial and
+ * non-profit purposes only, such as academic, research and internal
+ * business use.
+ * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+ * international copyright treaties. If you make copies of the SOFTWARE,
+ * with or without modification, as permitted hereunder, you shall affix
+ * to all such copies of the SOFTWARE the above copyright notice.
+ * (3) An explicit reference to this SOFTWARE and its copyright owner
+ * shall be made on your publication or presentation in any form of the
+ * results obtained by use of the SOFTWARE.
+ * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
+ * for such modification or the source code of the modified part of the
+ * SOFTWARE.
+ * 
+ * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+ * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+ * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+ * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+ * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+ * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+ * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+ * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+ * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+ * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+ * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+ * 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.11 2001/04/20 02:34:23 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,real_digit;
 
 #define PRINTHAT (fortran_output?PUTS("**"):PUTS("^"))
 
@@ -29,6 +76,8 @@ extern int hex_output,fortran_output;
 #define PRINTUI length_ui
 #define PRINTGF2MAT length_gf2mat
 #define PRINTGFMMAT length_gfmmat
+#define PRINTBYTEARRAY length_bytearray
+#define PRINTQUOTE length_QUOTE
 #define PRINTERR length_err
 #define PRINTLF length_lf
 #define PRINTLOP length_lop
@@ -36,6 +85,8 @@ extern int hex_output,fortran_output;
 #define PRINTEOP length_eop
 #define PRINTQOP length_qop
 #define PRINTUP length_up
+#define PRINTUM length_um
+#define PRINTSF length_sf
 
 void PRINTEXPR();
 void PRINTNUM();
@@ -52,6 +103,8 @@ void PRINTDP();
 void PRINTUI();
 void PRINTGF2MAT();
 void PRINTGFMMAT();
+void PRINTBYTEARRAY();
+void PRINTQUOTE();
 void PRINTERR();
 void PRINTCPLX();
 void PRINTLM();
@@ -75,8 +128,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);
 }
@@ -122,6 +181,10 @@ pointer p;
 			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;
 	}
@@ -157,7 +220,10 @@ Num q;
 			}
 			break;
 		case N_R:
-			total_length += 20; /* XXX */
+			if ( double_output )
+				total_length += 400+real_digit; /* XXX */
+			else
+				total_length += 20+real_digit; /* XXX */
 			break;
 		case N_A:
 			PUTS("("); PRINTR(ALG,(R)BDY((Alg)q)); PUTS(")");
@@ -182,6 +248,12 @@ Num q;
 		case N_GFPN:
 			PRINTUP((UP)(((GFPN)q)->body));
 			break;
+		case N_GFS:
+			total_length += 13; /* XXX */
+			break;
+		case N_GFSN:
+			PRINTUM(BDY((GFSN)q));
+			break;
 		default:
 			break;
 	}
@@ -481,6 +553,22 @@ GFMMAT mat;
 	}
 }
 
+void PRINTBYTEARRAY(vl,array)
+VL vl;
+BYTEARRAY array;
+{
+	/* |xx xx ... xx| */
+	total_length += 1+3*array->len;
+}
+
+void PRINTQUOTE(vl,quote)
+VL vl;
+QUOTE quote;
+{
+	/* <...quoted...> */
+	total_length += 20;
+}
+
 void PRINTERR(vl,e)
 VL vl;
 ERR e;
@@ -663,4 +751,47 @@ UP n;
 		}
 		PUTS(")");
 	}
+}
+
+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; total_length += 13;
+		}
+		for ( i = d-1; i >= 0; i-- ) {
+			if ( n->c[i] ) {
+				PUTS("+("); PRINTSF(n->c[i]); PUTS(")");
+				if ( i >= 2 ) {
+					PUTS("*@s"); PRINTHAT; total_length += 13;
+				} else if ( i == 1 )
+					PUTS("*@s");
+			}
+		}
+		PUTS(")");
+	}
+}
+
+PRINTSF(i)
+unsigned int i;
+{
+	if ( !i ) {
+		PUTS("0");
+	} else
+		total_length += 15;
 }