===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/print.c,v
retrieving revision 1.4
retrieving revision 1.6
diff -u -p -r1.4 -r1.6
--- OpenXM/src/ox_toolkit/print.c	2003/01/13 12:03:12	1.4
+++ OpenXM/src/ox_toolkit/print.c	2018/04/04 09:44:09	1.6
@@ -1,5 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/print.c,v 1.3 2003/01/11 11:42:32 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/print.c,v 1.5 2003/02/03 23:13:23 ohara Exp $ */
 
 /*
 Functions in this module print a given CMO to console.
@@ -15,14 +15,16 @@ static void print_cmo_int32(cmo_int32* c);
 static void print_cmo_list(cmo_list* li);
 static void print_cmo_mathcap(cmo_mathcap* c);
 static void print_cmo_string(cmo_string* c);
+static void print_cmo_double(cmo_double* c);
+static void print_cmo_bf(cmo_bf* c);
+static void print_cmo_tree(cmo_tree* c);
 
 void print_cmo(cmo* c)
 {
     int tag = c->tag;
-
-    symbol_t symp = lookup_by_tag(tag);
-    if (symp != NULL) {
-        ox_printf("(%s", symp->key);
+    char *s = get_symbol_by_tag(tag);
+    if (s != NULL) {
+        ox_printf("(%s", s);
     }else {     
         ox_printf("(%d", tag);
     }
@@ -48,6 +50,16 @@ void print_cmo(cmo* c)
     case CMO_DMS_GENERIC:
         ox_printf(")");
         break;
+    case CMO_BIGFLOAT:
+        print_cmo_bf((cmo_bf *)c);
+        break;
+    case CMO_IEEE_DOUBLE_FLOAT:
+    case CMO_64BIT_MACHINE_DOUBLE:
+        print_cmo_double((cmo_double *)c);
+        break;
+    case CMO_TREE:
+        print_cmo_tree((cmo_tree *)c);
+        break;
     default:
         ox_printf("\nprint_cmo() does not know how to print cmo of type %d.\n", tag);
     }
@@ -80,5 +92,28 @@ static void print_cmo_mathcap(cmo_mathcap* c)
 static void print_cmo_string(cmo_string* c)
 {
     ox_printf(", \"%s\")", c->s);
+}
+
+static void print_cmo_double(cmo_double* c)
+{
+    ox_printf(", %.14f)", c->d);
+}
+
+static void print_cmo_bf(cmo_bf* c)
+{
+	char buf[4096];
+    mpfr_sprintf(buf, ", %.12f)", c->mpfr);
+    ox_printf("%s", buf);
+}
+
+static void print_cmo_tree(cmo_tree* c)
+{
+    ox_printf(", ");
+    print_cmo(c->name);
+    ox_printf(", ");
+    print_cmo(c->attributes);
+    ox_printf(", ");
+    print_cmo(c->leaves);
+    ox_printf(")");
 }