===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/R.c,v
retrieving revision 1.2
retrieving revision 1.5
diff -u -p -r1.2 -r1.5
--- OpenXM_contrib2/asir2000/engine/R.c	2000/08/21 08:31:27	1.2
+++ OpenXM_contrib2/asir2000/engine/R.c	2005/08/24 06:28:39	1.5
@@ -23,7 +23,7 @@
  * 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@flab.fujitsu.co.jp of the detailed specification
+ * 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.
  * 
@@ -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/engine/R.c,v 1.1.1.1 1999/12/03 07:39:08 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/R.c,v 1.4 2004/03/11 09:52:56 noro Exp $ 
 */
 #include "ca.h"
 
@@ -191,11 +191,14 @@ Obj a,q,*c;
 		*c = (Obj)ONE;
 	else if ( !a )
 		*c = 0;
-	else if ( !RAT(a) )
-		pwrp(vl,(P)a,(Q)q,(P *)c);
 	else if ( !NUM(q) || !RATN(q) || !INT(q) )
 		notdef(vl,a,q,c);
-	else {
+	else if ( !RAT(a) && (SGN((Q)q) > 0) ) {
+			pwrp(vl,(P)a,(Q)q,&t); *c = (Obj)t;
+	} else {
+		if ( !RAT(a) ) {
+			PTOR((P)a,r); a = (Obj)r;
+		}
 		if ( SGN((Q)q) < 0 ) {
 			chsgnq((Q)q,&q1); pwrp(vl,DN((R)a),q1,&t); pwrp(vl,NM((R)a),q1,&s);
 		} else {
@@ -240,4 +243,20 @@ Obj a,b;
 			t = compp(vl,DN((R)a),DN((R)b));
 		return t;
 	}
+}
+
+int equalr(vl,a,b)
+VL vl;
+Obj a,b;
+{
+	if ( !a )
+		return b ? 0 : 1;
+	else if ( !b )
+		return 0;
+	else if ( !RAT(a) )
+		return !RAT(b) ? equalp(vl,(P)a,(P)b) : 0;
+	else if ( !RAT(b) )
+		return 0;
+	else
+		return equalp(vl,NM((R)a),NM((R)b)) && equalp(vl,DN((R)a),DN((R)b));
 }