[BACK]Return to cmo.c CVS log [TXT][DIR] Up to [local] / OpenXM / src / ox_toolkit

Diff for /OpenXM/src/ox_toolkit/cmo.c between version 1.12 and 1.15

version 1.12, 2003/06/03 16:06:48 version 1.15, 2003/09/15 09:31:41
Line 1 
Line 1 
 /* -*- mode: C; coding: euc-japan -*- */  /* -*- mode: C; coding: euc-japan -*- */
 /* $OpenXM: OpenXM/src/ox_toolkit/cmo.c,v 1.11 2003/06/02 10:25:56 ohara Exp $ */  /* $OpenXM: OpenXM/src/ox_toolkit/cmo.c,v 1.14 2003/08/21 12:44:06 ohara Exp $ */
   
 /*  /*
    This module includes functions for sending/receiveng CMO's.     This module includes functions for sending/receiveng CMO's.
Line 120  void resize_mpz(mpz_ptr mpz, int size)
Line 120  void resize_mpz(mpz_ptr mpz, int size)
 /* functions named new_cmo_*. */  /* functions named new_cmo_*. */
 cmo_null* new_cmo_null()  cmo_null* new_cmo_null()
 {  {
     cmo_null* m = MALLOC(sizeof(cmo_null));      cmo_null* m = MALLOC_ATOMIC(sizeof(cmo_null));
     m->tag = CMO_NULL;      m->tag = CMO_NULL;
     return m;      return m;
 }  }
Line 128  cmo_null* new_cmo_null()
Line 128  cmo_null* new_cmo_null()
 cmo_int32* new_cmo_int32(int i)  cmo_int32* new_cmo_int32(int i)
 {  {
     cmo_int32* c;      cmo_int32* c;
     c = MALLOC(sizeof(cmo_int32));      c = MALLOC_ATOMIC(sizeof(cmo_int32));
     c->tag     = CMO_INT32;      c->tag = CMO_INT32;
     c->i = i;      c->i = i;
     return c;      return c;
 }  }
Line 139  cmo_string* new_cmo_string(char* s)
Line 139  cmo_string* new_cmo_string(char* s)
     cmo_string* c = MALLOC(sizeof(cmo_string));      cmo_string* c = MALLOC(sizeof(cmo_string));
     c->tag = CMO_STRING;      c->tag = CMO_STRING;
     if (s != NULL) {      if (s != NULL) {
         c->s = MALLOC(strlen(s)+1);          c->s = MALLOC_ATOMIC(strlen(s)+1);
         strcpy(c->s, s);          strcpy(c->s, s);
     }else {      }else {
         c->s = NULL;          c->s = NULL;
Line 227  cmo_zz* new_cmo_zz_size(int size)
Line 227  cmo_zz* new_cmo_zz_size(int size)
   
 cmo_zero* new_cmo_zero()  cmo_zero* new_cmo_zero()
 {  {
     cmo_zero* m = MALLOC(sizeof(cmo_zero));      cmo_zero* m = MALLOC_ATOMIC(sizeof(cmo_zero));
     m->tag = CMO_ZERO;      m->tag = CMO_ZERO;
     return m;      return m;
 }  }
   
 cmo_double *new_cmo_double(double d)  cmo_double *new_cmo_double(double d)
 {  {
     cmo_double* m = MALLOC(sizeof(cmo_double));      cmo_double* m = MALLOC_ATOMIC(sizeof(cmo_double));
     m->tag = CMO_64BIT_MACHINE_DOUBLE;      m->tag = CMO_64BIT_MACHINE_DOUBLE;
     m->d = d;      m->d = d;
     return m;      return m;
Line 242  cmo_double *new_cmo_double(double d)
Line 242  cmo_double *new_cmo_double(double d)
   
 cmo_dms_generic* new_cmo_dms_generic()  cmo_dms_generic* new_cmo_dms_generic()
 {  {
     cmo_dms_generic* m = MALLOC(sizeof(cmo_dms_generic));      cmo_dms_generic* m = MALLOC_ATOMIC(sizeof(cmo_dms_generic));
     m->tag = CMO_DMS_GENERIC;      m->tag = CMO_DMS_GENERIC;
     return m;      return m;
 }  }
Line 274  cmo_distributed_polynomial* new_cmo_distributed_polyno
Line 274  cmo_distributed_polynomial* new_cmo_distributed_polyno
     return c;      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_error2* new_cmo_error2(cmo* ob)  cmo_error2* new_cmo_error2(cmo* ob)
 {  {
     cmo_error2* c = MALLOC(sizeof(cmo_error2));      cmo_error2* c = MALLOC(sizeof(cmo_error2));
Line 337  static char *new_string_set_cmo_double(cmo_double *m)
Line 357  static char *new_string_set_cmo_double(cmo_double *m)
     char buff[1024];      char buff[1024];
     char *s;      char *s;
   
     sprintf(buff, "%lf", m->d);      sprintf(buff, "%.20f", m->d);
     s = MALLOC(strlen(buff)+1);      s = MALLOC_ATOMIC(strlen(buff)+1);
     strcpy(s, buff);      strcpy(s, buff);
   
     return s;      return s;
Line 358  char *new_string_set_cmo(cmo *m)
Line 378  char *new_string_set_cmo(cmo *m)
     case CMO_LIST:      case CMO_LIST:
         return new_string_set_cmo_list((cmo_list *)m);          return new_string_set_cmo_list((cmo_list *)m);
         case CMO_64BIT_MACHINE_DOUBLE:          case CMO_64BIT_MACHINE_DOUBLE:
         return new_string_set_cmo_int32(m);          return new_string_set_cmo_double((cmo_double *)m);
     default:      default:
         ox_printf("unconvertible <%s>\n", get_symbol_by_tag(m->tag));          ox_printf("unconvertible <%s>\n", get_symbol_by_tag(m->tag));
         /* yet not implemented. */          /* yet not implemented. */

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.15

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>