=================================================================== RCS file: /home/cvs/OpenXM/src/ox_pari/convert.c,v retrieving revision 1.3 retrieving revision 1.7 diff -u -p -r1.3 -r1.7 --- OpenXM/src/ox_pari/convert.c 2016/06/29 12:08:51 1.3 +++ OpenXM/src/ox_pari/convert.c 2021/03/25 07:03:21 1.7 @@ -1,5 +1,21 @@ #include "ox_pari.h" +int with_gmp; + +int gmp_check() +{ + GEN z1,z2; + + // z1=[*,*,1,2], z2=[*,*,2,1] + // if gmp style => z1>z2 else z1 0 ) with_gmp = 1; + else with_gmp = 0; +} + GEN cmo_int32_to_GEN(cmo_int32 *c) { GEN z; @@ -19,6 +35,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; @@ -31,8 +58,12 @@ GEN cmo_zz_to_GEN(cmo_zz *c) len = ABSIZ(mpz); ptr = (long *)PTR(mpz); z = cgeti(len+2); - for ( j = 0; j < len; j++ ) - z[len-j+1] = ptr[j]; + if ( with_gmp ) // least signifcant first + for ( j = 0; j < len; j++ ) + z[j+2] = ptr[j]; + else // most signifcant first + for ( j = 0; j < len; j++ ) + z[len-j+1] = ptr[j]; setsigne(z,sgn); setlgefint(z,lg(z)); return z; @@ -106,7 +137,7 @@ GEN cmo_up_to_GEN(cmo_polynomial_in_one_variable *c) z = cgetg(d+3,t_POL); setsigne(z,1); setvarn(z,c->var); - setlgef(z,d+3); + setlg(z,d+3); for ( i = 2; i <= d+2; i++ ) z[i] = (long)gen_0; for ( cell = c->head->next; cell != c->head; cell = cell->next ) { @@ -142,12 +173,21 @@ 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 (cmo_zz *)c; +} + cmo_zz *GEN_to_cmo_zz(GEN z) { cmo_zz *c; c = new_cmo_zz(); - mpz_import(c->mpz,lgef(z)-2,1,sizeof(long),0,0,&z[2]); + // -1:least significant first, 1:most significant first + mpz_import(c->mpz,lg(z)-2,with_gmp?-1:1,sizeof(long),0,0,&z[2]); if ( signe(z) < 0 ) mpz_neg(c->mpz,c->mpz); return c; @@ -161,8 +201,8 @@ cmo_qq *GEN_to_cmo_qq(GEN z) num = (GEN)z[1]; 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_numref(c->mpq),lg(num)-2,1,sizeof(long),0,0,&num[2]); + mpz_import(mpq_denref(c->mpq),lg(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; @@ -266,6 +306,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 +334,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);