=================================================================== RCS file: /home/cvs/OpenXM/src/ox_pari/ox_pari.c,v retrieving revision 1.12 retrieving revision 1.14 diff -u -p -r1.12 -r1.14 --- OpenXM/src/ox_pari/ox_pari.c 2015/08/21 01:20:30 1.12 +++ OpenXM/src/ox_pari/ox_pari.c 2016/08/23 03:03:26 1.14 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/ox_pari/ox_pari.c,v 1.11 2015/08/21 00:53:53 noro Exp $ */ +/* $OpenXM: OpenXM/src/ox_pari/ox_pari.c,v 1.13 2016/08/01 01:35:01 noro Exp $ */ #include "ox_pari.h" @@ -85,7 +85,8 @@ void pops(int n) int sm_mathcap() { - mathcap_init(OX_PARI_VERSION, ID_STRING, "ox_pari", NULL, NULL); + char *opts[] = {"no_ox_reset", NULL}; + mathcap_init2(OX_PARI_VERSION, ID_STRING, "ox_pari", NULL, NULL, opts); push((cmo*)oxf_cmo_mathcap(fd_rw)); return 0; } @@ -206,6 +207,24 @@ int sm_executeFunction() } printf("input : "); output(z); m = (*parif->f)(z,prec); + ret = GEN_to_cmo(m); + avma = av0; + push(ret); + return 0; + } else if ( parif->type == 2 ) { + /* one number/poly/matrix argument with flag=0 */ + av0 = avma; + z = cmo_to_GEN(av[0]); + if ( ismatrix(z) ) { + int i,len; + len = lg(z); + for ( i = 1; i < len; i++ ) + settyp(z[i],t_COL); + settyp(z,t_MAT); + z = shallowtrans(z); + } + printf("input : "); output(z); + m = (*parif->f)(z,0); ret = GEN_to_cmo(m); avma = av0; push(ret);