===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/arith.c,v
retrieving revision 1.20
retrieving revision 1.23
diff -u -p -r1.20 -r1.23
--- OpenXM_contrib2/asir2000/parse/arith.c	2005/04/07 08:33:12	1.20
+++ OpenXM_contrib2/asir2000/parse/arith.c	2005/11/16 23:42:54	1.23
@@ -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.19 2005/02/08 18:06:05 saito Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/arith.c,v 1.22 2005/10/03 00:29:11 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -93,6 +93,7 @@ struct oAFUNC afunc[] = {
 /* 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() {
@@ -116,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);
@@ -139,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);
@@ -166,7 +167,7 @@ Obj a,b,*r;
 			*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 ) {
@@ -225,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);
@@ -260,14 +261,14 @@ 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) ) {
 			if ( allow_laurent )
 				(*(afunc[O_P].pwr))(vl,a,e,r);