===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v
retrieving revision 1.77
retrieving revision 1.95
diff -u -p -r1.77 -r1.95
--- OpenXM_contrib2/asir2000/builtin/strobj.c	2005/10/15 07:40:59	1.77
+++ OpenXM_contrib2/asir2000/builtin/strobj.c	2005/11/03 07:41:22	1.95
@@ -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.76 2005/10/15 02:34:13 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.94 2005/11/02 10:02:32 noro Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -58,6 +58,14 @@ extern jmp_buf environnement;
 #endif
 #include <string.h>
 
+#if defined(__GNUC__)
+#define INLINE inline
+#elif defined(VISUAL)
+#define INLINE __inline
+#else
+#define INLINE
+#endif
+
 struct TeXSymbol {
 	char *text;
 	char *symbol;
@@ -87,10 +95,13 @@ void Pflatten_quote();
 void Pquote_is_integer(),Pquote_is_rational(),Pquote_is_number();
 void Pquote_is_dependent(),Pquote_is_function();
 void Pquote_normalize();
+void Pnquote_comp();
+void Pnquote_match();
 
 void Pquote_to_funargs(),Pfunargs_to_quote(),Pget_function_name();
-void Pquote_unify(),Pget_quote_id(),Pquote_match_rewrite();
+void Pquote_match(),Pget_quote_id(),Pquote_match_rewrite();
 void Pquote_to_nary(),Pquote_to_bin();
+void fnode_do_assign(NODE arg);
 void do_assign(NODE arg);
 void fnodetotex_tb(FNODE f,TB tb);
 char *symbol_name(char *name);
@@ -101,7 +112,7 @@ void tb_to_string(TB tb,STRING *rp);
 void fnodenodetotex_tb(NODE n,TB tb);
 void fargstotex_tb(char *opname,FNODE f,TB tb);
 int top_is_minus(FNODE f);
-int quote_unify(Obj f,Obj pat,NODE *rp);
+int quote_match(Obj f,Obj pat,NODE *rp);
 
 struct ftab str_tab[] = {
 	{"sprintf",Psprintf,-99999999},
@@ -126,16 +137,19 @@ struct ftab str_tab[] = {
 	{"quote_is_dependent",Pquote_is_dependent,2},
 
 	{"quote_normalize",Pquote_normalize,-2},
+	{"quote_match",Pquote_match,2},
+	{"quote_match_rewrite",Pquote_match_rewrite,-4},
+	{"nquote_comp",Pnquote_comp,2},
+	{"nquote_match",Pnquote_match,2},
 
 	{"quote_to_nary",Pquote_to_nary,1},
 	{"quote_to_bin",Pquote_to_bin,2},
+
 	{"quotetotex_tb",Pquotetotex_tb,2},
 	{"quotetotex",Pquotetotex,1},
 	{"quotetotex_env",Pquotetotex_env,-99999999},
 	{"flatten_quote",Pflatten_quote,-2},
 	{"quote_to_funargs",Pquote_to_funargs,1},
-	{"quote_unify",Pquote_unify,2},
-	{"quote_match_rewrite",Pquote_match_rewrite,-4},
 	{"funargs_to_quote",Pfunargs_to_quote,1},
 	{"get_function_name",Pget_function_name,1},
 	{0,0,0},
@@ -621,7 +635,7 @@ void Pquote_is_dependent(NODE arg,Q *rp)
 }
 
 
-void Pquote_unify(NODE arg,Q *rp)
+void Pquote_match(NODE arg,Q *rp)
 {
 	FNODE f,g;
 	Obj obj;
@@ -632,10 +646,10 @@ void Pquote_unify(NODE arg,Q *rp)
 #if 0
 	g = partial_eval(BDY(((QUOTE)ARG0(arg))));
 	MKQUOTE(q,g);
-	ret = quote_unify((Obj)q,(Obj)ARG1(arg),&r);
+	ret = quote_match((Obj)q,(Obj)ARG1(arg),&r);
 #else
 	obj = (Obj)ARG0(arg);
-	ret = quote_unify(obj,(Obj)ARG1(arg),&r);
+	ret = quote_match(obj,(Obj)ARG1(arg),&r);
 #endif
 	if ( ret ) {
 		do_assign(r);
@@ -644,6 +658,23 @@ void Pquote_unify(NODE arg,Q *rp)
 		*rp = 0;
 }
 
+void Pnquote_match(NODE arg,Q *rp)
+{
+	QUOTE fq,pq;
+	FNODE f,p;
+	int ret;
+	NODE r;
+
+	fq = (QUOTE)ARG0(arg); Pquote_normalize(mknode(2,fq,0),&fq); f = (FNODE)BDY(fq);
+	pq = (QUOTE)ARG1(arg); Pquote_normalize(mknode(2,pq,0),&pq); p = (FNODE)BDY(pq);
+	ret = nfnode_match(f,p,&r);
+	if ( ret ) {
+		fnode_do_assign(r);
+		*rp = ONE;
+	} else
+		*rp = 0;
+}
+
 FNODE rewrite_fnode(FNODE,NODE);
 
 extern Obj VOIDobj;
@@ -657,26 +688,26 @@ void Pquote_match_rewrite(NODE arg,Obj *rp)
 	int ret,ind,ac;
 
 	obj = (Obj)ARG0(arg);
-	ret = quote_unify(obj,(Obj)ARG1(arg),&r);
+	ret = quote_match(obj,(Obj)ARG1(arg),&r);
 	if ( ret ) {
 		for ( t = r, s0 = 0; t; t = NEXT(t) ) {
 			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;
@@ -702,6 +733,30 @@ void do_assign(NODE arg)
 	}
 }
 
+/* [[index,fnode],...] */
+
+void fnode_do_assign(NODE arg)
+{
+	NODE t,pair;
+	int pv;
+	FNODE f;
+	QUOTE value;
+	QUOTEARG qa;
+
+	for ( t = arg; t; t = NEXT(t) ) {
+		pair = (NODE)BDY(t);
+		pv = (int)BDY(pair);
+		f = (FNODE)(BDY(NEXT(pair)));
+		if ( f->id == I_FUNC ) {
+			/* XXX : used for wrapping A_func */
+			MKQUOTEARG(qa,A_func,FA0(f));
+			value = (QUOTE)qa;
+		} else
+			MKQUOTE(value,f);
+		ASSPV(pv,value);
+	}
+}
+
 /* 
 /* consistency check and merge
  */
@@ -737,14 +792,14 @@ int merge_matching_node(NODE n,NODE a,NODE *rp)
 	return 1;
 }
 
-int quote_unify_node(NODE f,NODE pat,NODE *rp) {
+int quote_match_node(NODE f,NODE pat,NODE *rp) {
 	NODE r,a,tf,tp,r1;
 	int ret;
 
 	if ( length(f) != length(pat) ) return 0;
 	r = 0;
 	for ( tf = f, tp = pat; tf; tf = NEXT(tf), tp = NEXT(tp) ) {
-		ret = quote_unify((Obj)BDY(tf),(Obj)BDY(tp),&a);
+		ret = quote_match((Obj)BDY(tf),(Obj)BDY(tp),&a);
 		if ( !ret ) return 0;
 		ret = merge_matching_node(r,a,&r1);
 		if ( !ret ) return 0;
@@ -756,7 +811,7 @@ int quote_unify_node(NODE f,NODE pat,NODE *rp) {
 
 /* f = [a,b,c,...] pat = [X,Y,...] rpat matches the rest of f */
 
-int quote_unify_cons(NODE f,NODE pat,Obj rpat,NODE *rp) {
+int quote_match_cons(NODE f,NODE pat,Obj rpat,NODE *rp) {
 	QUOTE q;
 	Q id;
 	FNODE fn;
@@ -768,7 +823,7 @@ int quote_unify_cons(NODE f,NODE pat,Obj rpat,NODE *rp
 	if ( length(f) < length(pat) ) return 0;
 	r = 0;
 	for ( tf = f, tp = pat; tp; tf = NEXT(tf), tp = NEXT(tp) ) {
-		ret = quote_unify((Obj)BDY(tf),(Obj)BDY(tp),&a);
+		ret = quote_match((Obj)BDY(tf),(Obj)BDY(tp),&a);
 		if ( !ret ) return 0;
 		ret = merge_matching_node(r,a,&r1);
 		if ( !ret ) return 0;
@@ -780,7 +835,7 @@ int quote_unify_cons(NODE f,NODE pat,Obj rpat,NODE *rp
 	MKLIST(alist,a);
 	arg = mknode(1,alist);
 	Pfunargs_to_quote(arg,&q);
-	ret = quote_unify((Obj)q,rpat,&a);
+	ret = quote_match((Obj)q,rpat,&a);
 	if ( !ret ) return 0;
 	ret = merge_matching_node(r,a,&r1);
 	if ( !ret ) return 0;
@@ -799,7 +854,7 @@ void get_quote_id_arg(QUOTE f,int *id,NODE *r)
 
 /* *rp : [[quote(A),quote(1)],...] */
 
-int quote_unify(Obj f, Obj pat, NODE *rp)
+int quote_match(Obj f, Obj pat, NODE *rp)
 {
 	NODE tf,tp,head,body;
 	NODE parg,farg,r;
@@ -818,7 +873,7 @@ int quote_unify(Obj f, Obj pat, NODE *rp)
 			return 0;
 	else if ( OID(pat) == O_LIST ) {
 		if ( OID(f) == O_LIST )
-			return quote_unify_node(BDY((LIST)f),BDY((LIST)pat),rp);
+			return quote_match_node(BDY((LIST)f),BDY((LIST)pat),rp);
 		else
 			return 0;
 	} else if ( OID(pat) == O_QUOTE ) {
@@ -845,10 +900,10 @@ int quote_unify(Obj f, Obj pat, NODE *rp)
 
 				tp = BDY((LIST)BDY(parg));
 				if ( pid == I_LIST )
-					return quote_unify_node(tf,tp,rp);
+					return quote_match_node(tf,tp,rp);
 				else {
 					rpat = (Obj)BDY(NEXT(parg));
-					return quote_unify_cons(tf,tp,rpat,rp);
+					return quote_match_cons(tf,tp,rpat,rp);
 				}
 
 			case I_PVAR:
@@ -864,7 +919,7 @@ int quote_unify(Obj f, Obj pat, NODE *rp)
 				if ( id == I_FUNC ) {
 					r = mknode(2,BDY(parg),BDY(farg)); MKLIST(l,r);
 					head = mknode(1,l);
-					ret = quote_unify(BDY(NEXT(farg)),
+					ret = quote_match(BDY(NEXT(farg)),
 								BDY(NEXT(parg)),&body);
 					if ( !ret ) return 0;
 					else return merge_matching_node(head,body,rp);
@@ -892,7 +947,7 @@ int quote_unify(Obj f, Obj pat, NODE *rp)
 				get_quote_id_arg((QUOTE)pat,&pid,&parg);
 				get_quote_id_arg((QUOTE)f,&id,&farg);
 				if ( compqa(CO,BDY(farg),BDY(parg)) ) return 0;
-				return quote_unify_node(NEXT(farg),NEXT(parg),rp);
+				return quote_match_node(NEXT(farg),NEXT(parg),rp);
 
 			default:
 				if ( OID(f) != O_QUOTE ) return 0;
@@ -900,7 +955,7 @@ int quote_unify(Obj f, Obj pat, NODE *rp)
 				if ( id != pid ) return 0;
 				get_quote_id_arg((QUOTE)pat,&pid,&parg);
 				get_quote_id_arg((QUOTE)f,&id,&farg);
-				return quote_unify_node(farg,parg,rp);
+				return quote_match_node(farg,parg,rp);
 		}
 	}
 }
@@ -1266,14 +1321,14 @@ FNODE strip_paren(FNODE);
 
 void fnodetotex_tb(FNODE f,TB tb)
 {
-	NODE n,t,t0;
+	NODE n,t,t0,args;
 	char vname[BUFSIZ],prefix[BUFSIZ];
 	char *opname,*vname_conv,*prefix_conv;
 	Obj obj;
 	int i,len,allzero,elen,elen2,si;
 	C cplx;
 	char *r;
-	FNODE fi,f2;
+	FNODE fi,f2,f1;
 
 	write_tb(" ",tb);
 	if ( !f ) {
@@ -1354,6 +1409,46 @@ void fnodetotex_tb(FNODE f,TB tb)
 					break;
 			}
 			break;
+		case I_NARYOP:
+			args = (NODE)FA1(f);
+			write_tb("(",tb);
+			switch ( OPNAME(f) ) {
+				case '+':
+					fnodetotex_tb((FNODE)BDY(args),tb);
+					for ( args = NEXT(args); args; args = NEXT(args) ) {
+						write_tb("+",tb);
+						fnodetotex_tb((FNODE)BDY(args),tb);
+					}
+					break;
+				case '*':
+					f1 = (FNODE)BDY(args);
+					if ( f1->id == I_FORMULA && MUNIQ(FA0(f1)) )
+						write_tb("-",tb);
+					else
+						fnodetotex_tb(f1,tb);
+					write_tb(" ",tb);
+					for ( args = NEXT(args); args; args = NEXT(args) ) {
+						/* XXX special care for DP */
+						f2 = (FNODE)BDY(args);
+						if ( f2->id == I_EV ) {
+							n = (NODE)FA0(f2);
+							for ( i = 0; n; n = NEXT(n), i++ ) {
+								fi = (FNODE)BDY(n);
+								if ( fi->id != I_FORMULA || FA0(fi) )
+									break;
+							}
+							if ( n )
+								fnodetotex_tb(f2,tb);
+						} else
+							fnodetotex_tb(f2,tb);
+					}
+					break;
+				default:
+					error("invalid nary op");
+					break;
+			}
+			write_tb(")",tb);
+			break;
 
 		case I_COP:
 			switch( (cid)FA0(f) ) {
@@ -1746,6 +1841,9 @@ int top_is_minus(FNODE f)
 						return opname[0]=='-';
 				}
 			}
+		case I_NARYOP:
+			return top_is_minus((FNODE)BDY((NODE)FA1(f)));
+
 		default:
 			return 0;
 	}
@@ -1940,15 +2038,33 @@ void Pquote_normalize(NODE arg,QUOTE *rp)
 	if ( !q || OID(q) != O_QUOTE ) {
 		*rp = q;
 		return;
-	} else {
+	} else if ( q->normalized && (q->expanded || !expand) )
+		*rp = q;
+	else {
 		f = fnode_normalize(BDY(q),expand);
 		MKQUOTE(r,f);
+		r->normalized = 1;
+		if ( expand ) r->expanded = 1;
 		*rp = r;
 	}
 }
 
-int fnode_is_number(FNODE f)
+void Pnquote_comp(NODE arg,Q *rp)
 {
+	QUOTE q1,q2;
+	FNODE f1,f2;
+	int r;
+
+	q1 = (QUOTE)ARG0(arg); f1 = (FNODE)BDY(q1);
+	q2 = (QUOTE)ARG1(arg); f2 = (FNODE)BDY(q2);
+	if ( !q1->normalized ) f1 = fnode_normalize(f1,0);
+	if ( !q2->normalized ) f2 = fnode_normalize(f2,0);
+	r = nfnode_comp(f1,f2);
+	STOQ(r,*rp);
+}
+
+INLINE int fnode_is_number(FNODE f)
+{
 	Obj obj;
 
 	switch ( f->id ) {
@@ -2091,10 +2207,10 @@ int fnode_is_dependent(FNODE f,V v)
 	}
 }
 
-FNODE fnode_normalize_add(FNODE a1,FNODE a2,int expand);
-FNODE fnode_normalize_mul(FNODE a1,FNODE a2,int expand);
-FNODE fnode_normalize_pwr(FNODE a1,FNODE a2,int expand);
-FNODE fnode_normalize_mul_coef(Num c,FNODE f,int expand);
+FNODE nfnode_add(FNODE a1,FNODE a2,int expand);
+FNODE nfnode_mul(FNODE a1,FNODE a2,int expand);
+FNODE nfnode_pwr(FNODE a1,FNODE a2,int expand);
+FNODE nfnode_mul_coef(Num c,FNODE f,int expand);
 FNODE fnode_expand_pwr(FNODE f,int n);
 FNODE to_narymul(FNODE f);
 FNODE to_naryadd(FNODE f);
@@ -2110,15 +2226,18 @@ FNODE fnode_normalize(FNODE f,int expand)
 	NODE n;
 	Q q;
 
+	if ( f->normalized && (f->expanded || !expand) ) return f;
 	STOQ(-1,q);
 	mone = mkfnode(1,I_FORMULA,q);
 	switch ( f->id ) {
 		case I_PAREN:
-			return fnode_normalize(FA0(f),expand);
+			r = fnode_normalize(FA0(f),expand);
+			break;
 		
 		case I_MINUS:
-			return fnode_normalize_mul_coef((Num)q,
+			r = nfnode_mul_coef((Num)q,
 				fnode_normalize(FA0(f),expand),expand);
+			break;
 
 		case I_BOP:
 			/* arf fnode fnode */
@@ -2126,19 +2245,25 @@ FNODE fnode_normalize(FNODE f,int expand)
 			a2 = fnode_normalize(FA2(f),expand);
 			switch ( OPNAME(f) ) {
 				case '+':
-					return fnode_normalize_add(a1,a2,expand);
+					r = nfnode_add(a1,a2,expand);
+					break;
 				case '-':
-					a2 = fnode_normalize_mul_coef((Num)q,a2,expand);
-					return fnode_normalize_add(a1,a2,expand);
+					a2 = nfnode_mul_coef((Num)q,a2,expand);
+					r = nfnode_add(a1,a2,expand);
+					break;
 				case '*':
-					return fnode_normalize_mul(a1,a2,expand);
+					r = nfnode_mul(a1,a2,expand);
+					break;
 				case '/':
-					a2 = fnode_normalize_pwr(a2,mone,expand);
-					return fnode_normalize_mul(a1,a2,expand);
+					a2 = nfnode_pwr(a2,mone,expand);
+					r = nfnode_mul(a1,a2,expand);
+					break;
 				case '^':
-					return fnode_normalize_pwr(a1,a2,expand);
+					r = nfnode_pwr(a1,a2,expand);
+					break;
 				default:
-					return mkfnode(3,I_BOP,FA0(f),a1,a2);
+					r = mkfnode(3,I_BOP,FA0(f),a1,a2);
+					break;
 			}
 			break;
 
@@ -2149,24 +2274,28 @@ FNODE fnode_normalize(FNODE f,int expand)
 					r = fnode_normalize(BDY(n),expand); n = NEXT(n);
 					for ( ; n; n = NEXT(n) ) {
 						a1 = fnode_normalize(BDY(n),expand);
-						r = fnode_normalize_add(r,a1,expand);
+						r = nfnode_add(r,a1,expand);
 					}
-					return r;
+					break;
 				case '*':
 					n = (NODE)FA1(f);
 					r = fnode_normalize(BDY(n),expand); n = NEXT(n);
 					for ( ; n; n = NEXT(n) ) {
 						a1 = fnode_normalize(BDY(n),expand);
-						r = fnode_normalize_mul(r,a1,expand);
+						r = nfnode_mul(r,a1,expand);
 					}
-					return r;
+					break;
 				default:
 					error("fnode_normallize : cannot happen");
 			}
+			break;
 
 		default:
 			return fnode_apply(f,fnode_normalize,expand);
 	}
+	r->normalized = 1;
+	r->expanded = expand;
+	return r;
 }
 
 FNODE fnode_apply(FNODE f,FNODE (*func)(),int expand)
@@ -2182,7 +2311,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];
@@ -2201,7 +2330,7 @@ FNODE fnode_apply(FNODE f,FNODE (*func)(),int expand)
 	return r;
 }
 
-FNODE fnode_normalize_add(FNODE f1,FNODE f2,int expand)
+FNODE nfnode_add(FNODE f1,FNODE f2,int expand)
 {
 	NODE n1,n2,r0,r;
 	FNODE b1,b2;
@@ -2215,14 +2344,14 @@ FNODE fnode_normalize_add(FNODE f1,FNODE f2,int expand
 	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 = nfnode_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);
 		} else {
 			addnum(0,c1,c2,&c);
 			if ( c ) {
-				NEXTNODE(r0,r); BDY(r) = fnode_normalize_mul_coef(c,b1,expand);
+				NEXTNODE(r0,r); BDY(r) = nfnode_mul_coef(c,b1,expand);
 			}
 			n1 = NEXT(n1); n2 = NEXT(n2);
 		}
@@ -2253,7 +2382,7 @@ FNODE fnode_node_to_narymul(NODE n)
 	else return mkfnode(2,I_NARYOP,mulfs,n);
 }
 
-FNODE fnode_normalize_mul(FNODE f1,FNODE f2,int expand)
+FNODE nfnode_mul(FNODE f1,FNODE f2,int expand)
 {
 	NODE n1,n2,r0,r,r1;
 	FNODE b1,b2,e1,e2,cc,t,t1;
@@ -2264,23 +2393,23 @@ FNODE fnode_normalize_mul(FNODE f1,FNODE f2,int expand
 
 	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);
+		return nfnode_mul_coef((Num)eval(f1),f2,expand);
 	else if ( fnode_is_number(f2) ) 
-		return fnode_normalize_mul_coef((Num)eval(f2),f1,expand);
+		return nfnode_mul_coef((Num)eval(f2),f1,expand);
 
 	if ( expand && IS_NARYADD(f1) ) {
 		t = mkfnode(1,I_FORMULA,0);
 		for ( n1 = (NODE)FA1(f1); n1; n1 = NEXT(n1) ) {
-			t1 = fnode_normalize_mul(BDY(n1),f2,expand);
-			t = fnode_normalize_add(t,t1,expand);
+			t1 = nfnode_mul(BDY(n1),f2,expand);
+			t = nfnode_add(t,t1,expand);
 		}
 		return t;
 	}
 	if ( expand && IS_NARYADD(f2) ) {
 		t = mkfnode(1,I_FORMULA,0);
 		for ( n2 = (NODE)FA1(f2); n2; n2 = NEXT(n2) ) {
-			t1 = fnode_normalize_mul(f1,BDY(n2),expand);
-			t = fnode_normalize_add(t,t1,expand);
+			t1 = nfnode_mul(f1,BDY(n2),expand);
+			t = nfnode_add(t,t1,expand);
 		}
 		return t;
 	}
@@ -2317,41 +2446,60 @@ FNODE fnode_normalize_mul(FNODE f1,FNODE f2,int expand
 	return fnode_node_to_narymul(r);
 }
 
-FNODE fnode_normalize_pwr(FNODE f1,FNODE f2,int expand)
+FNODE nfnode_pwr(FNODE f1,FNODE f2,int expand)
 {
-	FNODE b,b1,e1,e,cc,r;
-	Num c,c1;
-	NODE arg,n;
+	FNODE b,b1,e1,e,cc,r,mf2,mone,inv;
+	Num c,c1,nf2;
+	int ee;
+	NODE arg,n,t0,t1;
 	Q q;
 
 	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) )
+	else if ( fnode_is_number(f1) ) {
 		if ( fnode_is_integer(f2) ) {
-			pwrnum(0,(Num)eval(f1),(Num)eval(f2),&c);
-			return mkfnode(1,I_FORMULA,c);
+			if ( fnode_is_one(f2) ) return f1;
+			else {
+				pwrnum(0,(Num)eval(f1),(Num)eval(f2),&c);
+				return mkfnode(1,I_FORMULA,c);
+			}
 		} else
 			return mkfnode(3,I_BOP,pwrfs,f1,f2);
-	else if ( IS_BINARYPWR(f1) ) {
+	} else if ( IS_BINARYPWR(f1) ) {
 		b1 = FA1(f1); e1 = FA2(f1);
-		e = fnode_normalize_mul(e1,f2,expand);
+		e = nfnode_mul(e1,f2,expand);
 		if ( fnode_is_one(e) )
 			return b1;
 		else
 			return mkfnode(3,I_BOP,FA0(f1),b1,e);
-	} else if ( IS_NARYMUL(f1) && fnode_is_integer(f2) ) {
+	} else if ( expand && IS_NARYMUL(f1) && fnode_is_number(f2) 
+		&& fnode_is_integer(f2) ) {
 		fnode_coef_body(f1,&c1,&b1);
-		pwrnum(0,(Num)c1,(Num)eval(f2),&c);
+		nf2 = (Num)eval(f2);
+		pwrnum(0,(Num)c1,nf2,&c);
+		ee = QTOS((Q)nf2);
 		cc = mkfnode(1,I_FORMULA,c);
-		b = fnode_normalize_pwr(b1,f2,expand);
+		if ( fnode_is_nonnegative_integer(f2) )
+			b = fnode_expand_pwr(b1,ee);
+		else {
+			STOQ(-1,q);
+			mone = mkfnode(1,I_FORMULA,q);
+			b1 = to_narymul(b1);
+			for ( t0 = 0, n = (NODE)FA1(b1); n; n = NEXT(n) ) {
+				inv = mkfnode(3,I_BOP,pwrfs,BDY(n),mone);
+				MKNODE(t1,inv,t0); t0 = t1;
+			}
+			b1 = fnode_node_to_narymul(t0);
+			b = fnode_expand_pwr(b1,-ee);
+		}
 		if ( fnode_is_one(cc) )
 			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");
+		if ( PL(NM(q)) > 1 ) error("nfnode_pwr : exponent too large");
 		return fnode_expand_pwr(f1,QTOS(q));
 	} else
 		return mkfnode(3,I_BOP,pwrfs,f1,f2);
@@ -2368,8 +2516,8 @@ FNODE fnode_expand_pwr(FNODE f,int n)
 	else {
 		n1 = n/2;
 		f1 = fnode_expand_pwr(f,n1);
-		f2 = fnode_normalize_mul(f1,f1,1);
-		if ( n%2 ) f2 = fnode_normalize_mul(f2,f,1);
+		f2 = nfnode_mul(f1,f1,1);
+		if ( n%2 ) f2 = nfnode_mul(f2,f,1);
 		return f2;
 	}
 }
@@ -2408,7 +2556,7 @@ FNODE to_narymul(FNODE f)
 	return r;
 }
 
-FNODE fnode_normalize_mul_coef(Num c,FNODE f,int expand)
+FNODE nfnode_mul_coef(Num c,FNODE f,int expand)
 {
 	FNODE b1,cc;
 	Num c1,c2;
@@ -2424,7 +2572,7 @@ FNODE fnode_normalize_mul_coef(Num c,FNODE f,int expan
 			cc = mkfnode(1,I_FORMULA,c2);
 			if ( fnode_is_number(b1) ) {
 				if ( !fnode_is_one(b1) )
-					error("fnode_normalize_mul_coef : cannot happen");
+					error("nfnode_mul_coef : cannot happen");
 				else
 					return cc;
 			} else if ( IS_NARYMUL(b1) ) {
@@ -2433,7 +2581,7 @@ FNODE fnode_normalize_mul_coef(Num c,FNODE f,int expan
 			} else if ( expand && IS_NARYADD(b1) ) {
 				for ( r0 = 0, n = (NODE)FA1(b1); n; n = NEXT(n) ) {
 					NEXTNODE(r0,r);
-					BDY(r) = fnode_normalize_mul_coef(c2,BDY(n),expand);
+					BDY(r) = nfnode_mul_coef(c2,BDY(n),expand);
 				}
 				if ( r0 ) NEXT(r) = 0;
 				return fnode_node_to_naryadd(r0);
@@ -2459,5 +2607,484 @@ void fnode_coef_body(FNODE f,Num *cp,FNODE *bp)
 		}
 	} else {
 		*cp = (Num)ONE; *bp = f;
+	}
+}
+
+int nfnode_comp_pwr(FNODE f1,FNODE f2);
+
+int nfnode_comp(FNODE f1,FNODE f2)
+{
+	NODE n1,n2;
+	int r,i1,i2,ret;
+	char *nm1,*nm2;
+	FNODE b1,b2,e1,e2,g,a1,a2,fn1,fn2;
+	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 = nfnode_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 = nfnode_comp(b1,b2) ) {
+				if ( r > 0 )
+					return nfnode_comp(e1,mkfnode(1,I_FORMULA,0));
+				else if ( r < 0 )
+					return nfnode_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);
+					r = compnum(0,ee,0);
+					if ( r > 0 ) {
+						g = mkfnode(3,I_BOP,pwrfs,b1,mkfnode(1,I_FORMULA,ee));
+						MKNODE(n1,g,n1);
+					} else if ( r < 0 ) {
+						chsgnnum(ee,&ee1);
+						g = mkfnode(3,I_BOP,pwrfs,b1,mkfnode(1,I_FORMULA,ee1));
+						MKNODE(n2,g,n2);
+					}
+				} else {
+					r = nfnode_comp(e1,e2);
+					if ( r > 0 ) return 1;
+					else if ( r < 0 ) return -1;
+				}
+			}
+		}
+	}
+	if ( IS_BINARYPWR(f1) || IS_BINARYPWR(f2) )
+		return nfnode_comp_pwr(f1,f2);
+				
+	/* now, IDs of f1 and f2 must be I_FORMULA, I_FUNC, I_IFUNC or I_PVAR */
+	/* I_IFUNC > I_PVAR > I_FUNC > I_FORMULA */
+	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_IFUNC: case I_PVAR:
+					return -1;
+				default:
+					error("nfnode_comp : undefined");
+			}
+			break;
+		case I_FUNC:
+			switch ( f2->id ) {
+				case I_FORMULA:
+					return 1;
+				case I_PVAR: case I_IFUNC:
+					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 = nfnode_comp(BDY(n1),BDY(n2)) ) return r;
+							else {
+								n1 = NEXT(n1); n2 = NEXT(n2);
+							}
+						return n1?1:(n2?-1:0);
+					}
+					break;
+				default:
+					error("nfnode_comp : undefined");
+			}
+		case I_PVAR:
+			switch ( f2->id ) {
+				case I_FORMULA: case I_FUNC:
+					return 1;
+				case I_IFUNC:
+					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("nfnode_comp : undefined");
+			}
+			break;
+		case I_IFUNC:
+			switch ( f2->id ) {
+				case I_FORMULA: case I_FUNC: case I_PVAR:
+					return 1;
+				case I_IFUNC:
+					i1 = (int)FA0((FNODE)FA0(f1));
+					i2 = (int)FA0((FNODE)FA0(f2));
+					if ( i1 > i2 ) return 1;
+					else if ( i1 < i2 ) return -1;
+					else {
+						/* compare args */
+						n1 = FA0((FNODE)FA1(f1)); n2 = FA0((FNODE)FA1(f2));
+						while ( n1 && n2 )
+							if ( r = nfnode_comp(BDY(n1),BDY(n2)) ) return r;
+							else {
+								n1 = NEXT(n1); n2 = NEXT(n2);
+							}
+						return n1?1:(n2?-1:0);
+					}
+					break;
+
+				default:
+					error("nfnode_comp : undefined");
+			}
+			break;
+		default:
+			error("nfnode_comp : undefined");
+	}
+}
+
+int nfnode_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 = nfnode_comp(b1,b2) ) {
+		if ( r > 0 )
+			return nfnode_comp(e1,mkfnode(1,I_FORMULA,0));
+		else if ( r < 0 )
+			return nfnode_comp(mkfnode(1,I_FORMULA,0),e2);
+	} else return nfnode_comp(e1,e2);
+}
+
+NODE append_node(NODE a1,NODE a2)
+{
+	NODE t,t0;
+
+	if ( !a1 )
+		return a2;
+	else {
+		for ( t0 = 0; a1; a1 = NEXT(a1) ) {
+			NEXTNODE(t0,t); BDY(t) = BDY(a1);
+		}
+		NEXT(t) = a2;
+		return t0;
+	}
+}
+
+int nfnode_match(FNODE f,FNODE pat,NODE *rp)
+{
+	NODE m,m1,m2,base,exp,fa,pa,n;
+	LIST l;
+	QUOTE qp,qf;
+	FNODE fbase,fexp,a;
+	FUNC ff,pf;
+	int r;
+
+	switch ( pat->id ) {
+		case I_PVAR:
+			/* [[pat,f]] */
+			*rp = mknode(1,mknode(2,(int)FA0(pat),f),0);
+			return 1;
+
+		case I_FORMULA:
+			if ( f->id == I_FORMULA && !arf_comp(CO,(Obj)FA0(f),(Obj)FA0(pat)) ) {
+				*rp = 0; return 1;
+			} else
+				return 0;
+
+		case I_BOP:
+			/* OPNAME should be "^" */
+			if ( !IS_BINARYPWR(pat) )
+				error("nfnode_match : invalid BOP");
+			if ( IS_BINARYPWR(f) ) {
+				fbase = FA1(f); fexp = FA2(f);
+			} else {
+				fbase = f; fexp = mkfnode(1,I_FORMULA,ONE);
+			}
+			if ( !nfnode_match(fbase,FA1(pat),&base) ) return 0;
+			a = rewrite_fnode(FA2(pat),base);
+			if ( !nfnode_match(fexp,a,&exp) ) return 0;
+			else {
+				*rp = append_node(base,exp);
+				return 1;
+			}
+			break;
+		
+		case I_FUNC: case I_IFUNC:
+			if ( f->id != I_FUNC ) return 0;
+			ff = (FUNC)FA0(f); 
+			if ( pat->id == I_FUNC ) {
+				pf = (FUNC)FA0(pat);
+				if ( strcmp(ff->fullname,pf->fullname) ) return 0;
+				m = 0;
+			} else {
+				/* XXX only FA0(f) is used */
+				m = mknode(1,mknode(2,FA0((FNODE)FA0(pat)),f),0);
+			}
+			/* FA1(f) and FA1(pat) are I_LIST */
+			fa = (NODE)FA0((FNODE)FA1(f));
+			pa = (NODE)FA0((FNODE)FA1(pat));
+			while ( fa && pa ) {
+				a = rewrite_fnode(BDY(pa),m);
+				if ( !nfnode_match(BDY(fa),a,&m1) ) return 0;
+				m = append_node(m1,m);
+				fa = NEXT(fa); pa = NEXT(pa);
+			}
+			if ( fa || pa ) return 0;
+			else {
+				*rp = m;
+				return 1;
+			}
+
+		case I_NARYOP:
+			if ( IS_NARYADD(pat) )
+				return nfnode_match_naryadd(f,pat,rp);
+			else if ( IS_NARYMUL(pat) )
+				return nfnode_match_narymul(f,pat,rp);
+			else
+				error("nfnode_match : invalid NARYOP");
+			break;
+
+		default:
+			error("nfnode_match : invalid pattern");
+	}
+}
+
+/* remove i-th element */
+
+FNODE fnode_removeith_naryadd(FNODE p,int i)
+{
+	int k,l;
+	NODE t,r0,r,a;
+
+	a = (NODE)FA1(p);
+	l = length(a);
+	if ( i < 0 || i >= l ) error("fnode_removeith_naryadd: invalid index");
+	else if ( i == 0 )
+		return fnode_node_to_naryadd(NEXT(a));
+	else {
+		for ( r0 = 0, k = 0, t = a; k < i; k++, t = NEXT(t) ) {
+			NEXTNODE(r0,r);
+			BDY(r) = BDY(t);
+		}
+		NEXT(r) = NEXT(t);
+		return fnode_node_to_naryadd(r0);
+	}
+	
+}
+
+/* a0,...,a(i-1) */
+FNODE fnode_left_narymul(FNODE p,int i)
+{
+	int k,l;
+	NODE t,r0,r,a;
+
+	a = (NODE)FA1(p);
+	l = length(a);
+	if ( i < 0 || i >= l ) error("fnode_left_narymul : invalid index");
+	if ( i == 0 ) return mkfnode(1,I_FORMULA,ONE);
+	else if ( i == 1 ) return (FNODE)BDY(a);
+	else {
+		for ( r0 = 0, k = 0, t = a; k < i; k++, t = NEXT(t) ) {
+			NEXTNODE(r0,r);
+			BDY(r) = BDY(t);
+		}
+		NEXT(r) = 0;
+		return fnode_node_to_narymul(r0);
+	}
+}
+
+/* a(i+1),...,a(l-1) */
+FNODE fnode_right_narymul(FNODE p,int i)
+{
+	NODE a,t;
+	int l,k;
+
+	a = (NODE)FA1(p);
+	l = length(a);
+	if ( i < 0 || i >= l ) error("fnode_right_narymul : invalid index");
+	if ( i == l-1 ) return mkfnode(1,I_FORMULA,ONE);
+	else {
+		for ( k = 0, t = a; k <= i; k++, t = NEXT(t) );
+		return fnode_node_to_narymul(t);
+	}
+}
+
+int nfnode_match_naryadd(FNODE f,FNODE p,NODE *rp)
+{
+	int fl,pl,fi,pi;
+	NODE fa,pa,t,s,m,m1;
+	FNODE fr,pr,prr,pivot;
+
+	f = to_naryadd(f);
+	fa = (NODE)FA1(f); fl = length(fa);
+	pa = (NODE)FA1(p); pl = length(pa);
+	if ( fl < pl ) return 0;
+	else if ( pl == 1 ) {
+		if ( fl == 1 )
+			return nfnode_match(BDY(fa),BDY(pa),rp);
+		else
+			return 0;
+	} else {
+		for ( t = pa, pi = 0; t; t = NEXT(t), pi++ )
+			if ( ((FNODE)BDY(t))->id != I_PVAR ) break;
+		if ( !t ) {
+			/* all are I_PVAR */
+			m = 0;
+			for ( t = pa, s = fa; NEXT(t); t = NEXT(t), s = NEXT(s) ) {
+				nfnode_match(BDY(s),BDY(t),&m1);
+				m = append_node(m1,m);
+			}
+			if ( !NEXT(s) )
+				fr = (FNODE)BDY(s);
+			else
+				fr = mkfnode(2,I_NARYOP,FA0(f),s);
+			nfnode_match(fr,BDY(t),&m1);
+			*rp = append_node(m1,m);
+			return 1;
+		} else {
+			pivot = (FNODE)BDY(t);
+			pr = fnode_removeith_naryadd(p,pi);
+			for ( s = fa, fi = 0; s; s = NEXT(s), fi++ ) {
+				if ( nfnode_match(BDY(s),pivot,&m) ) {
+					fr = fnode_removeith_naryadd(f,fi);
+					prr = rewrite_fnode(pr,m);
+					if ( nfnode_match(fr,prr,&m1) ) {
+						*rp = append_node(m,m1);
+						return 1;
+					}
+				}
+			}
+			return 0;
+		}
+	}
+}
+
+int nfnode_match_narymul(FNODE f,FNODE p,NODE *rp)
+{
+	int fl,pl,fi,pi;
+	NODE fa,pa,t,s,m,m1;
+	FNODE fr,pr,pleft,pleft1,pright,pright1,fleft,fright,pivot;
+
+	f = to_narymul(f);
+	fa = (NODE)FA1(f); fl = length(fa);
+	pa = (NODE)FA1(p); pl = length(pa);
+	if ( fl < pl ) return 0;
+	else if ( pl == 1 ) {
+		if ( fl == 1 )
+			return nfnode_match(BDY(fa),BDY(pa),rp);
+		else
+			return 0;
+	} else {
+		for ( t = pa, pi = 0; t; t = NEXT(t), pi++ )
+			if ( ((FNODE)BDY(t))->id != I_PVAR ) break;
+		if ( !t ) {
+			/* all are I_PVAR */
+			m = 0;
+			for ( t = pa, s = fa; NEXT(t); t = NEXT(t), s = NEXT(s) ) {
+				pr = rewrite_fnode(BDY(t),m);
+				if ( !nfnode_match(BDY(s),pr,&m1) ) return 0;
+				m = append_node(m1,m);
+			}
+			if ( !NEXT(s) )
+				fr = (FNODE)BDY(s);
+			else
+				fr = mkfnode(2,I_NARYOP,FA0(f),s);
+			pr = rewrite_fnode(BDY(t),m);
+			if ( !nfnode_match(fr,pr,&m1) ) return 0;
+			*rp = append_node(m1,m);
+			return 1;
+		} else {
+			pivot = (FNODE)BDY(t);
+			pleft = fnode_left_narymul(p,pi);
+			pright = fnode_right_narymul(p,pi);
+			/* XXX : incomplete */
+			for ( s = fa, fi = 0; s; s = NEXT(s), fi++ ) {
+				if ( nfnode_match(BDY(s),pivot,&m) ) {
+					fleft = fnode_left_narymul(f,fi);
+					pleft1 = rewrite_fnode(pleft,m);
+					if ( nfnode_match(fleft,pleft1,&m1) ) {
+						m = append_node(m1,m);
+						fright = fnode_right_narymul(f,fi);
+						pright1 = rewrite_fnode(pright,m);
+						if ( nfnode_match(fright,pright1,&m1) ) {
+							*rp = append_node(m1,m);
+							return 1;
+						}
+					}
+				}
+			}
+			return 0;
+		}
+	}
+}
+
+NODE nfnode_pvars(FNODE pat,NODE found)
+{
+	int ind;
+	NODE prev,t;
+	int *pair;
+
+	switch ( pat->id ) {
+		case I_PVAR:
+			ind = (int)FA0(pat);
+			for ( prev = 0, t = found; t; prev = t, t = NEXT(t) ) {
+				pair = (int *)BDY(t);
+				if ( pair[0] == ind ) {
+					pair[1]++;
+					return found;
+				}
+			}
+			pair = (int *)MALLOC_ATOMIC(sizeof(int)*2);
+			pair[0] = ind; pair[1] = 1;
+			if ( !prev )
+				MKNODE(found,pair,0);
+			else
+				MKNODE(NEXT(prev),pair,0);
+			return found;
+
+		case I_FORMULA:
+			return found;
+
+		case I_BOP:
+			/* OPNAME should be "^" */
+			if ( !IS_BINARYPWR(pat) )
+				error("nfnode_pvar : invalid BOP");
+			found = nfnode_pvars(FA1(pat),found);
+			found = nfnode_pvars(FA2(pat),found);
+			return found;
+
+		case I_FUNC:
+			t = (NODE)FA0((FNODE)FA1(pat));
+			for ( ; t; t = NEXT(t) )
+				found = nfnode_pvars(BDY(t),found);
+			return found;
+
+		case I_NARYOP:
+			t = (NODE)FA1(pat);
+			for ( ; t; t = NEXT(t) )
+				found = nfnode_pvars(BDY(t),found);
+			return found;
+
+		default:
+			error("nfnode_match : invalid pattern");
 	}
 }