===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v
retrieving revision 1.5
retrieving revision 1.14
diff -u -p -r1.5 -r1.14
--- OpenXM/src/ox_toolkit/ox_toolkit.h	2000/11/18 04:49:55	1.5
+++ OpenXM/src/ox_toolkit/ox_toolkit.h	2003/03/23 20:17:35	1.14
@@ -1,12 +1,14 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.4 2000/10/12 15:53:25 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.13 2003/02/03 23:13:23 ohara Exp $ */
 
 #ifndef _OX_TOOLKIT_H_
 
 #define _OX_TOOLKIT_H_
 
 #include <stdio.h>
+#if defined(WITH_GMP)
 #include <gmp.h>
+#endif /* WITH_GMP */
 #include <ox/cmotag.h>
 #include <ox/oxMessageTag.h>
 #include <ox/smCommand.h>
@@ -15,19 +17,27 @@
 #define __inline__
 #endif
 
-/* functions related to ox.c */
+/* Mathcap Local Database */
+typedef struct {
+    int tag;
+    int flag;
+} table;
 
-#define MATHCAP_FLAG_DENY   0
-#define MATHCAP_FLAG_ALLOW  1
+typedef struct mathcap {
+    table *cmotbl;
+    table *smtbl;
+} mathcap;
 
-/* Open Xm File Descripter */
+/* OpenXM File Descripter */
 typedef struct OXFILE{
-	int fd;
-	int (*send_int32)(struct OXFILE *oxfp, int int32);
-	int (*receive_int32)(struct OXFILE *oxfp);
-	int serial_number;
-	struct OXFILE *control;  /* pointer to his control server. */
-	int error;
+    int fd;
+    int (*send_int32)(struct OXFILE *oxfp, int int32);
+    int (*receive_int32)(struct OXFILE *oxfp);
+    int serial_number;
+    int received_serial_number;
+    struct OXFILE *control;  /* pointer to his control server. */
+    struct mathcap *mathcap;
+    int error;
 } OXFILE;
 
 typedef struct {
@@ -83,6 +93,7 @@ typedef struct {
     cmo *coef;
 } cmo_monomial32;
 
+#if defined(WITH_GMP)
 typedef struct {
     int tag;
     mpz_t mpz;
@@ -93,7 +104,13 @@ typedef struct {
     cmo *num;  /* Bunshi (cmo_zz) */
     cmo *den;  /* Bunbo (cmo_zz) */
 } cmo_qq;
+#endif /* WITH_GMP */
 
+typedef struct {
+    int tag;
+    double d; /* machine dependent */
+} cmo_double;
+
 /* The following is a derived class from cmo_list. 
    that is, list_append can be used. */
 typedef struct {
@@ -124,13 +141,16 @@ cmo_mathcap*       new_cmo_mathcap(cmo* ob);
 cmo_list*          new_cmo_list();
 cmo_monomial32*    new_cmo_monomial32();
 cmo_monomial32*    new_cmo_monomial32_size(int size);
+#if defined(WITH_GMP)
 cmo_zz*            new_cmo_zz();
 cmo_zz*            new_cmo_zz_size(int size);
 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);
+#endif /* WITH_GMP */
 cmo_zero*          new_cmo_zero();
+cmo_double*        new_cmo_double(double d);
 cmo_distributed_polynomial* new_cmo_distributed_polynomial();
 cmo_dms_generic*   new_cmo_dms_generic();
 cmo_ring_by_name*  new_cmo_ring_by_name(cmo* ob);
@@ -189,7 +209,9 @@ void               dump_ox_command(ox_command* m);
 void               dump_ox_data(ox_data* m);
 
 void               print_cmo(cmo* c);
+#if defined(WITH_GMP)
 void               resize_mpz(mpz_ptr mpz, int size);
+#endif /* WITH_GMP */
 
 typedef cmo *(*hook_t)(OXFILE *, cmo *);
 
@@ -210,12 +232,14 @@ symbol_t lookup_by_symbol(char *key);
 symbol_t lookup_by_token(int tok);
 symbol_t lookup_by_tag(int tag);
 symbol_t lookup(int i);
-char *symbol_get_key(symbol_t sp);
+char*    get_symbol_by_tag(int tag);
 
 /* for mathcap database */
-cmo_mathcap *mathcap_get();
-int  mathcap_cmo_isallow_cmo(cmo *ob);
-void mathcap_sysinfo_set(int version, char *id, char *sysname);
+mathcap *new_mathcap();
+void mathcap_init(int ver, char *vstr, char *sysname, int cmos[], int sms[]);
+cmo_mathcap* mathcap_get(mathcap *this);
+mathcap *mathcap_update(mathcap *this, cmo_mathcap *mc);
+int mathcap_allowQ_cmo(mathcap *this, cmo *ob);
 
 int oxf_read(void *buffer, size_t size, size_t num, OXFILE *oxfp);
 int oxf_write(void *buffer, size_t size, size_t num, OXFILE *oxfp);
@@ -235,9 +259,13 @@ void oxf_setopt(OXFILE *oxfp, int mode);
 void oxf_determine_byteorder_client(OXFILE *oxfp);
 void oxf_determine_byteorder_server(OXFILE *oxfp);
 OXFILE *oxf_execute_cmd(OXFILE *oxfp, char *cmd);
+cmo_mathcap *oxf_cmo_mathcap(OXFILE *oxfp);
+void oxf_mathcap_update(OXFILE *oxfp, cmo_mathcap *ob);
 
 /* example: which("xterm", getenv("PATH")); */
 char *which(char *exe, const char *env);
 char *generate_otp();
 
+int ox_stderr_init(FILE *fp);
+int ox_printf(char *format, ...);
 #endif /* _OX_TOOLKIT_H_ */