=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/cmo.c,v retrieving revision 1.2 retrieving revision 1.7 diff -u -p -r1.2 -r1.7 --- OpenXM/src/ox_toolkit/cmo.c 2000/10/12 15:50:10 1.2 +++ OpenXM/src/ox_toolkit/cmo.c 2003/01/17 07:40:10 1.7 @@ -1,5 +1,5 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/cmo.c,v 1.1 2000/10/10 05:23:20 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/cmo.c,v 1.6 2003/01/17 06:49:53 ohara Exp $ */ /* This module includes functions for sending/receiveng CMO's. @@ -19,6 +19,7 @@ static char* new_string_set_cmo_null(); static char* new_string_set_cmo_int32(int integer); static char* new_string_set_cmo_list(cmo_list *c); static char* new_string_set_cmo_zz(cmo_zz *c); +static char* new_string_set_cmo_double(cmo_double *m); /* functions for a cmo_list */ static cell* new_cell(cmo *ob) @@ -73,6 +74,9 @@ cmo_list *list_appendl(cmo_list* this, ...) cmo *ob; va_list ap; va_start(ap, this); + if (this == NULL) { + this = new_cmo_list(); + } while((ob = va_arg(ap, cmo *)) != NULL) { list_append(this, ob); } @@ -220,6 +224,14 @@ cmo_zero* new_cmo_zero() return m; } +cmo_double *new_cmo_double(double d) +{ + cmo_double* m = malloc(sizeof(cmo_double)); + m->tag = CMO_64BIT_MACHINE_DOUBLE; + m->d = d; + return m; +} + cmo_dms_generic* new_cmo_dms_generic() { cmo_dms_generic* m = malloc(sizeof(cmo_dms_generic)); @@ -313,6 +325,18 @@ static char *new_string_set_cmo_list(cmo_list *m) return s; } +static char *new_string_set_cmo_double(cmo_double *m) +{ + char buff[1024]; + char *s; + + sprintf(buff, "%lf", m->d); + s = malloc(strlen(buff)+1); + strcpy(s, buff); + + return s; +} + char *new_string_set_cmo(cmo *m) { symbol_t symp; @@ -327,13 +351,14 @@ 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: + return new_string_set_cmo_int32(m); default: #ifdef DEBUG symp = lookup_by_tag(m->tag); - fprintf(stderr, "I do not know how to convert %s to a string.\n", symp->key); + ox_printf("I do not know how to convert %s to a string.\n", symp->key); #endif /* yet not implemented. */ return NULL; } } -