===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v
retrieving revision 1.26
retrieving revision 1.39
diff -u -p -r1.26 -r1.39
--- OpenXM/src/ox_toolkit/ox_toolkit.h	2003/09/18 12:46:08	1.26
+++ OpenXM/src/ox_toolkit/ox_toolkit.h	2015/08/26 20:17:28	1.39
@@ -1,20 +1,13 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.25 2003/09/15 09:31:41 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.38 2015/08/18 02:24:04 noro Exp $ */
 
 #ifndef _OX_TOOLKIT_H_
-
 #define _OX_TOOLKIT_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #include <stdio.h>
-#if defined(WITH_GMP)
 #include <gmp.h>
-#else
-#include "gmp_fake.h"
-#endif /* WITH_GMP */
+#include <mpfr.h>
 #include <ox/cmotag.h>
 #include <ox/oxMessageTag.h>
 #include <ox/smCommand.h>
@@ -26,6 +19,10 @@ extern "C" {
 /* #define FREE(x)   free((x)) */
 #define FREE(x)   
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if !defined(__GNUC__) && !defined(__inline__)
 #define __inline__
 #endif
@@ -54,6 +51,8 @@ typedef struct OXFILE{
     char *wbuf;
     int wbuf_size;
     int wbuf_count;
+    int (*send_double)(struct OXFILE *oxfp, double int64);
+    double (*receive_double)(struct OXFILE *oxfp);
 } OXFILE;
 
 typedef struct cmo {
@@ -117,12 +116,21 @@ typedef struct {
 
 typedef struct {
     int tag;
-    cmo *num;  /* Bunshi (cmo_zz) */
-    cmo *den;  /* Bunbo (cmo_zz) */
+    mpq_t mpq;
 } cmo_qq;
 
 typedef struct {
     int tag;
+    mpfr_t mpfr;
+} cmo_bf;
+
+typedef struct {
+    int tag;
+    cmo *re,*im;
+} cmo_complex;
+
+typedef struct {
+    int tag;
     double d; /* machine dependent */
 } cmo_double;
 
@@ -182,6 +190,8 @@ cmo_int32*         new_cmo_int32(int i);
 cmo_string*        new_cmo_string(char* s);
 cmo_mathcap*       new_cmo_mathcap(cmo* ob);
 cmo_list*          new_cmo_list();
+cmo_list*          new_cmo_list_array(void *a[], int n);
+cmo_list*          new_cmo_list_array_map(void *a[], int n, void *(* mapf)(void *));
 cmo_monomial32*    new_cmo_monomial32();
 cmo_monomial32*    new_cmo_monomial32_size(int size);
 cmo_zz*            new_cmo_zz();
@@ -190,6 +200,13 @@ cmo_zz*            new_cmo_zz_set_si(int integer);
 cmo_zz*            new_cmo_zz_set_mpz(mpz_ptr z);
 cmo_zz*            new_cmo_zz_noinit();
 cmo_zz*            new_cmo_zz_set_string(char* s);
+cmo_qq*            new_cmo_qq();
+cmo_qq*            new_cmo_qq_set_mpq(mpq_ptr q);
+cmo_qq*            new_cmo_qq_set_mpz(mpz_ptr num, mpz_ptr den);
+cmo_bf*            new_cmo_bf();
+cmo_bf*            new_cmo_bf_set_mpfr(mpfr_ptr q);
+cmo_complex*       new_cmo_complex();
+cmo_complex*       new_cmo_complex_set_re_im(cmo *re,cmo *im);
 cmo_zero*          new_cmo_zero();
 cmo_double*        new_cmo_double(double d);
 cmo_distributed_polynomial* new_cmo_distributed_polynomial();
@@ -210,6 +227,8 @@ char*              new_string_set_cmo(cmo* m);
 
 cmo_error2*        make_error_object(int err_code, cmo* ob);
 
+cmo*               ox_parse_lisp(char *s);
+
 /* Low level API */
 cmo*               receive_cmo(OXFILE *fp);
 cmo*               receive_cmo_tag(OXFILE *fp, int tag);
@@ -258,6 +277,8 @@ void               dump_ox_data(ox_data* m);
 void               print_cmo(cmo* c);
 void               resize_mpz(mpz_ptr mpz, int size);
 
+int                cmo_to_int(cmo *n);
+
 typedef cmo *(*hook_t)(OXFILE *, cmo *);
 
 int add_hook_before_send_cmo(hook_t func);
@@ -268,10 +289,6 @@ int add_hook_after_send_cmo(hook_t func);
 #define PFLAG_ADDREV   1
 
 typedef struct symbol *symbol_t;
-
-void setflag_parse(int flag);
-cmo *parse();
-void init_parser(char *s);
 
 symbol_t lookup_by_symbol(char *key);
 symbol_t lookup_by_token(int tok);