=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v retrieving revision 1.7 retrieving revision 1.13 diff -u -p -r1.7 -r1.13 --- OpenXM/src/ox_toolkit/ox_toolkit.h 2000/11/27 09:57:10 1.7 +++ OpenXM/src/ox_toolkit/ox_toolkit.h 2003/02/03 23:13:23 1.13 @@ -1,5 +1,5 @@ /* -*- mode: C -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.6 2000/11/24 05:49:26 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.12 2003/01/17 06:49:53 ohara Exp $ */ #ifndef _OX_TOOLKIT_H_ @@ -32,6 +32,7 @@ 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; @@ -101,6 +102,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 { @@ -138,6 +144,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); @@ -217,7 +224,7 @@ 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(); @@ -244,10 +251,13 @@ 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, ...); #endif /* _OX_TOOLKIT_H_ */