===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/parif.c,v
retrieving revision 1.31
retrieving revision 1.35
diff -u -p -r1.31 -r1.35
--- OpenXM_contrib2/asir2000/builtin/parif.c	2015/08/20 08:42:07	1.31
+++ OpenXM_contrib2/asir2000/builtin/parif.c	2017/03/31 04:15:34	1.35
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/builtin/parif.c,v 1.30 2015/08/19 05:53:13 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/builtin/parif.c,v 1.34 2016/08/01 01:35:01 noro Exp $ */
 #include "ca.h"
 #include "parse.h"
 #include "ox.h"
@@ -6,6 +6,7 @@
 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 *);
 
@@ -109,18 +110,33 @@ 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 ) {
+	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 {
+#if !defined(VISUAL)		
 	MKSTR(name,"ox_pari");
 	nd = mknode(2,NULL,name);
 	Pox_launch_nox(nd,&r);
+	}
 	ox_pari_stream = r;
     ox_pari_stream_initialized = 1;
+#else
+	error("Please load names.rr from latest asir-contrib library before using pari functions.");
+#endif
   }
 
 	ac = argc(arg);
@@ -162,7 +178,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
  *
  */
 /*