=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/cmo.c,v retrieving revision 1.13 retrieving revision 1.17 diff -u -p -r1.13 -r1.17 --- OpenXM/src/ox_toolkit/cmo.c 2003/06/05 21:12:07 1.13 +++ OpenXM/src/ox_toolkit/cmo.c 2003/11/02 03:09:16 1.17 @@ -1,5 +1,5 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/cmo.c,v 1.12 2003/06/03 16:06:48 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/cmo.c,v 1.16 2003/09/18 12:46:08 ohara Exp $ */ /* This module includes functions for sending/receiveng CMO's. @@ -274,6 +274,45 @@ cmo_distributed_polynomial* new_cmo_distributed_polyno return c; } +cmo_polynomial_in_one_variable* new_cmo_polynomial_in_one_variable(int var) +{ + cmo_polynomial_in_one_variable* c = MALLOC(sizeof(cmo_polynomial_in_one_variable)); + c->tag = CMO_POLYNOMIAL_IN_ONE_VARIABLE; + c->length = 0; + c->head->next = c->head; + c->head->prev = c->head; + c->var = var; + return c; +} + +cmo_recursive_polynomial* new_cmo_recursive_polynomial(cmo_list* ringdef, cmo* coef) +{ + cmo_recursive_polynomial* c = MALLOC(sizeof(cmo_recursive_polynomial)); + c->tag = CMO_RECURSIVE_POLYNOMIAL; + c->ringdef = ringdef; + c->coef = coef; + return c; +} + +cmo_tree* new_cmo_tree(cmo_string* name, cmo_list* attributes, cmo_list* leaves) +{ + cmo_tree* c = MALLOC(sizeof(cmo_tree)); + c->tag = CMO_TREE; + c->name= name; + c->attributes = attributes; + c->leaves = leaves; + return c; +} + +cmo_lambda* new_cmo_lambda(cmo_list* args, cmo_tree* body) +{ + cmo_lambda* c = MALLOC(sizeof(cmo_lambda)); + c->tag = CMO_LAMBDA; + c->args = args; + c->body = body; + return c; +} + cmo_error2* new_cmo_error2(cmo* ob) { cmo_error2* c = MALLOC(sizeof(cmo_error2)); @@ -327,7 +366,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; } @@ -358,7 +398,7 @@ char *new_string_set_cmo(cmo *m) case CMO_LIST: return new_string_set_cmo_list((cmo_list *)m); case CMO_64BIT_MACHINE_DOUBLE: - return new_string_set_cmo_int32(m); + return new_string_set_cmo_double((cmo_double *)m); default: ox_printf("unconvertible <%s>\n", get_symbol_by_tag(m->tag)); /* yet not implemented. */