===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v
retrieving revision 1.76
retrieving revision 1.85
diff -u -p -r1.76 -r1.85
--- OpenXM_contrib2/asir2000/builtin/strobj.c	2005/10/15 02:34:13	1.76
+++ OpenXM_contrib2/asir2000/builtin/strobj.c	2005/10/26 11:07:50	1.85
@@ -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/builtin/strobj.c,v 1.75 2005/10/15 01:10:15 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.84 2005/10/26 10:47:00 noro Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -64,6 +64,7 @@ struct TeXSymbol {
 };
 
 #define OPNAME(f) (((ARF)FA0(f))->name[0])
+#define IS_ZERO(f) (((f)->id==I_FORMULA) && FA0(f)==0 )
 #define IS_BINARYPWR(f) (((f)->id==I_BOP) &&(OPNAME(f)=='^'))
 #define IS_NARYADD(f) (((f)->id==I_NARYOP) &&(OPNAME(f)=='+'))
 #define IS_NARYMUL(f) (((f)->id==I_NARYOP) &&(OPNAME(f)=='*'))
@@ -86,6 +87,7 @@ void Pflatten_quote();
 void Pquote_is_integer(),Pquote_is_rational(),Pquote_is_number();
 void Pquote_is_dependent(),Pquote_is_function();
 void Pquote_normalize();
+void Pquote_normalize_comp();
 
 void Pquote_to_funargs(),Pfunargs_to_quote(),Pget_function_name();
 void Pquote_unify(),Pget_quote_id(),Pquote_match_rewrite();
@@ -125,6 +127,7 @@ struct ftab str_tab[] = {
 	{"quote_is_dependent",Pquote_is_dependent,2},
 
 	{"quote_normalize",Pquote_normalize,-2},
+	{"quote_normalize_comp",Pquote_normalize_comp,2,0x3},
 
 	{"quote_to_nary",Pquote_to_nary,1},
 	{"quote_to_bin",Pquote_to_bin,2},
@@ -662,20 +665,20 @@ void Pquote_match_rewrite(NODE arg,Obj *rp)
 			NEXTNODE(s0,s);
 			pair = BDY((LIST)BDY(t));
 			ind = (int)FA0((FNODE)BDY((QUOTE)BDY(pair)));
-			value = mkfnode(1,I_FORMULA,BDY(NEXT(pair)));
+			value = BDY((QUOTE)(BDY(NEXT(pair))));
 			BDY(s) = mknode(2,ind,value);
 		}
 		if ( s0 ) NEXT(s) = 0;
 		switch ( ac = argc(arg) ) {
 			case 3:
 				h = rewrite_fnode(BDY((QUOTE)ARG2(arg)),s0);
-				*rp = eval(h);
+				MKQUOTE(q,h); *rp = (Obj)q;
 				break;
 			case 4:
 				c = rewrite_fnode(BDY((QUOTE)ARG2(arg)),s0);
 				if ( eval(c) ) {
 					h = rewrite_fnode(BDY((QUOTE)ARG3(arg)),s0);
-					*rp = eval(h);
+					MKQUOTE(q,h); *rp = (Obj)q;
 				} else
 					*rp = VOIDobj;
 				break;
@@ -1946,6 +1949,19 @@ void Pquote_normalize(NODE arg,QUOTE *rp)
 	}
 }
 
+void Pquote_normalize_comp(NODE arg,Q *rp)
+{
+	FNODE f1,f2;
+	int r;
+
+	f1 = BDY((QUOTE)ARG0(arg));
+	f2 = BDY((QUOTE)ARG1(arg));
+	f1 = fnode_normalize(f1,0);
+	f2 = fnode_normalize(f2,0);
+	r = fnode_normalize_comp(f1,f2);
+	STOQ(r,*rp);
+}
+
 int fnode_is_number(FNODE f)
 {
 	Obj obj;
@@ -2031,15 +2047,6 @@ int fnode_is_integer(FNODE f)
 	}
 }
 
