===================================================================
RCS file: /home/cvs/OpenXM/src/ox_pari/ox_pari.c,v
retrieving revision 1.12
retrieving revision 1.15
diff -u -p -r1.12 -r1.15
--- OpenXM/src/ox_pari/ox_pari.c	2015/08/21 01:20:30	1.12
+++ OpenXM/src/ox_pari/ox_pari.c	2016/09/23 07:03:29	1.15
@@ -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.14 2016/08/23 03:03:26 ohara 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;
 }
@@ -151,9 +152,18 @@ int sm_executeFunction()
   struct parif *parif;
   unsigned long prec;
   char buf[BUFSIZ];
+  int status;
+  char *err;
 
-  if ( setjmp(GP_DATA->env) ) {
-    sprintf(buf,"sm_executeFunction : an error occured in PARI.");
+  if ( (status = setjmp(GP_DATA->env)) != 0 ) {
+    err = errmessage[status];
+    if ( status == errpile ) {
+      sprintf(buf,"%s\nIncrease PARI stack by pari(allocatemem,size).",err);
+      init_pari();
+    } else if ( strlen(err) != 0 )
+      sprintf(buf,"An error occured in PARI :%s",err);
+    else
+      sprintf(buf,"An error occured in PARI.");
     push((cmo*)make_error2(buf));
     return -1;
   }
@@ -206,6 +216,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);