=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v retrieving revision 1.25 retrieving revision 1.28 diff -u -p -r1.25 -r1.28 --- OpenXM/src/ox_toolkit/ox_toolkit.h 2003/09/15 09:31:41 1.25 +++ 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.24 2003/08/21 12:44:06 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,11 +10,7 @@ extern "C" { #endif #include -#if defined(WITH_GMP) #include -#else -#include "gmp_fake.h" -#endif /* WITH_GMP */ #include #include #include @@ -54,6 +50,8 @@ typedef struct OXFILE{ 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 cmo { @@ -150,6 +148,19 @@ typedef struct { 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; @@ -185,6 +196,8 @@ 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);