===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/arith.c,v
retrieving revision 1.5
retrieving revision 1.18
diff -u -p -r1.5 -r1.18
--- OpenXM_contrib2/asir2000/parse/arith.c	2000/12/11 09:28:03	1.5
+++ 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.4 2000/11/08 08:02:52 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"
@@ -83,6 +83,14 @@ struct oAFUNC afunc[] = {
 /* O_F=14 */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
 /* O_GFMMAT=15 */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
 /* O_BYTEARRAY=16 */	{notdef,notdef,notdef,notdef,notdef,notdef,compbytearray},
+/* O_QUOTE=17 */	{addquote,subquote,mulquote,divquote,pwrquote,chsgnquote,(int(*)())notdef},
+/* O_OPTLIST=18 */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
+/* 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() {
@@ -108,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);
 }
@@ -129,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);
 }
@@ -137,17 +149,65 @@ void arf_mul(vl,a,b,r)
 VL vl;
 Obj a,b,*r;
 {
-	int mid;
+	int mid,aid,bid;
 
-	if ( !a || !b )
+	if ( !a && !b )
 		*r = 0;
-	else if ( OID(a) == OID(b) )
-		(*(afunc[OID(a)].mul))(vl,a,b,r);
-	else if ( (mid = MAX(OID(a),OID(b))) <= O_R || 
-		(mid == O_MAT) || (mid == O_VECT) || (mid == O_DP) )
+	else if ( !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)) )
+		(*(afunc[aid].mul))(vl,a,b,r);
+	else if ( (mid = MAX(aid,bid)) <= O_R )
 		(*afunc[mid].mul)(vl,a,b,r);
-	else
-		notdef(vl,a,b,r);
+	else {
+		switch ( aid ) {
+			case O_N: case O_P:
+				(*afunc[mid].mul)(vl,a,b,r);
+				break;
+			case O_R:
+				/* rat * something; bid > O_R */
+				if ( bid == O_VECT || bid == O_MAT )
+					(*afunc[mid].mul)(vl,a,b,r);
+				else 
+					notdef(vl,a,b,r);
+				break;
+			case O_MAT:
+				if ( bid <= O_R || bid == O_VECT || bid == O_DP )
+					(*afunc[O_MAT].mul)(vl,a,b,r);
+				else
+					notdef(vl,a,b,r);
+				break;
+			case O_VECT:
+				if ( bid <= O_R || bid == O_DP )
+					(*afunc[O_VECT].mul)(vl,a,b,r);
+				else if ( bid == O_MAT )
+					(*afunc[O_MAT].mul)(vl,a,b,r);
+				else
+					notdef(vl,a,b,r);
+				break;
+			case O_DP:
+				if ( bid <= O_P )
+					(*afunc[O_DP].mul)(vl,a,b,r);
+				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;
+		}
+	}
 }
 
 void arf_div(vl,a,b,r)
@@ -183,22 +243,45 @@ 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 )
-		*r = 0;
-	else if ( !e )
-		*r = (pointer)ONE;
-	else if ( (OID(e) <= O_N) && INT(e) ) {
+	if ( !a ) {
+		if ( !e )
+			*r = (pointer)ONE;
+		else if ( RATN(e) && SGN((Q)e)>0 )
+			*r = 0;
+		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 )
+			(*(afunc[O_MAT].pwr))(vl,a,e,r);
+		else	
+			*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
@@ -235,7 +318,7 @@ int complist(vl,a,b)
 VL vl;
 LIST a,b;
 {
-	int i,t;
+	int t;
 	NODE an,bn;
 
 	if ( !a )