===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/spexpr.c,v
retrieving revision 1.9
retrieving revision 1.13
diff -u -p -r1.9 -r1.13
--- OpenXM_contrib2/asir2000/io/spexpr.c	2000/12/22 10:03:31	1.9
+++ OpenXM_contrib2/asir2000/io/spexpr.c	2001/04/20 02:34:23	1.13
@@ -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.8 2000/12/16 06:16:10 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/spexpr.c,v 1.12 2001/03/15 05:52:12 noro Exp $ 
 */
 #include "ca.h"
 #include "al.h"
@@ -88,6 +88,7 @@ int fortran_output;
 #define PRINTGF2MAT printgf2mat
 #define PRINTGFMMAT printgfmmat
 #define PRINTBYTEARRAY printbytearray
+#define PRINTQUOTE printquote
 #define PRINTERR printerr
 #define PRINTLF printlf
 #define PRINTLOP printlop
@@ -104,6 +105,7 @@ extern char DFORMAT[BUFSIZ];
 extern int hex_output;
 extern int fortran_output;
 extern int double_output;
+extern int real_digit;
 
 #define TAIL while ( *OUT ) OUT++;
 #define PUTS(s) strcat(OUT,s)
@@ -128,6 +130,7 @@ extern int double_output;
 #define PRINTGF2MAT sprintgf2mat
 #define PRINTGFMMAT sprintgfmmat
 #define PRINTBYTEARRAY sprintbytearray
+#define PRINTQUOTE sprintquote
 #define PRINTERR sprinterr
 #define PRINTLF sprintlf
 #define PRINTLOP sprintlop
@@ -153,6 +156,7 @@ void PRINTUI();
 void PRINTGF2MAT();
 void PRINTGFMMAT();
 void PRINTBYTEARRAY();
+void PRINTQUOTE();
 void PRINTERR();
 void PRINTCPLX();
 void PRINTLM();
@@ -268,6 +272,8 @@ Obj p;
 			PRINTGFMMAT(vl,(GFMMAT)p); break;
 		case O_BYTEARRAY:
 			PRINTBYTEARRAY(vl,(BYTEARRAY)p); break;
+		case O_QUOTE:
+			PRINTQUOTE(vl,(QUOTE)p); break;
 		default:
 			break;
 	}
@@ -309,6 +315,8 @@ extern int	printmode;
 void PRINTNUM(q)
 Num q;
 {
+	char real_format[20];
+
 	if ( !q ) {
 		PUTS("0");
 		return;
@@ -335,7 +343,13 @@ Num q;
 				case MID_PRINTF_G:
 #endif
 				default:
-				TAIL PRINTF(OUT,"%g",BDY((Real)q));
+				if ( real_digit ) {
+					sprintf(real_format,
+						double_output?"%%.%df":"%%.%dg",real_digit);
+					TAIL PRINTF(OUT,real_format,BDY((Real)q));
+				} else {
+					TAIL PRINTF(OUT,double_output?"%f":"%g",BDY((Real)q));
+				}
 				break;
 			}
 			break;
@@ -392,6 +406,8 @@ Num q;
 		case N_GFPN:
 			PRINTUP((UP)(((GFPN)q)->body));
 			break;
+		case N_GFS:
+			TAIL PRINTF(OUT,"@_%d",CONT((GFS)q)); break;
 	}
 }
 
@@ -700,6 +716,13 @@ BYTEARRAY array;
 	}
 	TAIL PRINTF(OUT,"%02x",(unsigned int)b[i]);
 	PUTS("|");
+}
+
+void PRINTQUOTE(vl,quote)
+VL vl;
+QUOTE quote;
+{
+	PUTS("<...quoted...>");
 }
 
 void PRINTERR(vl,e)