===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/parif.c,v
retrieving revision 1.8
retrieving revision 1.11
diff -u -p -r1.8 -r1.11
--- OpenXM_contrib2/asir2000/builtin/parif.c	2001/07/05 09:26:43	1.8
+++ OpenXM_contrib2/asir2000/builtin/parif.c	2002/07/12 08:05:23	1.11
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/parif.c,v 1.7 2000/12/22 09:58:32 saito Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/parif.c,v 1.10 2001/10/09 01:36:06 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -60,6 +60,7 @@ void patori_i(GEN,N *);
 void ritopa(Obj,GEN *);
 void ritopa_i(N,int,GEN *);
 
+void Ptodouble();
 void Peval(),Psetprec(),p_pi(),p_e(),p_mul(),p_gcd();
 void asir_cgiv(GEN);
 
@@ -70,6 +71,7 @@ void Psetprecword();
 struct ftab pari_tab[] = {
 	{"eval",Peval,-2},
 	{"setprec",Psetprec,-1},
+	{"todouble",Ptodouble,1},
 #if defined(INTERVAL) || 1
 	{"setprecword",Psetprecword,-1},
 #endif
@@ -117,10 +119,44 @@ GEN ptr;
 mkprec(p)
 int p;
 {
-	if ( p > 0 )
-		return (int)(p*PREC_CONV+3);
+	if ( p <= 0 )
+		p = 1;
+	return (int)(p*PREC_CONV+3);
 }
 
+void Ptodouble(arg,rp)
+NODE arg;
+Num *rp;
+{
+	double r,i;
+	Real real,imag;
+	Num num;
+
+	asir_assert(ARG0(arg),O_N,"todouble");
+	num = (Num)ARG0(arg);
+	if ( !num ) {
+		*rp = 0;
+		return;
+	}
+	switch ( NID(num) ) {
+		case N_R: case N_Q: case N_B:
+			r = ToReal(num);
+			MKReal(r,real);
+			*rp = (Num)real;
+			break;
+		case N_C:
+			r = ToReal(((C)num)->r);
+			i = ToReal(((C)num)->i);
+			MKReal(r,real);
+			MKReal(i,imag);
+			reimtocplx((Num)real,(Num)imag,rp);
+			break;
+		default:
+			*rp = num;
+			break;
+	}
+}
+
 void Peval(arg,rp)
 NODE arg;
 Obj *rp;
@@ -228,20 +264,39 @@ NODE arg;
 	GEN a,v;
 	long ltop,lbot;
 	pointer r;
-	int ac,opt;
+	int ac,opt,intarg,ret;
 	char buf[BUFSIZ];
+	Q q;
 	GEN (*dmy)();
 
 	if ( !f->f.binf ) {
 		sprintf(buf,"pari : %s undefined.",f->name);
 		error(buf);
+		/* NOTREACHED */
+		return 0;
 	}
 	switch ( f->type ) {
+		case 0: /* in/out : integer */
+			ac = argc(arg);
+			if ( ac > 2 ) {
+				fprintf(stderr,"argument mismatch in %s()\n",NAME(f));
+				error("");
+				/* NOTREACHED */
+				return 0;
+			}
+			intarg = !ac ? 0 : QTOS((Q)ARG0(arg));
+			dmy = (GEN (*)())f->f.binf;
+			ret = (int)(*dmy)(intarg);
+			STOQ(ret,q);
+			return (pointer)q;
+
 		case 1:
 			ac = argc(arg);
 			if ( !ac || ( ac > 2 ) ) {
 				fprintf(stderr,"argument mismatch in %s()\n",NAME(f));
 				error("");
+				/* NOTREACHED */
+				return 0;
 			}
 			ltop = avma;
 			ritopa((Obj)ARG0(arg),&a);
@@ -256,6 +311,8 @@ NODE arg;
 			if ( !ac || ( ac > 2 ) ) {
 				fprintf(stderr,"argument mismatch in %s()\n",NAME(f));
 				error("");
+				/* NOTREACHED */
+				return 0;
 			}
 			if ( ac == 1 )
 				opt = 0;
@@ -271,6 +328,8 @@ NODE arg;
 
 		default:
 			error("evalparif : not implemented yet.");
+			/* NOTREACHED */
+			return 0;
 	}
 }
 
@@ -287,6 +346,7 @@ struct pariftab {
  */
 
 struct pariftab pariftab[] = {
+{"allocatemem",(GEN(*)())allocatemoremem,0},
 {"abs",(GEN (*)())gabs,1},
 {"adj",adj,1},
 {"arg",garg,1},
@@ -410,6 +470,7 @@ struct pariftab pariftab[] = {
 {"wf",wf,1},
 {"wf2",wf2,1},
 {"zeta",gzeta,1},
+{"factor",factor,1},
 {"factorint",factorint,2},
 {0,0,0},
 };