===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v
retrieving revision 1.28
retrieving revision 1.32
diff -u -p -r1.28 -r1.32
--- OpenXM/src/ox_toolkit/ox_toolkit.h	2005/03/03 04:40:51	1.28
+++ OpenXM/src/ox_toolkit/ox_toolkit.h	2005/07/26 12:52:05	1.32
@@ -1,5 +1,5 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.27 2003/11/12 15:20:18 iwane Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.31 2005/07/20 17:48:03 ohara Exp $ */
 
 #ifndef _OX_TOOLKIT_H_
 
@@ -16,6 +16,9 @@ extern "C" {
 #include <ox/smCommand.h>
 #include <gc/gc.h>
 
+#define OX_PROTOCOL_VERSION     20050304
+#define OX_TOOLKIT_VERSION      "ox_toolkit version 2005.7.20"
+
 #define MALLOC(x) GC_MALLOC((x))
 #define MALLOC_ATOMIC(x) GC_MALLOC_ATOMIC((x))
 #define ALLOCA(x) alloca((x))
@@ -28,13 +31,8 @@ extern "C" {
 
 /* Mathcap Local Database */
 typedef struct {
-    int tag;
-    int flag;
-} table;
-
-typedef struct mathcap {
-    table *cmotbl;
-    table *smtbl;
+	int  *cmd;
+	int  *cmo;
 } mathcap;
 
 /* OpenXM File Descripter */
@@ -51,7 +49,7 @@ typedef struct OXFILE{
     int wbuf_size;
     int wbuf_count;
     int (*send_double)(struct OXFILE *oxfp, double int64);
-    int (*receive_double)(struct OXFILE *oxfp);
+    double (*receive_double)(struct OXFILE *oxfp);
 } OXFILE;
 
 typedef struct cmo {
@@ -180,6 +178,8 @@ 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_set(void *a[], int n);
+cmo_list*          new_cmo_list_map(void *a[], int n, void *(* mapf)(void *));
 cmo_monomial32*    new_cmo_monomial32();
 cmo_monomial32*    new_cmo_monomial32_size(int size);
 cmo_zz*            new_cmo_zz();
@@ -188,6 +188,9 @@ 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);
+cmo_qq*            new_cmo_qq_noinit();
+cmo_qq*            new_cmo_qq_set_mpq(mpq_ptr q);
+cmo_qq*            new_cmo_qq_set_mpz(mpz_ptr num, mpz_ptr den);
 cmo_zero*          new_cmo_zero();
 cmo_double*        new_cmo_double(double d);
 cmo_distributed_polynomial* new_cmo_distributed_polynomial();
@@ -208,6 +211,8 @@ 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);
@@ -246,6 +251,8 @@ cmo_list*          list_append_monomial(cmo_list* , cm
 cmo_list*          list_appendl(cmo_list*, ...);
 int                list_length(cmo_list* );
 cmo*               list_nth(cmo_list* , int n);
+void**             list_to_array(cmo_list *c);
+void**             list_to_array_map(cmo_list *c, void *(* mapf)(void *));
 
 int                cmolen_cmo(cmo* m);
 void               dump_buffer_init(char *s);
@@ -267,10 +274,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);
@@ -279,10 +282,9 @@ 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[]);
+void mathcap_init(char *version, char *sysname);
 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);