===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/arith.c,v
retrieving revision 1.19
retrieving revision 1.26
diff -u -p -r1.19 -r1.26
--- OpenXM_contrib2/asir2000/parse/arith.c	2005/02/08 18:06:05	1.19
+++ OpenXM_contrib2/asir2000/parse/arith.c	2005/12/10 14:14:15	1.26
@@ -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.18 2004/12/18 16:50:10 saito Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/arith.c,v 1.25 2005/11/27 00:07:06 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -64,9 +64,13 @@ struct oARF arf[6];
 ARF addfs, subfs, mulfs, divfs, remfs, pwrfs;
 
 void divsdc();
+int compqa();
+int compquote();
+int compvoid();
 
-struct oAFUNC afunc[] = {
-/* ???=0 */	{0,0,0,0,0,0,0},
+struct oAFUNC afunc0[] = {
+/* O_VOID=-1 */ {notdef,notdef,notdef,notdef,notdef,notdef,compvoid},
+/* ???=0 */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
 /* O_N=1 */	{addnum,subnum,mulnum,divnum,pwrnum,chsgnnum,compnum},
 /* O_P=2 */	{addp,subp,mulp,divr,pwrp,chsgnp,compp},
 /* O_R=3 */	{addr,subr,mulr,divr,pwrr,chsgnr,compr},
@@ -83,16 +87,19 @@ 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},
-/* ???=23 */	{0,0,0,0,0,0,0},
+/* 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,compnbp},
 };
 
+struct oAFUNC *afunc = &afunc0[1];
+
 void arf_init() {
 	addfs = &arf[0]; addfs->name = "+"; addfs->fp = arf_add;
 	subfs = &arf[1]; subfs->name = "-"; subfs->fp = arf_sub;
@@ -102,9 +109,7 @@ void arf_init() {
 	pwrfs = &arf[5]; pwrfs->name = "^"; pwrfs->fp = arf_pwr;
 }
 
-void arf_add(vl,a,b,r)
-VL vl;
-Obj a,b,*r;
+void arf_add(VL vl,Obj a,Obj b,Obj *r)
 {
 	int mid;
 
@@ -114,7 +119,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);
@@ -122,9 +127,7 @@ Obj a,b,*r;
 		notdef(vl,a,b,r);
 }
 
-void arf_sub(vl,a,b,r)
-VL vl;
-Obj a,b,*r;
+void arf_sub(VL vl,Obj a,Obj b,Obj *r)
 {
 	int mid;
 
@@ -137,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);
@@ -145,9 +148,7 @@ Obj a,b,*r;
 		notdef(vl,a,b,r);
 }
 
-void arf_mul(vl,a,b,r)
-VL vl;
-Obj a,b,*r;
+void arf_mul(VL vl,Obj a,Obj b,Obj *r)
 {
 	int mid,aid,bid;
 
@@ -164,11 +165,11 @@ 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 ) {
-			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:
@@ -210,9 +211,7 @@ Obj a,b,*r;
 	}
 }
 
-void arf_div(vl,a,b,r)
-VL vl;
-Obj a,b,*r;
+void arf_div(VL vl,Obj a,Obj b,Obj *r)
 {
 	int mid;
 
@@ -223,15 +222,13 @@ 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);
 }
 
-void arf_remain(vl,a,b,r)
-VL vl;
-Obj a,b,*r;
+void arf_remain(VL vl,Obj a,Obj b,Obj *r)
 {
 	if ( !b )
 		error("rem : division by 0");
@@ -245,9 +242,7 @@ Obj a,b,*r;
 
 int allow_laurent;
 
-void arf_pwr(vl,a,e,r)
-VL vl;
-Obj a,e,*r;
+void arf_pwr(VL vl,Obj a,Obj e,Obj *r)
 {
 	R t;
 
@@ -258,14 +253,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);
@@ -288,8 +283,7 @@ Obj a,e,*r;
 		notdef(vl,a,e,r);
 }
 
-void arf_chsgn(a,r)
-Obj a,*r;
+void arf_chsgn(Obj a,Obj *r)
 {
 	if ( !a )
 		*r = 0;
@@ -297,9 +291,7 @@ Obj a,*r;
 		(*(afunc[OID(a)].chsgn))(a,r);
 }
 
-int arf_comp(vl,a,b)
-VL vl;
-Obj a,b;
+int arf_comp(VL vl,Obj a,Obj b)
 {
 	if ( !a )
 		if ( !b )
@@ -314,9 +306,7 @@ Obj a,b;
 		return (*afunc[OID(a)].comp)(vl,a,b);
 }
 
-int complist(vl,a,b)
-VL vl;
-LIST a,b;
+int complist(VL vl,LIST a,LIST b)
 {
 	int t;
 	NODE an,bn;
@@ -337,4 +327,16 @@ LIST a,b;
 		if ( t = arf_comp(vl,BDY(an),BDY(bn)) )
 			return t;
 	return 0;
+}
+
+int compvoid(VL vl,Obj a,Obj b)
+{
+	if ( !a )
+		if ( !b ) return 0;
+		else return -1;
+	else if ( !b )
+		return 1;
+	else if ( OID(a) > OID(b) ) return 1;
+	else if ( OID(b) < OID(a) ) return -1;
+	else return 0;
 }