===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v
retrieving revision 1.25
retrieving revision 1.31
diff -u -p -r1.25 -r1.31
--- OpenXM/src/ox_toolkit/ox_toolkit.h	2003/09/15 09:31:41	1.25
+++ OpenXM/src/ox_toolkit/ox_toolkit.h	2005/07/20 17:48:03	1.31
@@ -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.30 2005/03/03 07:25:17 ohara Exp $ */
 
 #ifndef _OX_TOOLKIT_H_
 
@@ -10,11 +10,7 @@ extern "C" {
 #endif
 
 #include <stdio.h>
-#if defined(WITH_GMP)
 #include <gmp.h>
-#else
-#include "gmp_fake.h"
-#endif /* WITH_GMP */
 #include <ox/cmotag.h>
 #include <ox/oxMessageTag.h>
 #include <ox/smCommand.h>
@@ -54,6 +50,8 @@ typedef struct OXFILE{
     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 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;
@@ -169,6 +180,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_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);
 cmo_zz*            new_cmo_zz();
@@ -177,6 +190,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();
@@ -185,6 +201,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);
@@ -195,6 +213,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);
@@ -253,10 +273,6 @@ int add_hook_after_send_cmo(hook_t func);
 #define PFLAG_ADDREV   1
 
 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);