=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/cmo.c,v retrieving revision 1.16 retrieving revision 1.22 diff -u -p -r1.16 -r1.22 --- OpenXM/src/ox_toolkit/cmo.c 2003/09/18 12:46:08 1.16 +++ OpenXM/src/ox_toolkit/cmo.c 2007/03/14 10:30:54 1.22 @@ -1,5 +1,5 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/cmo.c,v 1.15 2003/09/15 09:31:41 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/cmo.c,v 1.21 2005/10/12 04:03:37 takayama Exp $ */ /* This module includes functions for sending/receiveng CMO's. @@ -165,6 +165,26 @@ cmo_list* new_cmo_list() return c; } +cmo_list* new_cmo_list_array(void *array[], int n) +{ + int i; + cmo_list* c = new_cmo_list(); + for(i=0; itag = CMO_QQ; + mpq_init(c->mpq); + return c; +} + +cmo_qq* new_cmo_qq_set_mpq(mpq_ptr q) +{ + cmo_qq* c = new_cmo_qq(); + mpq_set(c->mpq, q); + return c; +} + +cmo_qq* new_cmo_qq_set_mpz(mpz_ptr num, mpz_ptr den) +{ + cmo_qq* c = new_cmo_qq(); + mpq_set_num(c->mpq, num); + mpq_set_den(c->mpq, den); + return c; +} + cmo_zero* new_cmo_zero() { cmo_zero* m = MALLOC_ATOMIC(sizeof(cmo_zero)); @@ -235,7 +278,7 @@ cmo_zero* new_cmo_zero() cmo_double *new_cmo_double(double d) { cmo_double* m = MALLOC_ATOMIC(sizeof(cmo_double)); - m->tag = CMO_64BIT_MACHINE_DOUBLE; + m->tag = CMO_IEEE_DOUBLE_FLOAT; m->d = d; return m; } @@ -366,7 +409,8 @@ static char *new_string_set_cmo_list(cmo_list *m) strcat(s, sp[i]); strcat(s, " , "); } - strcat(s, sp[len-1]); + if (len > 0) + strcat(s, sp[len-1]); strcat(s, " ]"); return s; } @@ -396,7 +440,8 @@ char *new_string_set_cmo(cmo *m) return new_string_set_cmo_null(); case CMO_LIST: return new_string_set_cmo_list((cmo_list *)m); - case CMO_64BIT_MACHINE_DOUBLE: + case CMO_64BIT_MACHINE_DOUBLE: + case CMO_IEEE_DOUBLE_FLOAT: return new_string_set_cmo_double((cmo_double *)m); default: ox_printf("unconvertible <%s>\n", get_symbol_by_tag(m->tag));