===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/cplx.c,v
retrieving revision 1.1
retrieving revision 1.6
diff -u -p -r1.1 -r1.6
--- OpenXM_contrib2/asir2000/engine/cplx.c	1999/12/03 07:39:08	1.1
+++ OpenXM_contrib2/asir2000/engine/cplx.c	2009/03/27 14:42:29	1.6
@@ -1,12 +1,56 @@
-/* $OpenXM: OpenXM/src/asir99/engine/cplx.c,v 1.1.1.1 1999/11/10 08:12:26 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+ * non-exclusive and royalty-free license to use, copy, modify and
+ * redistribute, solely for non-commercial and non-profit purposes, the
+ * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+ * conditions of this Agreement. For the avoidance of doubt, you acquire
+ * only a limited right to use the SOFTWARE hereunder, and FLL or any
+ * third party developer retains all rights, including but not limited to
+ * copyrights, in and to the SOFTWARE.
+ * 
+ * (1) FLL does not grant you a license in any way for commercial
+ * purposes. You may use the SOFTWARE only for non-commercial and
+ * non-profit purposes only, such as academic, research and internal
+ * business use.
+ * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+ * international copyright treaties. If you make copies of the SOFTWARE,
+ * with or without modification, as permitted hereunder, you shall affix
+ * to all such copies of the SOFTWARE the above copyright notice.
+ * (3) An explicit reference to this SOFTWARE and its copyright owner
+ * shall be made on your publication or presentation in any form of the
+ * results obtained by use of the SOFTWARE.
+ * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
+ * for such modification or the source code of the modified part of the
+ * SOFTWARE.
+ * 
+ * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+ * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+ * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+ * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+ * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+ * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+ * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+ * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+ * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+ * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+ * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
+ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
+ * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
+ *
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/cplx.c,v 1.5 2003/02/14 22:29:08 ohara Exp $ 
+*/
 #include "ca.h"
 #include "base.h"
-#if PARI
+#if defined(PARI)
 #include "genpari.h"
-void patori(GEN,Obj *);
-void patori_i(GEN,N *);
-void ritopa(Obj,GEN *);
-void ritopa_i(N,int,GEN *);
 #endif
 
 void toreim(a,rp,ip)
@@ -15,7 +59,11 @@ Num *rp,*ip;
 {
 	if ( !a )
 		*rp = *ip = 0;
+#if defined(INTERVAL)
+	else if ( NID(a) <= N_PRE_C ) {
+#else
 	else if ( NID(a) <= N_B ) {
+#endif
 		*rp = a; *ip = 0;
 	} else {
 		*rp = ((C)a)->r; *ip = ((C)a)->i;
@@ -45,7 +93,11 @@ Num *c;
 		*c = b;
 	else if ( !b )
 		*c = a;
+#if defined(INTERVAL)
+	else if ( (NID(a) <= N_PRE_C) && (NID(b) <= N_PRE_C ) )
+#else
 	else if ( (NID(a) <= N_B) && (NID(b) <= N_B ) )
+#endif
 		addnum(0,a,b,c);
 	else {
 		toreim(a,&ar,&ai); toreim(b,&br,&bi);
@@ -64,7 +116,11 @@ Num *c;
 		chsgnnum(b,c);
 	else if ( !b )
 		*c = a;
+#if defined(INTERVAL)
+	else if ( (NID(a) <= N_PRE_C) && (NID(b) <= N_PRE_C ) )
+#else
 	else if ( (NID(a) <= N_B) && (NID(b) <= N_B ) )
+#endif
 		subnum(0,a,b,c);
 	else {
 		toreim(a,&ar,&ai); toreim(b,&br,&bi);
@@ -81,7 +137,11 @@ Num *c;
 
 	if ( !a || !b )
 		*c = 0;
+#if defined(INTERVAL)
+	else if ( (NID(a) <= N_PRE_C) && (NID(b) <= N_PRE_C ) )
+#else
 	else if ( (NID(a) <= N_B) && (NID(b) <= N_B ) )
+#endif
 		mulnum(0,a,b,c);
 	else {
 		toreim(a,&ar,&ai); toreim(b,&br,&bi);
@@ -101,7 +161,11 @@ Num *c;
 		error("divcplx : division by 0");
 	else if ( !a )
 		*c = 0;
+#if defined(INTERVAL)
+	else if ( (NID(a) <= N_PRE_C) && (NID(b) <= N_PRE_C ) )
+#else
 	else if ( (NID(a) <= N_B) && (NID(b) <= N_B ) )
+#endif
 		divnum(0,a,b,c);
 	else {
 		toreim(a,&ar,&ai); toreim(b,&br,&bi);
@@ -120,20 +184,14 @@ Num *c;
 {
 	int ei;
 	Num t;
-	extern long prec;
 
 	if ( !e )
 		*c = (Num)ONE;
 	else if ( !a )
 		*c = 0;
 	else if ( !INT(e) ) {
-#if PARI
-		GEN pa,pe,z;
-		int ltop,lbot;
-
-		ltop = avma; ritopa((Obj)a,&pa); ritopa((Obj)e,&pe); lbot = avma;
-		z = gerepile(ltop,lbot,gpui(pa,pe,prec));
-		patori(z,(Obj *)c); cgiv(z);
+#if defined(PARI)
+		gpui_ri((Obj)a,(Obj)c,(Obj *)c);
 #else
 		error("pwrcplx : can't calculate a fractional power");
 #endif
@@ -173,7 +231,11 @@ Num a,*c;
 
 	if ( !a )
 		*c = 0;
+#if defined(INTERVAL)
+	else if ( NID(a) <= N_PRE_C )
+#else
 	else if ( NID(a) <= N_B )
+#endif
 		chsgnnum(a,c);
 	else {
 		chsgnnum(((C)a)->r,&r); chsgnnum(((C)a)->i,&i);
@@ -188,12 +250,20 @@ Num a,b;
 	int s;
 
 	if ( !a ) {
+#if defined(INTERVAL)
+		if ( !b || (NID(b)<=N_PRE_C) )
+#else
 		if ( !b || (NID(b)<=N_B) )
+#endif
 			return compnum(0,a,b);
 		else
 			return -1;
 	} else if ( !b ) {
+#if defined(INTERVAL)
+		if ( !a || (NID(a)<=N_PRE_C) )
+#else
 		if ( !a || (NID(a)<=N_B) )
+#endif
 			return compnum(0,a,b);
 		else
 			return 1;