===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox.c,v
retrieving revision 1.27
retrieving revision 1.32
diff -u -p -r1.27 -r1.32
--- OpenXM/src/ox_toolkit/ox.c	2003/09/15 09:31:41	1.27
+++ OpenXM/src/ox_toolkit/ox.c	2005/03/03 06:38:15	1.32
@@ -1,5 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.26 2003/08/21 12:44:06 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.31 2003/11/12 15:24:06 iwane Exp $ */
 
 /* 
    This module includes functions for sending/receiveng CMO's.
@@ -35,6 +35,7 @@ static cmo_ring_by_name* receive_cmo_ring_by_name(OXFI
 static cmo_distributed_polynomial* receive_cmo_distributed_polynomial(OXFILE *oxfp);
 static cmo_recursive_polynomial* receive_cmo_recursive_polynomial(OXFILE *oxfp);
 static cmo_polynomial_in_one_variable* receive_cmo_polynomial_in_one_variable(OXFILE *oxfp);
+static cmo_double*       receive_cmo_double(OXFILE *oxfp);
 static cmo_error2*       receive_cmo_error2(OXFILE *oxfp);
 
 static int          send_cmo_null(OXFILE *oxfp, cmo_null* c);
@@ -43,6 +44,7 @@ static int          send_cmo_string(OXFILE *oxfp, cmo_
 static int          send_cmo_mathcap(OXFILE *oxfp, cmo_mathcap* c);
 static int          send_cmo_list(OXFILE *oxfp, cmo_list* c);
 static int          send_cmo_monomial32(OXFILE *oxfp, cmo_monomial32* c);
+static int          send_cmo_double(OXFILE *oxfp, cmo_double* c);
 static int          send_cmo_error2(OXFILE *oxfp, cmo_error2* c);
 static int          send_cmo_distributed_polynomial(OXFILE *oxfp, cmo_distributed_polynomial* c);
 static int send_cmo_polynomial_in_one_variable(OXFILE *oxfp, cmo_polynomial_in_one_variable* c);
@@ -116,6 +118,18 @@ int receive_int32(OXFILE *oxfp)
     return oxfp->receive_int32(oxfp);
 }
 
+/* sending an object of int32 type. (not equal to cmo_int32 type)  */
+int send_double(OXFILE *oxfp, double d)
+{
+    return oxfp->send_double(oxfp, d);
+}
+
+/* receiving an object of int32 type. (not equal to cmo_int32 type)  */
+double receive_double(OXFILE *oxfp)
+{
+    return oxfp->receive_double(oxfp);
+}
+
 /* receiving an (OX_tag, serial number)  */
 int receive_ox_tag(OXFILE *oxfp)
 {
@@ -250,6 +264,33 @@ static cmo_polynomial_in_one_variable* receive_cmo_pol
     return c;
 }
 
+static cmo_double* receive_cmo_double(OXFILE *oxfp)
+{
+	double d = receive_double(oxfp);
+	return new_cmo_double(d);
+}
+
+static cmo_indeterminate* receive_cmo_indeterminate(OXFILE *oxfp)
+{
+    cmo* ob = receive_cmo(oxfp);
+    return new_cmo_indeterminate(ob);
+}
+
+static cmo_tree* receive_cmo_tree(OXFILE *oxfp)
+{
+    cmo_string* name = (cmo_string *)receive_cmo(oxfp);
+    cmo_list* attrib = (cmo_list *)receive_cmo(oxfp);
+    cmo_list* leaves = (cmo_list *)receive_cmo(oxfp);
+    return new_cmo_tree(name, attrib, leaves);
+}
+
+static cmo_lambda* receive_cmo_lambda(OXFILE *oxfp)
+{
+    cmo_list* args = (cmo_list *)receive_cmo(oxfp);
+    cmo_tree* body = (cmo_tree *)receive_cmo(oxfp);
+    return new_cmo_lambda(args, body);
+}
+
 static cmo_error2* receive_cmo_error2(OXFILE *oxfp)
 {
     cmo* ob = receive_cmo(oxfp);
@@ -305,6 +346,20 @@ cmo *receive_cmo_tag(OXFILE *oxfp, int tag)
         break;
     case CMO_POLYNOMIAL_IN_ONE_VARIABLE:
         m = (cmo *)receive_cmo_polynomial_in_one_variable(oxfp);
+        break;
+	case CMO_64BIT_MACHINE_DOUBLE:
+	case CMO_IEEE_DOUBLE_FLOAT:
+        m = (cmo *)receive_cmo_double(oxfp);
+        break;
+    case CMO_INDETERMINATE:
+        m = (cmo *)receive_cmo_indeterminate(oxfp);
+        break;
+    case CMO_TREE:
+        m = (cmo *)receive_cmo_tree(oxfp);
+        break;
+    case CMO_LAMBDA:
+        m = (cmo *)receive_cmo_lambda(oxfp);
+        break;
     case CMO_ERROR2:
         m = (cmo *)receive_cmo_error2(oxfp);
         break;
@@ -515,6 +570,11 @@ static int send_cmo_polynomial_in_one_variable(OXFILE 
     return 0;
 }
 
+static int send_cmo_double(OXFILE *oxfp, cmo_double* c)
+{
+    return send_double(oxfp, c->d);
+}
+
 static int send_cmo_monomial32(OXFILE *oxfp, cmo_monomial32* c)
 {
     int i;
@@ -540,6 +600,21 @@ static int send_cmo_recursive_polynomial(OXFILE *oxfp,
     return 0;
 }
 
+static int send_cmo_tree(OXFILE *oxfp, cmo_tree *c)
+{
+    send_cmo(oxfp, (cmo *)c->name);
+    send_cmo(oxfp, (cmo *)c->attributes);
+    send_cmo(oxfp, (cmo *)c->leaves);
+    return 0;
+}
+
+static int send_cmo_lambda(OXFILE *oxfp, cmo_lambda *c)
+{
+    send_cmo(oxfp, (cmo *)c->args);
+    send_cmo(oxfp, (cmo *)c->body);
+    return 0;
+}
+
 static int send_cmo_error2(OXFILE *oxfp, cmo_error2* c)
 {
     send_cmo(oxfp, c->ob);
@@ -589,6 +664,16 @@ void send_cmo(OXFILE *oxfp, cmo* c)
         break;
     case CMO_POLYNOMIAL_IN_ONE_VARIABLE:
         send_cmo_polynomial_in_one_variable(oxfp, (cmo_polynomial_in_one_variable *)c);
+        break;
+	case CMO_64BIT_MACHINE_DOUBLE:
+	case CMO_IEEE_DOUBLE_FLOAT:
+		send_cmo_double(oxfp, (cmo_double *)c);
+		break;
+    case CMO_TREE:
+        send_cmo_tree(oxfp, (cmo_tree *)c);
+        break;
+    case CMO_LAMBDA:
+        send_cmo_lambda(oxfp, (cmo_lambda *)c);
         break;
     default:
         call_hook_after_send_cmo(oxfp, c);