===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/arith.c,v
retrieving revision 1.12
retrieving revision 1.18
diff -u -p -r1.12 -r1.18
--- OpenXM_contrib2/asir2000/parse/arith.c	2004/03/03 09:25:30	1.12
+++ OpenXM_contrib2/asir2000/parse/arith.c	2004/12/18 16:50:10	1.18
@@ -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/parse/arith.c,v 1.11 2004/02/04 07:42:07 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/arith.c,v 1.17 2004/08/18 00:17:02 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -88,6 +88,9 @@ struct oAFUNC afunc[] = {
 /* O_SYMBOL=19 */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
 /* O_RANGE=20 */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
 /* O_TB=21 */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
+/* O_DPV=22 */	{adddv,subdv,muldv,notdef,notdef,chsgndv,compdv},
+/* ???=23 */	{0,0,0,0,0,0,0},
+/* O_MAT=24 */	{AddMatI,SubMatI,MulMatG,notdef,notdef,ChsgnI,notdef},
 };
 
 void arf_init() {
@@ -113,6 +116,8 @@ Obj a,b,*r;
 		(*afunc[OID(a)].add)(vl,a,b,r);
 	else if ( (mid = MAX(OID(a),OID(b))) <= O_R )
 		(*afunc[mid].add)(vl,a,b,r);
+	else if ( (mid = MAX(OID(a),OID(b))) == O_DP && MIN(OID(a),OID(b)) <= O_R )
+		(*afunc[mid].add)(vl,a,b,r);
 	else
 		notdef(vl,a,b,r);
 }
@@ -134,6 +139,8 @@ Obj a,b,*r;
 		(*afunc[OID(a)].sub)(vl,a,b,r);
 	else if ( (mid = MAX(OID(a),OID(b))) <= O_R )
 		(*afunc[mid].sub)(vl,a,b,r);
+	else if ( (mid = MAX(OID(a),OID(b))) == O_DP && MIN(OID(a),OID(b)) <= O_R )
+		(*afunc[mid].sub)(vl,a,b,r);
 	else
 		notdef(vl,a,b,r);
 }
@@ -147,11 +154,12 @@ Obj a,b,*r;
 	if ( !a && !b )
 		*r = 0;
 	else if ( !a || !b ) {
-		if ( !a )
-			a = b;
+		if ( !a ) a = b;
 		/* compute a*0 */
 		if ( OID(a) == O_MAT || OID(a) == O_VECT )
 			(*(afunc[O_MAT].mul))(vl,a,0,r);
+		else if ( OID(a) == O_IMAT )
+			(*(afunc[O_IMAT].mul))(vl,0,a,r);
 		else
 			*r = 0;
 	} else if ( (aid = OID(a)) == (bid = OID(b)) )
@@ -187,11 +195,14 @@ Obj a,b,*r;
 			case O_DP:
 				if ( bid <= O_P )
 					(*afunc[O_DP].mul)(vl,a,b,r);
-				else if ( bid == O_MAT || bid == O_VECT )
+				else if ( bid == O_MAT || bid == O_VECT || bid == O_DPV )
 					(*afunc[bid].mul)(vl,a,b,r);
 				else
 					notdef(vl,a,b,r);
 				break;
+			case O_IMAT:
+				(*afunc[O_IMAT].mul)(vl,a,b,r);
+				break;
 			default:
 					notdef(vl,a,b,r);
 				break;
@@ -232,18 +243,22 @@ Obj a,b,*r;
 		notdef(vl,a,b,r);
 }
 
+int allow_laurent;
+
 void arf_pwr(vl,a,e,r)
 VL vl;
 Obj a,e,*r;
 {
 	R t;
 
-	if ( !a )
+	if ( !a ) {
 		if ( !e )
 			*r = (pointer)ONE;
-		else
+		else if ( RATN(e) && SGN((Q)e)>0 )
 			*r = 0;
-	else if ( OID(a) == O_QUOTE )
+		else
+			mkpow(vl,a,e,r);
+	} else if ( OID(a) == O_QUOTE )
 		(*(afunc[O_QUOTE].pwr))(vl,a,e,r);
 	else if ( !e ) {
 		if ( OID(a) == O_MAT )
@@ -252,10 +267,21 @@ Obj a,e,*r;
 			*r = (pointer)ONE;
 	} else if ( (OID(e) <= O_N) && INT(e) ) {
 		if ( (OID(a) == O_P) && (SGN((Q)e) < 0) ) {
-			MKRAT((P)a,(P)ONE,1,t);
-			(*(afunc[O_R].pwr))(vl,t,e,r);
+			if ( allow_laurent )
+				(*(afunc[O_P].pwr))(vl,a,e,r);
+			else {
+				MKRAT((P)a,(P)ONE,1,t);
+				(*(afunc[O_R].pwr))(vl,t,e,r);
+			}
 		} else
 			(*(afunc[OID(a)].pwr))(vl,a,e,r);
+	} else if ( (OID(e) <= O_N) && RATN(e) ) {
+		if ( (OID(a) == O_P) && allow_laurent )
+			(*(afunc[O_P].pwr))(vl,a,e,r);
+		else if ( OID(a) <= O_R )
+			mkpow(vl,a,e,r);
+		else
+			notdef(vl,a,e,r);
 	} else if ( OID(a) <= O_R )
 		mkpow(vl,a,e,r);
 	else