===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v
retrieving revision 1.22
retrieving revision 1.26
diff -u -p -r1.22 -r1.26
--- OpenXM/src/ox_toolkit/ox_toolkit.h	2003/06/03 16:06:48	1.22
+++ OpenXM/src/ox_toolkit/ox_toolkit.h	2003/09/18 12:46:08	1.26
@@ -1,5 +1,5 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.21 2003/06/02 20:38:41 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.25 2003/09/15 09:31:41 ohara Exp $ */
 
 #ifndef _OX_TOOLKIT_H_
 
@@ -21,6 +21,7 @@ extern "C" {
 #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)   
@@ -134,6 +135,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;
@@ -167,6 +196,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);
@@ -257,7 +290,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);