===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/cmo.c,v
retrieving revision 1.19
retrieving revision 1.26
diff -u -p -r1.19 -r1.26
--- OpenXM/src/ox_toolkit/cmo.c	2005/07/20 17:48:03	1.19
+++ OpenXM/src/ox_toolkit/cmo.c	2016/06/29 05:07:23	1.26
@@ -1,5 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/cmo.c,v 1.18 2005/03/03 07:25:17 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/cmo.c,v 1.25 2015/08/18 02:24:04 noro Exp $ */
 
 /* 
    This module includes functions for sending/receiveng CMO's.
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
+#include <mpfr.h>
 #include "ox_toolkit.h"
 #include "parse.h"
 
@@ -245,30 +246,60 @@ cmo_zz* new_cmo_zz_size(int size)
     return c;
 }
 
-cmo_qq* new_cmo_qq_noinit()
+cmo_qq* new_cmo_qq()
 {
     cmo_qq* c = MALLOC(sizeof(cmo_qq));
     c->tag  = CMO_QQ;
-    c->num  = c->den = NULL;
+    mpq_init(c->mpq);
     return c;
 }
 
+cmo_bf* new_cmo_bf()
+{
+    cmo_bf* c = MALLOC(sizeof(cmo_bf));
+    c->tag = CMO_BIGFLOAT32;
+    mpfr_init(c->mpfr);
+    return c;
+}
+
+cmo_complex* new_cmo_complex()
+{
+    cmo_complex* c = MALLOC(sizeof(cmo_complex));
+    c->tag = CMO_COMPLEX;
+    return c;
+}
+
 cmo_qq* new_cmo_qq_set_mpq(mpq_ptr q)
 {
-    cmo_qq* c = new_cmo_qq_noinit();
-    c->num = new_cmo_zz_set_mpz(mpq_numref(q));
-    c->den = new_cmo_zz_set_mpz(mpq_denref(q));
+    cmo_qq* c = new_cmo_qq();
+    mpq_set(c->mpq, q);
     return c;
 }
 
 cmo_qq* new_cmo_qq_set_mpz(mpz_ptr num, mpz_ptr den)
 {
-    cmo_qq* c = new_cmo_qq_noinit();
-    c->num = new_cmo_zz_set_mpz(num);
-    c->den = new_cmo_zz_set_mpz(den);
+    cmo_qq* c = new_cmo_qq();
+    mpq_set_num(c->mpq, num);
+    mpq_set_den(c->mpq, den);
     return c;
 }
 
+cmo_bf* new_cmo_bf_set_mpfr(mpfr_ptr num)
+{
+    cmo_bf* c = new_cmo_bf();
+    mpfr_init2(c->mpfr,num->_mpfr_prec);
+    mpfr_set(c->mpfr,num,MPFR_RNDN);
+    return c;
+}
+
+cmo_complex* new_cmo_complex_set_re_im(cmo *re,cmo *im)
+{
+    cmo_complex* c = new_cmo_complex();
+    c->re = re;
+    c->im = im;
+    return c;
+}
+
 cmo_zero* new_cmo_zero()
 {
     cmo_zero* m = MALLOC_ATOMIC(sizeof(cmo_zero));
@@ -449,4 +480,18 @@ char *new_string_set_cmo(cmo *m)
         /* yet not implemented. */
         return NULL;
     }
+}
+
+int cmo_to_int(cmo *n)
+{
+  switch(n->tag) {
+    case CMO_ZERO:
+      return 0;
+    case CMO_INT32:
+      return ((cmo_int32 *)n)->i;
+    case CMO_ZZ:
+      return mpz_get_si(((cmo_zz *)n)->mpz);
+    default:
+      return 0;
+  }
 }