===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v
retrieving revision 1.6
retrieving revision 1.22
diff -u -p -r1.6 -r1.22
--- OpenXM/src/ox_toolkit/ox_toolkit.h	2000/11/24 05:49:26	1.6
+++ OpenXM/src/ox_toolkit/ox_toolkit.h	2003/06/03 16:06:48	1.22
@@ -1,32 +1,61 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.5 2000/11/18 04:49:55 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.21 2003/06/02 20:38:41 ohara 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 <ox/cmotag.h>
 #include <ox/oxMessageTag.h>
 #include <ox/smCommand.h>
+#include <gc/gc.h>
 
+#define MALLOC(x) GC_MALLOC((x))
+#define ALLOCA(x) alloca((x))
+/* #define FREE(x)   free((x)) */
+#define FREE(x)   
+
 #if !defined(__GNUC__) && !defined(__inline__)
 #define __inline__
 #endif
 
-/* Open Xm File Descripter */
+/* Mathcap Local Database */
+typedef struct {
+    int tag;
+    int flag;
+} table;
+
+typedef struct mathcap {
+    table *cmotbl;
+    table *smtbl;
+} mathcap;
+
+/* 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;
+    int received_serial_number;
     struct OXFILE *control;  /* pointer to his control server. */
     struct mathcap *mathcap;
     int error;
+    char *wbuf;
+    int wbuf_size;
+    int wbuf_count;
 } OXFILE;
 
-typedef struct {
+typedef struct cmo {
     int tag;
 } cmo;
 
@@ -61,9 +90,10 @@ typedef cmo_mathcap cmo_indeterminate;
 
 /* a double linked list */
 typedef struct cell {
-    cmo *cmo;
+    struct cmo *cmo;
     struct cell *next;
     struct cell *prev;
+    int exp;
 } cell;
 
 typedef struct {
@@ -90,6 +120,11 @@ typedef struct {
     cmo *den;  /* Bunbo (cmo_zz) */
 } cmo_qq;
 
+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 {
@@ -110,7 +145,7 @@ typedef struct {
 
 typedef struct {
     int tag;
-    cmo *cmo;
+    struct cmo *cmo;
 } ox_data;
 
 cmo_null*          new_cmo_null();
@@ -127,6 +162,7 @@ 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_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);
@@ -143,6 +179,7 @@ cmo_error2*        make_error_object(int err_code, cmo
 
 /* Low level API */
 cmo*               receive_cmo(OXFILE *fp);
+cmo*               receive_cmo_tag(OXFILE *fp, int tag);
 int                receive_int32(OXFILE *fp);
 int                receive_ox_tag(OXFILE *fp);
 
@@ -170,13 +207,14 @@ void               ox_push_cmd(OXFILE *sv, int sm_code
 void               ox_cmo_rpc(OXFILE *sv, char *function, int argc, cmo *argv[]);
 int                ox_flush(OXFILE *sv);
 
-cell*              list_first(cmo_list *this);
-int                list_endof(cmo_list *this, cell *el);
+cell*              list_first(cmo_list *);
+int                list_endof(cmo_list *, cell *el);
 cell*              list_next(cell *el);
-cmo_list*          list_append(cmo_list* this, cmo *ob);
-cmo_list*          list_appendl(cmo_list* this, ...);
-int                list_length(cmo_list* this);
-cmo*               list_nth(cmo_list* this, int n);
+cmo_list*          list_append(cmo_list*, cmo *ob);
+cmo_list*          list_append_monomial(cmo_list* , cmo* coef, int exp);
+cmo_list*          list_appendl(cmo_list*, ...);
+int                list_length(cmo_list* );
+cmo*               list_nth(cmo_list* , int n);
 
 int                cmolen_cmo(cmo* m);
 void               dump_buffer_init(char *s);
@@ -206,14 +244,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 */
 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);
+cmo_mathcap* mathcap_get(mathcap *);
+mathcap *mathcap_update(mathcap *, cmo_mathcap *mc);
+int mathcap_allowQ_cmo(mathcap *, 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);
@@ -233,10 +271,18 @@ 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, ...);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _OX_TOOLKIT_H_ */