===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v
retrieving revision 1.30
retrieving revision 1.36
diff -u -p -r1.30 -r1.36
--- OpenXM/src/ox_toolkit/ox_toolkit.h	2005/03/03 07:25:17	1.30
+++ OpenXM/src/ox_toolkit/ox_toolkit.h	2015/08/04 05:24:44	1.36
@@ -1,16 +1,13 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.29 2005/03/03 06:21:23 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.35 2008/08/01 08:29:40 iwane Exp $ */
 
 #ifndef _OX_TOOLKIT_H_
-
 #define _OX_TOOLKIT_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #include <stdio.h>
 #include <gmp.h>
+#include <mpfr.h>
 #include <ox/cmotag.h>
 #include <ox/oxMessageTag.h>
 #include <ox/smCommand.h>
@@ -22,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
@@ -115,12 +116,16 @@ 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;
     double d; /* machine dependent */
 } cmo_double;
 
@@ -180,6 +185,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();
@@ -188,9 +195,10 @@ 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_noinit();
+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_set_mpfr(mpfr_ptr q);
 cmo_zero*          new_cmo_zero();
 cmo_double*        new_cmo_double(double d);
 cmo_distributed_polynomial* new_cmo_distributed_polynomial();
@@ -211,6 +219,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);
@@ -269,10 +279,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);