===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/math.c,v
retrieving revision 1.4
retrieving revision 1.9
diff -u -p -r1.4 -r1.9
--- OpenXM_contrib2/asir2000/builtin/math.c	2000/12/07 07:06:41	1.4
+++ OpenXM_contrib2/asir2000/builtin/math.c	2011/08/24 07:20:09	1.9
@@ -45,14 +45,14 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/math.c,v 1.3 2000/08/22 05:03:59 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/math.c,v 1.8 2003/12/26 05:47:37 noro Exp $ 
 */
 #include "ca.h"
 #include <math.h>
 #include "parse.h"
 
 void Pdsqrt(),Pdsin(),Pdcos(),Pdtan(),Pdasin(),Pdacos(),Pdatan(),Pdlog(),Pdexp();
-void Pabs(),Pdfloor(),Pdceil(),Pdrint();
+void Pabs(),Pdfloor(),Pdceil(),Pdrint(),Pdisnan();
 
 struct ftab math_tab[] = {
 	{"dsqrt",Pdsqrt,1},
@@ -65,30 +65,87 @@ struct ftab math_tab[] = {
 	{"dasin",Pdasin,1},
 	{"dacos",Pdacos,1},
 	{"datan",Pdatan,1},
+	{"floor",Pdfloor,1},
 	{"dfloor",Pdfloor,1},
+	{"ceil",Pdceil,1},
 	{"dceil",Pdceil,1},
+	{"rint",Pdrint,1},
 	{"drint",Pdrint,1},
+	{"disnan",Pdisnan,1},
 	{0,0,0},
 };
 
+void get_ri(Num z,double *r,double *i)
+{
+	if ( !z ) {
+		*r = 0; *i = 0; return;
+	}
+	if ( OID(z) != O_N )
+		error("get_ri : invalid argument");
+	switch ( NID(z) ) {
+		case N_Q: case N_R: case N_B:
+			*r = ToReal(z); *i = 0;
+			break;
+		case N_C:
+			*r = ToReal(((C)z)->r);
+			*i = ToReal(((C)z)->i);
+			break;
+		default:
+			error("get_ri : invalid argument");
+			break;
+	}
+}
+
 void Pabs(arg,rp)
 NODE arg;
 Real *rp;
 {
-	double s;
+	double s,r,i;
 
-	s = fabs(ToReal(ARG0(arg)));
+	if ( !ARG0(arg) ) {
+		*rp = 0; return;
+	}
+	get_ri((Num)ARG0(arg),&r,&i);
+	if ( i == 0 )
+		s = fabs(r);
+	else if ( r == 0 )
+		s = fabs(i);
+	else
+		s = sqrt(r*r+i*i);
 	MKReal(s,*rp);
 }
 
 void Pdsqrt(arg,rp)
 NODE arg;
-Real *rp;
+Num *rp;
 {
-	double s;
+	double s,r,i,a;
+	C z;
+	Real real;
 
-	s = sqrt(ToReal(ARG0(arg)));
-	MKReal(s,*rp);
+	if ( !ARG0(arg) ) {
+		*rp = 0; return;
+	}
+	get_ri((Num)ARG0(arg),&r,&i);
+	if ( i == 0 )
+		if ( r > 0 ) {
+			s = sqrt(r);
+			MKReal(s,real);
+			*rp = (Num)real;
+		} else {
+			NEWC(z);
+			z->r = 0;
+			s = sqrt(-r); MKReal(s,real); z->i = (Num)real;
+			*rp = (Num)z;
+		}
+	else {
+		a = sqrt(r*r+i*i);
+		NEWC(z);
+		s = sqrt((r+a)/2); MKReal(s,real); z->r = (Num)real;
+		s = i>0?sqrt((-r+a)/2):-sqrt((-r+a)/2);
+		MKReal(s,real); z->i = (Num)real;
+		*rp = (Num)z;
+	}
 }
 
 void Pdsin(arg,rp)
@@ -198,7 +255,7 @@ Q *rp;
 		a = -a;
 	} else
 		sgn = 1;
-#if defined(i386) || defined(__alpha) || defined(VISUAL)
+#if defined(i386) || defined(__alpha) || defined(VISUAL) || defined(__x86_64)
 	au = ((unsigned int *)&a)[1];
 	al = ((unsigned int *)&a)[0];
 #else
@@ -241,7 +298,7 @@ Q *rp;
 		a = -a;
 	} else
 		sgn = 1;
-#if defined(i386) || defined(__alpha) || defined(VISUAL)
+#if defined(i386) || defined(__alpha) || defined(VISUAL) || defined(__x86_64)
 	au = ((unsigned int *)&a)[1];
 	al = ((unsigned int *)&a)[0];
 #else
@@ -288,7 +345,7 @@ Q *rp;
 		a = -a;
 	} else
 		sgn = 1;
-#if defined(i386) || defined(__alpha) || defined(VISUAL)
+#if defined(i386) || defined(__alpha) || defined(VISUAL) || defined(__x86_64)
 	au = ((unsigned int *)&a)[1];
 	al = ((unsigned int *)&a)[0];
 #else
@@ -298,8 +355,25 @@ Q *rp;
 	if ( au ) {
 		NEWQ(q); SGN(q) = sgn; NM(q)=NALLOC(2); DN(q)=0;
 		PL(NM(q))=2; BD(NM(q))[0]=al; BD(NM(q))[1] = au;
-	} else {
+	} else if ( al ) {
 		UTOQ(al,q); SGN(q) = sgn;
-	}
+	} else
+		q = 0;
 	*rp = q;
+}
+
+void Pdisnan(NODE arg,Q *rp)
+{
+	Real r;
+	double d;
+
+	r = (Real)ARG0(arg);
+	if ( !r || !NUM(r) || !REAL(r) ) {
+		*rp = 0;
+		return;
+	}
+	d = ToReal(r);
+	if ( isnan(d) ) *rp = ONE;
+	else if ( isinf(d) ) STOQ(2,*rp);
+	else *rp = 0;
 }