===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/print.c,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -p -r1.6 -r1.8
--- OpenXM/src/ox_toolkit/print.c	2018/04/04 09:44:09	1.6
+++ OpenXM/src/ox_toolkit/print.c	2018/04/05 06:17:27	1.8
@@ -1,5 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/print.c,v 1.5 2003/02/03 23:13:23 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/print.c,v 1.7 2018/04/04 09:52:03 ohara Exp $ */
 
 /*
 Functions in this module print a given CMO to console.
@@ -17,7 +17,11 @@ 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_zz(cmo_zz* c);
+static void print_cmo_qq(cmo_qq* c);
 static void print_cmo_tree(cmo_tree* c);
+static void print_cmo_polynomial_in_one_variable(cmo_polynomial_in_one_variable* c);
+static void print_cmo_recursive_polynomial(cmo_recursive_polynomial* c);
 
 void print_cmo(cmo* c)
 {
@@ -50,6 +54,12 @@ void print_cmo(cmo* c)
     case CMO_DMS_GENERIC:
         ox_printf(")");
         break;
+    case CMO_ZZ:
+        print_cmo_zz((cmo_zz *)c);
+        break;
+    case CMO_QQ:
+        print_cmo_qq((cmo_qq *)c);
+        break;
     case CMO_BIGFLOAT:
         print_cmo_bf((cmo_bf *)c);
         break;
@@ -60,6 +70,12 @@ void print_cmo(cmo* c)
     case CMO_TREE:
         print_cmo_tree((cmo_tree *)c);
         break;
+    case CMO_POLYNOMIAL_IN_ONE_VARIABLE:
+        print_cmo_polynomial_in_one_variable((cmo_polynomial_in_one_variable *)c);
+        break;
+    case CMO_RECURSIVE_POLYNOMIAL:
+        print_cmo_recursive_polynomial((cmo_recursive_polynomial *)c);
+        break;
     default:
         ox_printf("\nprint_cmo() does not know how to print cmo of type %d.\n", tag);
     }
@@ -99,6 +115,20 @@ static void print_cmo_double(cmo_double* c)
     ox_printf(", %.14f)", c->d);
 }
 
+static void print_cmo_zz(cmo_zz* c)
+{
+	char buf[4096];
+    gmp_sprintf(buf, ", %Zd)", c->mpz);
+    ox_printf("%s", buf);
+}
+
+static void print_cmo_qq(cmo_qq* c)
+{
+	char buf[4096];
+    gmp_sprintf(buf, ", %Qd)", c->mpq);
+    ox_printf("%s", buf);
+}
+
 static void print_cmo_bf(cmo_bf* c)
 {
 	char buf[4096];
@@ -114,6 +144,29 @@ static void print_cmo_tree(cmo_tree* c)
     print_cmo(c->attributes);
     ox_printf(", ");
     print_cmo(c->leaves);
+    ox_printf(")");
+}
+
+
+static void print_cmo_polynomial_in_one_variable(cmo_polynomial_in_one_variable* c)
+{
+    int i;
+    cell *cc;
+    ox_printf(", %d", c->var);
+    for(i=0; i<c->length; i++) {
+        cc = list_nth_cell((cmo_list *)c, i);
+		ox_printf(", %d, ", cc->exp);
+		print_cmo(cc->cmo);
+    }
+    ox_printf(")");
+}
+
+static void print_cmo_recursive_polynomial(cmo_recursive_polynomial* c)
+{
+    ox_printf(", ");
+	print_cmo((cmo *)c->ringdef);
+	ox_printf(", ");
+	print_cmo(c->coef);
     ox_printf(")");
 }