===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v
retrieving revision 1.16
retrieving revision 1.28
diff -u -p -r1.16 -r1.28
--- OpenXM/src/ox_toolkit/ox_toolkit.h	2003/05/24 23:10:40	1.16
+++ OpenXM/src/ox_toolkit/ox_toolkit.h	2005/03/03 04:40:51	1.28
@@ -1,5 +1,5 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.15 2003/03/30 08:05:22 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.27 2003/11/12 15:20:18 iwane Exp $ */
 
 #ifndef _OX_TOOLKIT_H_
 
@@ -10,15 +10,18 @@ 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 MALLOC_ATOMIC(x) GC_MALLOC_ATOMIC((x))
+#define ALLOCA(x) alloca((x))
+/* #define FREE(x)   free((x)) */
+#define FREE(x)   
+
 #if !defined(__GNUC__) && !defined(__inline__)
 #define __inline__
 #endif
@@ -44,9 +47,14 @@ typedef struct OXFILE{
     struct OXFILE *control;  /* pointer to his control server. */
     struct mathcap *mathcap;
     int error;
+    char *wbuf;
+    int wbuf_size;
+    int wbuf_count;
+    int (*send_double)(struct OXFILE *oxfp, double int64);
+    int (*receive_double)(struct OXFILE *oxfp);
 } OXFILE;
 
-typedef struct {
+typedef struct cmo {
     int tag;
 } cmo;
 
@@ -81,9 +89,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 {
@@ -124,6 +133,34 @@ typedef struct {
     cmo *ringdef;
 } cmo_distributed_polynomial;
 
+/* The following is a derived class from cmo_list. 
+   that is, list_append can be used. */
+typedef struct {
+    int tag;
+    int length;   /* number of monomials */
+    cell head[1]; /* list of monomials */
+    int var;      /* name of the main variable */
+} cmo_polynomial_in_one_variable;
+
+typedef struct {
+    int tag;
+    cmo_list *ringdef; /* list of variables */
+    cmo *coef;  /* ZZ, QQ, int32, Poly_in_1var, Tree, Zero, DPoly */
+} cmo_recursive_polynomial;
+
+typedef struct {
+    int tag;
+    cmo_string *name;
+    cmo_list *attributes;
+    cmo_list *leaves;
+} cmo_tree;
+
+typedef struct {
+    int tag;
+    cmo_list *args;
+    cmo_tree *body;
+} cmo_lambda;
+
 typedef cmo ox;
 
 typedef ox ox_sync_ball;
@@ -135,7 +172,7 @@ typedef struct {
 
 typedef struct {
     int tag;
-    cmo *cmo;
+    struct cmo *cmo;
 } ox_data;
 
 cmo_null*          new_cmo_null();
@@ -157,6 +194,10 @@ cmo_distributed_polynomial* new_cmo_distributed_polyno
 cmo_dms_generic*   new_cmo_dms_generic();
 cmo_ring_by_name*  new_cmo_ring_by_name(cmo* ob);
 cmo_indeterminate* new_cmo_indeterminate(cmo* ob);
+cmo_polynomial_in_one_variable* new_cmo_polynomial_in_one_variable(int var);
+cmo_recursive_polynomial* new_cmo_recursive_polynomial(cmo_list* ringdef, cmo* coef);
+cmo_tree*          new_cmo_tree(cmo_string* name, cmo_list *attributes, cmo_list *leaves);
+cmo_lambda*        new_cmo_lambda(cmo_list* args, cmo_tree* body);
 cmo_error2*        new_cmo_error2(cmo* ob);
 
 ox_data*           new_ox_data(cmo* c);
@@ -169,6 +210,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);
 
@@ -200,6 +242,7 @@ cell*              list_first(cmo_list *);
 int                list_endof(cmo_list *, cell *el);
 cell*              list_next(cell *el);
 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);
@@ -245,7 +288,7 @@ int oxf_read(void *buffer, size_t size, size_t num, OX
 int oxf_write(void *buffer, size_t size, size_t num, OXFILE *oxfp);
 
 /* for OXFILE */
-int oxf_listen(short *portp);
+int oxf_listen(int *portp);
 OXFILE *oxf_connect_active(char *hostname, short port);
 OXFILE *oxf_connect_passive(int listened);
 OXFILE *oxf_open(int fd);