=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v retrieving revision 1.8 retrieving revision 1.26 diff -u -p -r1.8 -r1.26 --- OpenXM/src/ox_toolkit/ox_toolkit.h 2000/11/28 04:24:12 1.8 +++ OpenXM/src/ox_toolkit/ox_toolkit.h 2003/09/18 12:46:08 1.26 @@ -1,16 +1,31 @@ /* -*- mode: C -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.7 2000/11/27 09:57:10 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_ #define _OX_TOOLKIT_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include +#if defined(WITH_GMP) #include +#else +#include "gmp_fake.h" +#endif /* WITH_GMP */ #include #include #include +#include +#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 @@ -32,12 +47,16 @@ typedef struct OXFILE{ 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; @@ -72,9 +91,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 { @@ -101,6 +121,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,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; @@ -121,7 +174,7 @@ typedef struct { typedef struct { int tag; - cmo *cmo; + struct cmo *cmo; } ox_data; cmo_null* new_cmo_null(); @@ -138,10 +191,15 @@ 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); 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); @@ -154,6 +212,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); @@ -181,13 +240,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); @@ -217,20 +277,20 @@ 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); /* 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); @@ -250,5 +310,12 @@ 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_ */