===================================================================
RCS file: /home/cvs/OpenXM/src/ox_pari/convert.c,v
retrieving revision 1.2
retrieving revision 1.5
diff -u -p -r1.2 -r1.5
--- OpenXM/src/ox_pari/convert.c	2015/08/21 01:53:08	1.2
+++ OpenXM/src/ox_pari/convert.c	2018/03/29 02:14:30	1.5
@@ -19,6 +19,17 @@ GEN cmo_int32_to_GEN(cmo_int32 *c)
   return z;
 }
 
+GEN cmo_string_to_GEN(cmo_string *c)
+{
+  GEN z;
+  int l;
+
+  l = strlen(c->s);
+  z = cgetg(l+1,t_STR);
+  strcpy(GSTR(z),c->s);
+  return z;
+}
+
 GEN cmo_zz_to_GEN(cmo_zz *c)
 {
   mpz_ptr mpz;
@@ -142,6 +153,14 @@ GEN cmo_rp_to_GEN(cmo_recursive_polynomial *c)
   }
 }
 
+cmo_zz *GEN_to_cmo_string(GEN z)
+{
+  cmo_string *c;
+
+  c = new_cmo_string(GSTR(z));
+  return c;
+}
+
 cmo_zz *GEN_to_cmo_zz(GEN z)
 {
   cmo_zz *c;
@@ -162,7 +181,7 @@ cmo_qq *GEN_to_cmo_qq(GEN z)
   den = (GEN)z[2];
   c = new_cmo_qq();
   mpz_import(mpq_numref(c->mpq),lgef(num)-2,1,sizeof(long),0,0,&num[2]);
-  mpz_import(mpq_denref(c->mpq),lgef(num)-2,1,sizeof(long),0,0,&den[2]);
+  mpz_import(mpq_denref(c->mpq),lgef(den)-2,1,sizeof(long),0,0,&den[2]);
   if ( signe(num)*signe(den) < 0 )
     mpz_neg(mpq_numref(c->mpq),mpq_numref(c->mpq));
   return c;
@@ -258,7 +277,7 @@ GEN cmo_to_GEN(cmo *c)
     return cmo_complex_to_GEN((cmo_complex *)c);
   case CMO_IEEE_DOUBLE_FLOAT:
      return dbltor(((cmo_double *)c)->d);
-  case CMO_BIGFLOAT: /* bigfloat */
+  case CMO_BIGFLOAT32: /* bigfloat */
     return cmo_bf_to_GEN((cmo_bf *)c);
   case CMO_LIST:
     return cmo_list_to_GEN((cmo_list *)c);
@@ -266,6 +285,8 @@ GEN cmo_to_GEN(cmo *c)
     return cmo_rp_to_GEN((cmo_recursive_polynomial *)c);
   case CMO_POLYNOMIAL_IN_ONE_VARIABLE:
     return cmo_up_to_GEN((cmo_polynomial_in_one_variable *)c);
+  case CMO_STRING:
+    return cmo_string_to_GEN((cmo_string *)c);
   default:
     return 0;
   }
@@ -292,6 +313,8 @@ cmo *GEN_to_cmo(GEN z)
     return (cmo *)GEN_to_cmo_list(z);
   case t_MAT: /* matrix */
     return (cmo *)GEN_to_cmo_list(shallowtrans(z));
+  case t_STR: /* string */
+    return (cmo *)GEN_to_cmo_string(z);
   default:
     sprintf(buf,"GEN_to_cmo : unsupported type=%d",(int)typ(z));
     return (cmo *)make_error2(buf);