===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/parif.c,v
retrieving revision 1.28
retrieving revision 1.34
diff -u -p -r1.28 -r1.34
--- OpenXM_contrib2/asir2000/builtin/parif.c	2015/08/18 05:35:17	1.28
+++ OpenXM_contrib2/asir2000/builtin/parif.c	2016/08/01 01:35:01	1.34
@@ -1,10 +1,12 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/builtin/parif.c,v 1.27 2015/08/18 02:31:32 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/builtin/parif.c,v 1.33 2016/04/01 03:04:35 ohara 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;
+P ox_pari_starting_function = 0;
 
 typedef void (*mpfr_func)(NODE,Obj *);
 
@@ -62,6 +64,43 @@ Obj list_to_vect(Obj a)
   return (Obj)v;
 }
 
+Obj vect_to_mat(VECT v)
+{
+  MAT m;
+  int len,col,i,j;
+
+  len = v->len;
+  if ( v->body[0] && OID((Obj)v->body[0]) == O_VECT ) {
+    col = ((VECT)v->body[0])->len;
+	for ( i = 1; i < len; i++ ) 
+	  if ( !v->body[i] || OID((Obj)v->body[i]) != O_VECT
+	   || ((VECT)v->body[i])->len != col )
+	  break;
+    if ( i == len ) {
+	  /* convert to a matrix */
+	  MKMAT(m,len,col);
+	  for ( i = 0; i < len; i++ )
+	    for ( j = 0; j < col; j++ )
+		  m->body[i][j] = ((VECT)v->body[i])->body[j];
+	  return (Obj)m;
+	}
+  }
+  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;
@@ -71,17 +110,28 @@ pointer evalparif(FUNC f,NODE arg)
   USINT ui;
   Obj ret,dmy;
   mpfr_func mpfr_function;
+  V v;
 
-  if ( mpfr_function = mpfr_search(f->name) ) {
-     (*mpfr_function)(arg,&ret);
-     return (pointer) ret;
+  if ( arg && ARG0(arg) && NID((Num)ARG0(arg)) != N_C 
+    && (mpfr_function = mpfr_search(f->name)) ) {
+    (*mpfr_function)(arg,&ret);
+    return (pointer) ret;
   }
 
   if ( !ox_pari_stream_initialized ) {
-	  MKSTR(name,"ox_pari");
-	  nd = mknode(2,NULL,name);
-	  Pox_launch_nox(nd,&r);
-	  ox_pari_stream = r;
+	if ( ox_pari_starting_function && OID(ox_pari_starting_function) == O_P ) {
+		v = VR(ox_pari_starting_function);
+		if ( (int)v->attr != V_SR ) {
+			error("pari : no handler.");
+		}
+		MKNODE(nd,0,0);
+		r = (Q)bevalf((FUNC)v->priv,0);
+	}else {
+	MKSTR(name,"ox_pari");
+	nd = mknode(2,NULL,name);
+	Pox_launch_nox(nd,&r);
+	}
+	ox_pari_stream = r;
     ox_pari_stream_initialized = 1;
   }
 
@@ -100,9 +150,19 @@ 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);
+  ox_get_pari_result = 1;
   Pox_pop_cmo(oxarg,&ret);
-  if ( ret && OID(ret) == O_LIST )
+  ox_get_pari_result = 0;
+  if ( ret && OID(ret) == O_ERR ) {
+    char buf[BUFSIZ];
+    soutput_init(buf); 
+    sprintexpr(CO,((ERR)ret)->body);
+    error(buf);
+  }
+  if ( ret && OID(ret) == O_LIST ) {
     ret = list_to_vect(ret);
+	ret = vect_to_mat((VECT)ret);
+  }
   return ret;
 }
 
@@ -114,7 +174,7 @@ struct pariftab {
 
 /*
  * type = 1 => argc = 1, second arg = precision
- * type = 2 => argc = 1, second arg = optional (long int)
+ * type = 2 => argc = 1, second arg = (long int)0
  *
  */
 /*