=================================================================== RCS file: /home/cvs/OpenXM/src/ox_math/Attic/ox.c,v retrieving revision 1.12 retrieving revision 1.16 diff -u -p -r1.12 -r1.16 --- OpenXM/src/ox_math/Attic/ox.c 1999/11/07 12:12:55 1.12 +++ OpenXM/src/ox_math/Attic/ox.c 1999/11/28 16:43:21 1.16 @@ -1,5 +1,5 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_math/ox.c,v 1.11 1999/11/06 21:39:36 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_math/ox.c,v 1.15 1999/11/18 21:57:56 ohara Exp $ */ /* 関数の名前付け規約(その2): @@ -57,8 +57,6 @@ static int dump_string(char *s, int len); static int dump_integer(int x); static int dump_mpz(mpz_ptr mpz); -static int funcs(int cmo_type); - static int login_with_otp(int fd, char* passwd); static char *create_otp(); @@ -270,7 +268,7 @@ static cmo_distributed_polynomial* receive_cmo_distrib while (len>0) { ob = receive_cmo(fd); - append_cmo_list(c, ob); + append_cmo_list((cmo_list *)c, ob); len--; } return c; @@ -332,7 +330,7 @@ cmo* receive_cmo(int fd) case CMO_DATUM: case CMO_QQ: default: - fprintf(stderr, "unknown cmo-type: tag = (%d)\n", m->tag); + fprintf(stderr, "the CMO (%d) is not implemented.\n", m->tag); } return m; } @@ -513,14 +511,12 @@ int print_cmo(cmo* c) { int tag = c->tag; -#ifdef DEBUG symbol* symp = lookup_by_tag(tag); if (symp != NULL) { - fprintf(stderr, "local::tag = %s: ", symp->key); + fprintf(stderr, "(%s", symp->key); }else { - fprintf(stderr, "local::tag = %d: ", tag); + fprintf(stderr, "(%d", tag); } -#endif switch(tag) { case CMO_LIST: @@ -530,13 +526,18 @@ int print_cmo(cmo* c) print_cmo_int32((cmo_int32 *)c); break; case CMO_MATHCAP: + case CMO_INDETERMINATE: + case CMO_RING_BY_NAME: + case CMO_ERROR2: print_cmo_mathcap((cmo_mathcap *)c); break; case CMO_STRING: print_cmo_string((cmo_string *)c); break; case CMO_NULL: - fprintf(stderr, "\n"); + case CMO_ZERO: + case CMO_DMS_GENERIC: + fprintf(stderr, ")"); break; default: fprintf(stderr, "print_cmo() does not know how to print.\n"); @@ -545,29 +546,30 @@ int print_cmo(cmo* c) int print_cmo_int32(cmo_int32* c) { - fprintf(stderr, "cmo_int32 = (%d)\n", c->i); + fprintf(stderr, ", %d)", c->i); } int print_cmo_list(cmo_list* li) { cell* cp = li->head; - fprintf(stderr, "length = (%d)\nlist:\n", li->length); - while(cp != NULL) { + while(cp->next != NULL) { + fprintf(stderr, ", "); print_cmo(cp->cmo); cp=cp->next; } - fprintf(stderr, "end of list\n"); + fprintf(stderr, ")"); } int print_cmo_mathcap(cmo_mathcap* c) { - fprintf(stderr, "\n"); + fprintf(stderr, ", "); print_cmo(c->ob); + fprintf(stderr, ")"); } int print_cmo_string(cmo_string* c) { - fprintf(stderr, "cmo_string = (%s)\n", c->s); + fprintf(stderr, ", \"%s\")", c->s); } void ox_close(ox_file_t sv) @@ -1189,21 +1191,15 @@ ox_command* new_ox_command(int sm_code) return m; } -#define MAX_TYPES 8 -static int known_types[] = { - -1, /* gate keeper */ - CMO_NULL, - CMO_INT32, - CMO_STRING, - CMO_MATHCAP, - CMO_LIST, - CMO_ZZ, - CMO_ERROR2, -}; +ox_sync_ball* new_ox_sync_ball() +{ + ox_sync_ball *m = malloc(sizeof(ox_sync_ball)); + m->tag = OX_SYNC_BALL; + return m; +} #define ID_TEMP "(CMO_LIST, (CMO_INT32, %d), (CMO_STRING, \"%s\"), (CMO_STRING, \"%s\"), (CMO_STRING, \"%s\"))" - static cmo_list* make_list_of_id(int ver, char* ver_s, char* sysname) { cmo_list *cap; @@ -1233,58 +1229,25 @@ static cmo_list *make_list_of_tag(int type) cmo* make_mathcap_object(int version, char *id_string) { - char sysname[] = "ox_math"; + char *sysname = "ox_math"; cmo_list *li = new_cmo_list(); - cmo_list *li_ver = make_list_of_id(version, id_string, sysname); + cmo_list *li_1st = make_list_of_id(version, id_string, sysname); + cmo_list *li_2nd = make_list_of_tag(IS_SM); + cmo_list *li_3rd = new_cmo_list(); cmo_list *li_cmo = make_list_of_tag(IS_CMO); - cmo_list *li_sm = make_list_of_tag(IS_SM); - append_cmo_list(li, (cmo *)li_ver); - append_cmo_list(li, (cmo *)li_cmo); - append_cmo_list(li, (cmo *)li_sm); + cmo_list *li_ox_data = new_cmo_list(); + append_cmo_list(li_ox_data, (cmo *)new_cmo_int32(OX_DATA)); + append_cmo_list(li_ox_data, (cmo *)li_cmo); + append_cmo_list(li_3rd, (cmo *)li_ox_data); + append_cmo_list(li, (cmo *)li_1st); + append_cmo_list(li, (cmo *)li_2nd); + append_cmo_list(li, (cmo *)li_3rd); + return (cmo *)new_cmo_mathcap((cmo *)li); } -static int funcs(int cmo_type) -{ - int i; - for(i=0; impz); } +char *convert_null_to_string() +{ + static char* null_string = ""; + return null_string; +} + +char *convert_int_to_string(int integer) +{ + char buff[1024]; + char *s; + + sprintf(buff, "%d", integer); + s = malloc(strlen(buff)+1); + strcpy(s, buff); + + return s; +} + +char *convert_cmo_list_to_string(cmo_list *m) +{ + char *s; + int i; + int size = 0; + int len = length_cmo_list(m); + char **sp = malloc(len*sizeof(cmo *)); + + cell *cp = m->head; + for(i = 0; i < len; i++) { + sp[i] = convert_cmo_to_string(cp->cmo); + size += strlen(sp[i]) + 3; + cp = cp->next; + } + s = malloc(size+2); + strcpy(s, "[ "); + for(i = 0; i < len - 1; i++) { + strcat(s, sp[i]); + strcat(s, " , "); + } + strcat(s, sp[len-1]); + strcat(s, " ]"); + free(sp); + return s; +} + char *convert_cmo_to_string(cmo *m) { symbol *symp; @@ -1325,6 +1332,8 @@ char *convert_cmo_to_string(cmo *m) return ((cmo_string *)m)->s; case CMO_NULL: return convert_null_to_string(); + case CMO_LIST: + return convert_cmo_list_to_string((cmo_list *)m); default: #ifdef DEBUG symp = lookup_by_tag(m->tag); @@ -1333,22 +1342,4 @@ char *convert_cmo_to_string(cmo *m) /* まだ実装していません. */ return NULL; } -} - -char *convert_null_to_string() -{ - static char* null_string = ""; - return null_string; -} - -char *convert_int_to_string(int integer) -{ - char buff[1024]; - char *s; - - sprintf(buff, "%d", integer); - s = malloc(strlen(buff)+1); - strcpy(s, buff); - - return s; }