===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/parif.c,v
retrieving revision 1.26
retrieving revision 1.29
diff -u -p -r1.26 -r1.29
--- OpenXM_contrib2/asir2000/builtin/parif.c	2015/08/18 02:26:05	1.26
+++ OpenXM_contrib2/asir2000/builtin/parif.c	2015/08/19 05:29:23	1.29
@@ -1,10 +1,11 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/builtin/parif.c,v 1.25 2015/08/17 05:18:36 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/builtin/parif.c,v 1.28 2015/08/18 05:35:17 noro Exp $ */
 #include "ca.h"
 #include "parse.h"
 #include "ox.h"
 
 Q ox_pari_stream;
 int ox_pari_stream_initialized = 0;
+int ox_get_pari_result = 0;
 
 typedef void (*mpfr_func)(NODE,Obj *);
 
@@ -48,6 +49,33 @@ mpfr_func mpfr_search(char *name)
   return 0;
 }
 
+Obj list_to_vect(Obj a)
+{
+  int len,i;
+  VECT v;
+  NODE nd;
+
+  if ( !a || OID(a) != O_LIST ) return a;
+  len = length(BDY((LIST)a));
+  MKVECT(v,len);
+  for ( i = 0, nd = BDY((LIST)a); nd; nd = NEXT(nd), i++ )
+     v->body[i] = (pointer)list_to_vect((Obj)BDY(nd));
+  return (Obj)v;
+}
+
+void reset_ox_pari()
+{
+  NODE nd;
+  Obj r;
+
+  if ( ox_get_pari_result ) {
+	nd = mknode(1,ox_pari_stream);
+	Pox_shutdown(nd,&r);
+    ox_get_pari_result = 0;
+	ox_pari_stream_initialized = 0;
+  }
+}
+
 pointer evalparif(FUNC f,NODE arg)
 {
   int ac,intarg,opt,prec;
@@ -64,10 +92,10 @@ pointer evalparif(FUNC f,NODE arg)
   }
 
   if ( !ox_pari_stream_initialized ) {
-	  MKSTR(name,"ox_pari");
-	  nd = mknode(2,NULL,name);
-	  Pox_launch(nd,&r);
-	  ox_pari_stream = r;
+	MKSTR(name,"ox_pari");
+	nd = mknode(2,NULL,name);
+	Pox_launch_nox(nd,&r);
+	ox_pari_stream = r;
     ox_pari_stream_initialized = 1;
   }
 
@@ -86,8 +114,12 @@ pointer evalparif(FUNC f,NODE arg)
   oxarg = mknode(3,ox_pari_stream,name,narg);
   Pox_execute_function(oxarg,&dmy);
   oxarg = mknode(1,ox_pari_stream);
-  Pox_pop_cmo(oxarg,&r);
-  return r;
+  ox_get_pari_result = 1;
+  Pox_pop_cmo(oxarg,&ret);
+  ox_get_pari_result = 0;
+  if ( ret && OID(ret) == O_LIST )
+    ret = list_to_vect(ret);
+  return ret;
 }
 
 struct pariftab {