===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/arith.c,v
retrieving revision 1.16
retrieving revision 1.24
diff -u -p -r1.16 -r1.24
--- OpenXM_contrib2/asir2000/parse/arith.c	2004/06/27 03:15:57	1.16
+++ OpenXM_contrib2/asir2000/parse/arith.c	2005/11/25 07:18:32	1.24
@@ -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.15 2004/06/15 16:14:50 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/arith.c,v 1.23 2005/11/16 23:42:54 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -64,6 +64,8 @@ struct oARF arf[6];
 ARF addfs, subfs, mulfs, divfs, remfs, pwrfs;
 
 void divsdc();
+int compqa();
+int compquote();
 
 struct oAFUNC afunc[] = {
 /* ???=0 */	{0,0,0,0,0,0,0},
@@ -83,12 +85,15 @@ 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_QUOTE=17 */	{addquote,subquote,mulquote,divquote,pwrquote,chsgnquote,compquote},
 /* 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},
+/* O_QUOTEARG=23 */	{notdef,notdef,notdef,notdef,notdef,notdef,compqa},
+/* O_MAT=24 */	{AddMatI,SubMatI,MulMatG,notdef,notdef,ChsgnI,(int(*)())notdef},
+/* O_NBP=25 */	{addnbp,subnbp,mulnbp,notdef,pwrnbp,chsgnnbp,(int(*)())notdef},
 };
 
 void arf_init() {
@@ -112,7 +117,7 @@ Obj a,b,*r;
 		*r = a;
 	else if ( OID(a) == OID(b) )
 		(*afunc[OID(a)].add)(vl,a,b,r);
-	else if ( (mid = MAX(OID(a),OID(b))) <= O_R )
+	else if ( (mid = MAX(OID(a),OID(b))) <= O_R || mid == O_QUOTE )
 		(*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);
@@ -135,7 +140,7 @@ Obj a,b,*r;
 		*r = a;
 	else if ( OID(a) == OID(b) )
 		(*afunc[OID(a)].sub)(vl,a,b,r);
-	else if ( (mid = MAX(OID(a),OID(b))) <= O_R )
+	else if ( (mid = MAX(OID(a),OID(b))) <= O_R || mid == O_QUOTE )
 		(*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);
@@ -152,20 +157,21 @@ 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)) )
 		(*(afunc[aid].mul))(vl,a,b,r);
-	else if ( (mid = MAX(aid,bid)) <= O_R )
+	else if ( (mid = MAX(aid,bid)) <= O_R || mid == O_QUOTE )
 		(*afunc[mid].mul)(vl,a,b,r);
 	else {
 		switch ( aid ) {
-			case O_N: case O_P:
+			case O_N: case O_P: case O_NBP:
 				(*afunc[mid].mul)(vl,a,b,r);
 				break;
 			case O_R:
@@ -197,6 +203,9 @@ Obj 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;
@@ -217,7 +226,7 @@ Obj a,b,*r;
 	else if ( (OID(a) == OID(b)) )
 		(*(afunc[OID(a)].div))(vl,a,b,r);
 	else if ( (mid = MAX(OID(a),OID(b))) <= O_R || 
-		(mid == O_MAT) || (mid == O_VECT) || (mid == O_DP) )
+		(mid == O_MAT) || (mid == O_VECT) || (mid == O_DP) || mid == O_QUOTE )
 		(*afunc[mid].div)(vl,a,b,r);
 	else
 		notdef(vl,a,b,r);
@@ -237,6 +246,8 @@ 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;
@@ -250,19 +261,30 @@ Obj a,e,*r;
 			*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 ) {
+	} 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) ) {
+	} else if ( OID(a) == O_QUOTE || OID(e) == O_QUOTE )
+		(*(afunc[O_QUOTE].pwr))(vl,a,e,r);
+	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