=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v retrieving revision 1.14 retrieving revision 1.37 diff -u -p -r1.14 -r1.37 --- OpenXM/src/ox_toolkit/ox_toolkit.h 2003/03/23 20:17:35 1.14 +++ OpenXM/src/ox_toolkit/ox_toolkit.h 2015/08/17 05:18:35 1.37 @@ -1,18 +1,28 @@ /* -*- mode: C -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.13 2003/02/03 23:13:23 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.36 2015/08/04 05:24:44 noro Exp $ */ #ifndef _OX_TOOLKIT_H_ - #define _OX_TOOLKIT_H_ + #include -#if defined(WITH_GMP) #include -#endif /* WITH_GMP */ +#include #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) + +#ifdef __cplusplus +extern "C" { +#endif + #if !defined(__GNUC__) && !defined(__inline__) #define __inline__ #endif @@ -38,9 +48,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); + double (*receive_double)(struct OXFILE *oxfp); } OXFILE; -typedef struct { +typedef struct cmo { int tag; } cmo; @@ -75,9 +90,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 { @@ -93,7 +109,6 @@ typedef struct { cmo *coef; } cmo_monomial32; -#if defined(WITH_GMP) typedef struct { int tag; mpz_t mpz; @@ -101,13 +116,16 @@ typedef struct { typedef struct { int tag; - cmo *num; /* Bunshi (cmo_zz) */ - cmo *den; /* Bunbo (cmo_zz) */ + mpq_t mpq; } cmo_qq; -#endif /* WITH_GMP */ typedef struct { int tag; + mpfr_t mpfr; +} cmo_bf; + +typedef struct { + int tag; double d; /* machine dependent */ } cmo_double; @@ -120,6 +138,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; @@ -131,7 +177,7 @@ typedef struct { typedef struct { int tag; - cmo *cmo; + struct cmo *cmo; } ox_data; cmo_null* new_cmo_null(); @@ -139,22 +185,31 @@ cmo_int32* new_cmo_int32(int i); cmo_string* new_cmo_string(char* s); cmo_mathcap* new_cmo_mathcap(cmo* ob); cmo_list* new_cmo_list(); +cmo_list* new_cmo_list_array(void *a[], int n); +cmo_list* new_cmo_list_array_map(void *a[], int n, void *(* mapf)(void *)); cmo_monomial32* new_cmo_monomial32(); cmo_monomial32* new_cmo_monomial32_size(int size); -#if defined(WITH_GMP) cmo_zz* new_cmo_zz(); cmo_zz* new_cmo_zz_size(int size); cmo_zz* new_cmo_zz_set_si(int integer); 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); -#endif /* WITH_GMP */ +cmo_qq* new_cmo_qq(); +cmo_qq* new_cmo_qq_set_mpq(mpq_ptr q); +cmo_qq* new_cmo_qq_set_mpz(mpz_ptr num, mpz_ptr den); +cmo_bf* new_cmo_bf(); +cmo_bf* new_cmo_bf_set_mpfr(mpfr_ptr q); 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); @@ -165,8 +220,11 @@ char* new_string_set_cmo(cmo* m); cmo_error2* make_error_object(int err_code, cmo* ob); +cmo* ox_parse_lisp(char *s); + /* 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); @@ -194,13 +252,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); @@ -209,10 +268,10 @@ void dump_ox_command(ox_command* m); void dump_ox_data(ox_data* m); void print_cmo(cmo* c); -#if defined(WITH_GMP) void resize_mpz(mpz_ptr mpz, int size); -#endif /* WITH_GMP */ +int cmo_to_int(cmo *n); + typedef cmo *(*hook_t)(OXFILE *, cmo *); int add_hook_before_send_cmo(hook_t func); @@ -224,10 +283,6 @@ int add_hook_after_send_cmo(hook_t func); typedef struct symbol *symbol_t; -void setflag_parse(int flag); -cmo *parse(); -void init_parser(char *s); - symbol_t lookup_by_symbol(char *key); symbol_t lookup_by_token(int tok); symbol_t lookup_by_tag(int tag); @@ -237,15 +292,15 @@ 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); @@ -268,4 +323,9 @@ char *generate_otp(); int ox_stderr_init(FILE *fp); int ox_printf(char *format, ...); + +#ifdef __cplusplus +} +#endif + #endif /* _OX_TOOLKIT_H_ */