===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/spexpr.c,v
retrieving revision 1.14
retrieving revision 1.16
diff -u -p -r1.14 -r1.16
--- OpenXM_contrib2/asir2000/io/spexpr.c	2001/08/06 01:48:33	1.14
+++ OpenXM_contrib2/asir2000/io/spexpr.c	2001/09/03 07:01:09	1.16
@@ -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.13 2001/04/20 02:34:23 noro Exp $ 
+ * $OpenXM$
 */
 #include "ca.h"
 #include "al.h"
@@ -99,6 +99,8 @@ int print_quote;
 #define PRINTEOP printeop
 #define PRINTQOP printqop
 #define PRINTUP printup
+#define PRINTUM printum
+#define PRINTSF printsf
 #endif
 
 #ifdef SPRINT
@@ -142,6 +144,8 @@ extern int print_quote;
 #define PRINTEOP sprinteop
 #define PRINTQOP sprintqop
 #define PRINTUP sprintup
+#define PRINTUM sprintum
+#define PRINTSF sprintsf
 #endif
 
 void PRINTEXPR();
@@ -315,8 +319,40 @@ N n;
 	}
 }
 
-extern int	printmode;
+#if defined(FPRINT)
+#if defined(ITVDEBUG)
+void printbin(double z)
+{
+	int	i, j, mask;
+	union {
+		double  x;
+		char    c[8];
+	} a;
 
+	a.x = z;
+	for(i=7;i>=0;i--) {
+		mask = 0x80;
+		for(j=0;j<8;j++) {
+			if (a.c[i] & mask) fprintf(stderr,"1");
+			else fprintf(stderr,"0");
+			mask >>= 1;
+		}
+	}
+	fprintf(stderr,"\n");
+}
+#endif
+#endif
+
+#if defined(FPRINT)
+#if 0
+int	printmode = PRINTF_E;
+#else
+int	printmode = PRINTF_G;
+#endif
+#else
+extern int printmode;
+#endif
+
 void PRINTNUM(q)
 Num q;
 {
@@ -414,6 +450,9 @@ Num q;
 		case N_GFS:
 			TAIL PRINTF(OUT,"@_%d",CONT((GFS)q));
 			break;
+		case N_GFSN:
+			PRINTUM(BDY((GFSN)q));
+			break;
 	}
 }
 
@@ -734,7 +773,14 @@ void PRINTQUOTE(vl,quote)
 VL vl;
 QUOTE quote;
 {
-	PUTS("<...quoted...>");
+	LIST list;
+
+	if ( print_quote ) {
+		fnodetotree(BDY(quote),&list);
+		PRINTEXPR(vl,(Obj)list);
+	} else {
+		PUTS("<...quoted...>");
+	}
 }
 
 void PRINTERR(vl,e)
@@ -913,5 +959,49 @@ 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; TAIL PRINTF(OUT,"%d",d);
+		}
+		for ( i = d-1; i >= 0; i-- ) {
+			if ( n->c[i] ) {
+				PUTS("+("); PRINTSF(n->c[i]); PUTS(")");
+				if ( i >= 2 ) {
+					PUTS("*@s"); PRINTHAT; TAIL PRINTF(OUT,"%d",i);
+				} else if ( i == 1 )
+					PUTS("*@s");
+			}
+		}
+		PUTS(")");
+	}
+}
+
+PRINTSF(i)
+unsigned int i;
+{
+	if ( !i ) {
+		PUTS("0");
+	} else {
+		TAIL PRINTF(OUT,"@_%d",IFTOF(i));
 	}
 }