-int fnode_is_zero(FNODE f)
-{
-	Q n;
-
-	n = eval(f);
-	if ( !n ) return 1;
-	else return 0;
-}
-
 int fnode_is_nonnegative_integer(FNODE f)
 {
 	Q n;
@@ -2190,7 +2197,7 @@ FNODE fnode_apply(FNODE f,FNODE (*func)(),int expand)
 	for ( i = 0; i < n; i++ ) {
 		switch ( spec->type[i] ) {
 			case A_fnode:
-				r->arg[i] = func(f->arg[i]);
+				r->arg[i] = func(f->arg[i],expand);
 				break;
 			case A_node:
 				s = (NODE)f->arg[i];
@@ -2216,14 +2223,14 @@ FNODE fnode_normalize_add(FNODE f1,FNODE f2,int expand
 	int s;
 	Num c1,c2,c;
 
-	if ( fnode_is_zero(f1) ) return f2;
-	else if ( fnode_is_zero(f2) ) return f1;
+	if ( IS_ZERO(f1) ) return f2;
+	else if ( IS_ZERO(f2) ) return f1;
 	f1 = to_naryadd(f1); f2 = to_naryadd(f2);
 	n1 = (NODE)FA1(f1); n2 = (NODE)FA1(f2);
 	r0 = 0;
 	while ( n1 && n2 ) {
 		fnode_coef_body(BDY(n1),&c1,&b1); fnode_coef_body(BDY(n2),&c2,&b2);
-		if ( (s = compfnode(b1,b2)) > 0 ) {
+		if ( (s = fnode_normalize_comp(b1,b2)) > 0 ) {
 			NEXTNODE(r0,r); BDY(r) = BDY(n1); n1 = NEXT(n1);
 		} else if ( s < 0 ) {
 			NEXTNODE(r0,r); BDY(r) = BDY(n2); n2 = NEXT(n2);
@@ -2270,7 +2277,7 @@ FNODE fnode_normalize_mul(FNODE f1,FNODE f2,int expand
 	Num c1,c2,c,e;
 	int l1,l,i,j;
 
-	if ( fnode_is_zero(f1) || fnode_is_zero(f2) ) return 0;
+	if ( IS_ZERO(f1) || IS_ZERO(f2) ) return mkfnode(1,I_FORMULA,0);
 	else if ( fnode_is_number(f1) ) 
 		return fnode_normalize_mul_coef((Num)eval(f1),f2,expand);
 	else if ( fnode_is_number(f2) ) 
@@ -2332,8 +2339,8 @@ FNODE fnode_normalize_pwr(FNODE f1,FNODE f2,int expand
 	NODE arg,n;
 	Q q;
 
-	if ( fnode_is_zero(f2) ) return mkfnode(1,I_FORMULA,ONE);
-	else if ( fnode_is_zero(f1) ) return mkfnode(1,I_FORMULA,0);
+	if ( IS_ZERO(f2) ) return mkfnode(1,I_FORMULA,ONE);
+	else if ( IS_ZERO(f1) ) return mkfnode(1,I_FORMULA,0);
 	else if ( fnode_is_one(f2) ) return f1;
 	else if ( fnode_is_number(f1) )
 		if ( fnode_is_integer(f2) ) {
@@ -2357,7 +2364,8 @@ FNODE fnode_normalize_pwr(FNODE f1,FNODE f2,int expand
 			return b;
 		else
 			return fnode_node_to_narymul(mknode(2,cc,b));
-	} else if ( expand && fnode_is_nonnegative_integer(f2) ) {
+	} else if ( expand && fnode_is_integer(f2) 
+			&& fnode_is_nonnegative_integer(f2) ) {
 		q = (Q)eval(f2);
 		if ( PL(NM(q)) > 1 ) error("fnode_normalize_pwr : exponent too large");
 		return fnode_expand_pwr(f1,QTOS(q));
@@ -2371,7 +2379,7 @@ FNODE fnode_expand_pwr(FNODE f,int n)
 	FNODE f1,f2;
 
 	if ( !n ) return mkfnode(1,I_FORMULA,ONE);
-	else if ( fnode_is_zero(f) ) return mkfnode(1,I_FORMULA,0);
+	else if ( IS_ZERO(f) ) return mkfnode(1,I_FORMULA,0);
 	else if ( n == 1 ) return f;
 	else {
 		n1 = n/2;
@@ -2468,4 +2476,135 @@ void fnode_coef_body(FNODE f,Num *cp,FNODE *bp)
 	} else {
 		*cp = (Num)ONE; *bp = f;
 	}
+}
+
+int fnode_normalize_comp_pwr(FNODE f1,FNODE f2);
+
+int fnode_normalize_comp(FNODE f1,FNODE f2)
+{
+	NODE n1,n2;
+	int r,i1,i2;
+	char *nm1,*nm2;
+	FNODE b1,b2,e1,e2,g;
+	Num ee,ee1,c1,c2;
+
+	if ( IS_NARYADD(f1) || IS_NARYADD(f2) ) {
+		f1 = to_naryadd(f1); f2 = to_naryadd(f2);
+		n1 = (NODE)FA1(f1); n2 = (NODE)FA1(f2);
+		while ( n1 && n2 )
+			if ( r = fnode_normalize_comp(BDY(n1),BDY(n2)) ) return r;
+			else {
+				n1 = NEXT(n1); n2 = NEXT(n2);
+			}
+		return n1?1:(n2?-1:0);
+	}
+	if ( IS_NARYMUL(f1) || IS_NARYMUL(f2) ) {
+		fnode_coef_body(f1,&c1,&b1);
+		fnode_coef_body(f2,&c2,&b2);
+		if ( !compfnode(b1,b2) ) return compnum(0,c1,c2);
+		b1 = to_narymul(b1); b2 = to_narymul(b2);
+		n1 = (NODE)FA1(b1); n2 = (NODE)FA1(b2);
+		while ( 1 ) {
+			while ( n1 && n2 && !compfnode(BDY(n1),BDY(n2)) ) {
+				n1 = NEXT(n1); n2 = NEXT(n2);
+			}
+			if ( !n1 || !n2 ) {
+				return n1?1:(n2?-1:0);
+			}
+			fnode_base_exp(BDY(n1),&b1,&e1);
+			fnode_base_exp(BDY(n2),&b2,&e2);
+
+			if ( r = fnode_normalize_comp(b1,b2) ) {
+				if ( r > 0 )
+					return fnode_normalize_comp(e1,mkfnode(1,I_FORMULA,0));
+				else if ( r < 0 )
+					return fnode_normalize_comp(mkfnode(1,I_FORMULA,0),e2);
+			} else {
+				n1 = NEXT(n1); n2 = NEXT(n2);
+				if ( fnode_is_number(e1) && fnode_is_number(e2) ) {
+					/* f1 = t b^e1 ... , f2 = t b^e2 ... */
+					subnum(0,eval(e1),eval(e2),&ee);
+					if ( ee ) {
+						g = mkfnode(3,I_BOP,pwrfs,b1,mkfnode(1,I_FORMULA,ee));
+						MKNODE(n1,g,n1);
+					}
+				} else {
+					r = fnode_normalize_comp(e1,e2);
+					if ( r > 0 ) return 1;
+					else if ( r < 0 ) return -1;
+				}
+			}
+		}
+	}
+	if ( IS_BINARYPWR(f1) || IS_BINARYPWR(f2) )
+		return fnode_normalize_comp_pwr(f1,f2);
+				
+	/* now, IDs of f1 and f2 must be I_FORMULA, I_FUNC, or I_PVAR */
+	switch ( f1->id ) {
+		case I_FORMULA:
+			switch ( f2->id ) {
+				case I_FORMULA:
+					return arf_comp(CO,FA0(f1),FA0(f2));
+				case I_FUNC: case I_PVAR:
+					return -1;
+				default:
+					error("fnode_normalize_comp : undefined");
+			}
+			break;
+		case I_FUNC:
+			switch ( f2->id ) {
+				case I_FORMULA:
+					return 1;
+				case I_FUNC:
+					nm1 = ((FUNC)FA0(f1))->name; nm2 = ((FUNC)FA0(f2))->name;
+					r = strcmp(nm1,nm2);
+					if ( r > 0 ) return 1;
+					else if ( r < 0 ) return -1;
+					else {
+						/* compare args */
+						n1 = FA0((FNODE)FA1(f1)); n2 = FA0((FNODE)FA1(f2));
+						while ( n1 && n2 )
+							if ( r = fnode_normalize_comp(BDY(n1),BDY(n2)) ) return r;
+							else {
+								n1 = NEXT(n1); n2 = NEXT(n2);
+							}
+						return n1?1:(n2?-1:0);
+					}
+					break;
+				case I_PVAR:
+					return -1;
+				default:
+					error("fnode_normalize_comp : undefined");
+			}
+		case I_PVAR:
+			switch ( f2->id ) {
+				case I_FORMULA: case I_FUNC:
+					return 1;
+				case I_PVAR:
+					i1 = (int)FA0(f1); i2 = (int)FA0(f2);
+					if ( i1 > i2 ) return 1;
+					else if ( i1 < i2 ) return -1;
+					else return 0;
+				default:
+					error("fnode_normalize_comp : undefined");
+			}
+			break;
+		default:
+			error("fnode_normalize_comp : undefined");
+	}
+}
+
+int fnode_normalize_comp_pwr(FNODE f1,FNODE f2)
+{
+	FNODE b1,b2,e1,e2;
+	int r;
+
+	fnode_base_exp(f1,&b1,&e1);
+	fnode_base_exp(f2,&b2,&e2);
+	if ( r = fnode_normalize_comp(b1,b2) ) {
+		if ( r > 0 )
+			return fnode_normalize_comp(e1,mkfnode(1,I_FORMULA,0));
+		else if ( r < 0 )
+			return fnode_normalize_comp(mkfnode(1,I_FORMULA,0),e2);
+	} else return fnode_normalize_comp(e1,e2);
 }