===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v
retrieving revision 1.103
retrieving revision 1.106
diff -u -p -r1.103 -r1.106
--- OpenXM_contrib2/asir2000/builtin/strobj.c	2005/11/30 04:51:46	1.103
+++ OpenXM_contrib2/asir2000/builtin/strobj.c	2005/12/10 14:14:15	1.106
@@ -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.102 2005/11/27 00:07:05 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.105 2005/12/09 08:10:44 noro Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -92,13 +92,15 @@ void Pquotetotex();
 void Pquotetotex_env();
 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 Pqt_is_integer(),Pqt_is_rational(),Pqt_is_number();
+void Pqt_is_dependent(),Pqt_is_function();
+void Pqt_set_ord();
+void Pqt_normalize();
+void Pnqt_comp();
+void Pnqt_match();
+void Pnqt_match_rewrite();
 
-void Pquote_to_nbp();
+void Pqt_to_nbp();
 void Pshuffle_mul(), Pharmonic_mul();
 void Pnbp_hm(), Pnbp_ht(), Pnbp_hc(), Pnbp_rest();
 void Pnbm_deg();
@@ -107,8 +109,8 @@ void Pnbm_hxky(), Pnbm_xky_rest();
 void Pnbm_hv(), Pnbm_rest();
 
 void Pquote_to_funargs(),Pfunargs_to_quote(),Pget_function_name();
-void Pquote_match(),Pget_quote_id(),Pquote_match_rewrite();
-void Pquote_to_nary(),Pquote_to_bin();
+void Pqt_match(),Pget_quote_id(),Pqt_match_rewrite();
+void Pqt_to_nary(),Pqt_to_bin();
 void fnode_do_assign(NODE arg);
 void do_assign(NODE arg);
 void fnodetotex_tb(FNODE f,TB tb);
@@ -120,7 +122,21 @@ 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_match(Obj f,Obj pat,NODE *rp);
+int qt_match(Obj f,Obj pat,NODE *rp);
+FNODE partial_eval(FNODE), fnode_to_nary(FNODE), fnode_to_bin(FNODE,int);
+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,int expand);
+FNODE to_narymul(FNODE f);
+FNODE to_naryadd(FNODE f);
+FNODE fnode_node_to_nary(ARF op,NODE n);
+void fnode_base_exp(FNODE f,FNODE *bp,FNODE *ep);
+void fnode_coef_body(FNODE f,Num *cp,FNODE *bp);
+FNODE nfnode_match_rewrite(FNODE f,FNODE p,FNODE c,FNODE a,int mode);
+FNODE fnode_apply(FNODE f,FNODE (*func)(),int expand);
+FNODE fnode_normalize(FNODE f,int expand);
 
 struct ftab str_tab[] = {
 	{"sprintf",Psprintf,-99999999},
@@ -138,19 +154,21 @@ struct ftab str_tab[] = {
 	{"string_to_tb",Pstring_to_tb,1},
 	{"get_quote_id",Pget_quote_id,1},
 
-	{"quote_is_number",Pquote_is_number,1},
-	{"quote_is_rational",Pquote_is_rational,1},
-	{"quote_is_integer",Pquote_is_integer,1},
-	{"quote_is_function",Pquote_is_function,1},
-	{"quote_is_dependent",Pquote_is_dependent,2},
+	{"qt_is_number",Pqt_is_number,1},
+	{"qt_is_rational",Pqt_is_rational,1},
+	{"qt_is_integer",Pqt_is_integer,1},
+	{"qt_is_function",Pqt_is_function,1},
+	{"qt_is_dependent",Pqt_is_dependent,2},
 
-	{"quote_normalize",Pquote_normalize,-2},
-	{"quote_match",Pquote_match,2},
-	{"quote_match_rewrite",Pquote_match_rewrite,-4},
+	{"qt_set_ord",Pqt_set_ord,-1},
+	{"qt_normalize",Pqt_normalize,-2},
+	{"qt_match",Pqt_match,2},
+	{"qt_match_rewrite",Pqt_match_rewrite,-4},
+	{"nqt_match_rewrite",Pnqt_match_rewrite,3},
 
-	{"nquote_comp",Pnquote_comp,2},
-	{"nquote_match",Pnquote_match,2},
-	{"quote_to_nbp",Pquote_to_nbp,1},
+	{"nqt_comp",Pnqt_comp,2},
+	{"nqt_match",Pnqt_match,-3},
+	{"qt_to_nbp",Pqt_to_nbp,1},
 	{"shuffle_mul",Pshuffle_mul,2},
 	{"harmonic_mul",Pharmonic_mul,2},
 
@@ -165,8 +183,8 @@ struct ftab str_tab[] = {
 	{"nbm_hv", Pnbm_hv,1},
 	{"nbm_rest", Pnbm_rest,1},
 
-	{"quote_to_nary",Pquote_to_nary,1},
-	{"quote_to_bin",Pquote_to_bin,2},
+	{"qt_to_nary",Pqt_to_nary,1},
+	{"qt_to_bin",Pqt_to_bin,2},
 
 	{"quotetotex_tb",Pquotetotex_tb,2},
 	{"quotetotex",Pquotetotex,1},
@@ -570,9 +588,7 @@ void Pwrite_to_tb(NODE arg,Q *rp)
 	*rp = 0;	
 }
 
-FNODE partial_eval(FNODE), fnode_to_nary(FNODE), fnode_to_bin(FNODE,int);
-
-void Pquote_to_nary(NODE arg,QUOTE *rp)
+void Pqt_to_nary(NODE arg,QUOTE *rp)
 {
 	FNODE f;
 
@@ -580,7 +596,7 @@ void Pquote_to_nary(NODE arg,QUOTE *rp)
 	MKQUOTE(*rp,f);	
 }
 
-void Pquote_to_bin(NODE arg,QUOTE *rp)
+void Pqt_to_bin(NODE arg,QUOTE *rp)
 {
 	FNODE f;
 	int direction;
@@ -591,46 +607,46 @@ void Pquote_to_bin(NODE arg,QUOTE *rp)
 	MKQUOTE(*rp,f);	
 }
 
-void Pquote_is_number(NODE arg,Q *rp)
+void Pqt_is_number(NODE arg,Q *rp)
 {
 	QUOTE q;
 	int ret;
 
 	q = (QUOTE)ARG0(arg);
-	asir_assert(q,O_QUOTE,"quote_is_number");
+	asir_assert(q,O_QUOTE,"qt_is_number");
 	ret = fnode_is_number(BDY(q));
 	STOQ(ret,*rp);
 }
 
-void Pquote_is_rational(NODE arg,Q *rp)
+void Pqt_is_rational(NODE arg,Q *rp)
 {
 	QUOTE q;
 	int ret;
 
 	q = (QUOTE)ARG0(arg);
-	asir_assert(q,O_QUOTE,"quote_is_rational");
+	asir_assert(q,O_QUOTE,"qt_is_rational");
 	ret = fnode_is_rational(BDY(q));
 	STOQ(ret,*rp);
 }
 
-void Pquote_is_integer(NODE arg,Q *rp)
+void Pqt_is_integer(NODE arg,Q *rp)
 {
 	QUOTE q;
 	int ret;
 
 	q = (QUOTE)ARG0(arg);
-	asir_assert(q,O_QUOTE,"quote_is_integer");
+	asir_assert(q,O_QUOTE,"qt_is_integer");
 	ret = fnode_is_integer(BDY(q));
 	STOQ(ret,*rp);
 }
 
-void Pquote_is_function(NODE arg,Q *rp)
+void Pqt_is_function(NODE arg,Q *rp)
 {
 	QUOTE q;
 	int ret;
 
 	q = (QUOTE)ARG0(arg);
-	asir_assert(q,O_QUOTE,"quote_is_function");
+	asir_assert(q,O_QUOTE,"qt_is_function");
 	if ( q->id == I_FUNC || q->id == I_IFUNC )
 		ret = 1;
 	else
@@ -638,7 +654,7 @@ void Pquote_is_function(NODE arg,Q *rp)
 	STOQ(ret,*rp);
 }
 
-void Pquote_is_dependent(NODE arg,Q *rp)
+void Pqt_is_dependent(NODE arg,Q *rp)
 {
 	P x;
 	QUOTE q,v;
@@ -647,8 +663,8 @@ void Pquote_is_dependent(NODE arg,Q *rp)
 
 	q = (QUOTE)ARG0(arg);
 	v = (QUOTE)ARG1(arg);
-	asir_assert(q,O_QUOTE,"quote_is_dependent");
-	asir_assert(v,O_QUOTE,"quote_is_dependent");
+	asir_assert(q,O_QUOTE,"qt_is_dependent");
+	asir_assert(v,O_QUOTE,"qt_is_dependent");
 	x = (P)eval(BDY(v));
 	if ( !x || OID(x) != O_P )
 		*rp = 0;
@@ -658,7 +674,7 @@ void Pquote_is_dependent(NODE arg,Q *rp)
 }
 
 
-void Pquote_match(NODE arg,Q *rp)
+void Pqt_match(NODE arg,Q *rp)
 {
 	FNODE f,g;
 	Obj obj;
@@ -666,14 +682,8 @@ void Pquote_match(NODE arg,Q *rp)
 	NODE r;
 	int ret;
 
-#if 0
-	g = partial_eval(BDY(((QUOTE)ARG0(arg))));
-	MKQUOTE(q,g);
-	ret = quote_match((Obj)q,(Obj)ARG1(arg),&r);
-#else
 	obj = (Obj)ARG0(arg);
-	ret = quote_match(obj,(Obj)ARG1(arg),&r);
-#endif
+	ret = qt_match(obj,(Obj)ARG1(arg),&r);
 	if ( ret ) {
 		do_assign(r);
 		*rp = ONE;
@@ -681,17 +691,17 @@ void Pquote_match(NODE arg,Q *rp)
 		*rp = 0;
 }
 
-void Pnquote_match(NODE arg,Q *rp)
+void Pnqt_match(NODE arg,Q *rp)
 {
 	QUOTE fq,pq;
 	FNODE f,p;
-	Q two;
 	int ret;
+	Q mode;
 	NODE r;
 
-	STOQ(2,two);
-	fq = (QUOTE)ARG0(arg); Pquote_normalize(mknode(2,fq,two),&fq); f = (FNODE)BDY(fq);
-	pq = (QUOTE)ARG1(arg); Pquote_normalize(mknode(2,pq,two),&pq); p = (FNODE)BDY(pq);
+	mode = argc(arg)==3 ? (Q)ARG2(arg) : 0;
+	fq = (QUOTE)ARG0(arg); Pqt_normalize(mknode(2,fq,mode),&fq); f = (FNODE)BDY(fq);
+	pq = (QUOTE)ARG1(arg); Pqt_normalize(mknode(2,pq,mode),&pq); p = (FNODE)BDY(pq);
 	ret = nfnode_match(f,p,&r);
 	if ( ret ) {
 		fnode_do_assign(r);
@@ -701,11 +711,11 @@ void Pnquote_match(NODE arg,Q *rp)
 }
 
 
-FNODE rewrite_fnode(FNODE,NODE);
+FNODE rewrite_fnode(FNODE,NODE,int);
 
 extern Obj VOIDobj;
 
-void Pquote_match_rewrite(NODE arg,Obj *rp)
+void Pqt_match_rewrite(NODE arg,Obj *rp)
 {
 	FNODE f,g,h,c,value;
 	Obj obj;
@@ -714,7 +724,7 @@ void Pquote_match_rewrite(NODE arg,Obj *rp)
 	int ret,ind,ac;
 
 	obj = (Obj)ARG0(arg);
-	ret = quote_match(obj,(Obj)ARG1(arg),&r);
+	ret = qt_match(obj,(Obj)ARG1(arg),&r);
 	if ( ret ) {
 		for ( t = r, s0 = 0; t; t = NEXT(t) ) {
 			NEXTNODE(s0,s);
@@ -726,24 +736,117 @@ void Pquote_match_rewrite(NODE arg,Obj *rp)
 		if ( s0 ) NEXT(s) = 0;
 		switch ( ac = argc(arg) ) {
 			case 3:
-				h = rewrite_fnode(BDY((QUOTE)ARG2(arg)),s0);
+				h = rewrite_fnode(BDY((QUOTE)ARG2(arg)),s0,0);
 				MKQUOTE(q,h); *rp = (Obj)q;
 				break;
 			case 4:
-				c = rewrite_fnode(BDY((QUOTE)ARG2(arg)),s0);
+				c = rewrite_fnode(BDY((QUOTE)ARG2(arg)),s0,0);
 				if ( eval(c) ) {
-					h = rewrite_fnode(BDY((QUOTE)ARG3(arg)),s0);
+					h = rewrite_fnode(BDY((QUOTE)ARG3(arg)),s0,0);
 					MKQUOTE(q,h); *rp = (Obj)q;
 				} else
 					*rp = VOIDobj;
 				break;
 			default:
-				error("quote_match_rewrite : invalid argument");
+				error("qt_match_rewrite : invalid argument");
 		}
 	} else
 		*rp = VOIDobj;
 }
 
+void Pnqt_match_rewrite(NODE arg,Obj *rp)
+{
+	FNODE f,p,c,a,r;
+	Obj obj,pat,cond,action;
+	NODE rule;
+	QUOTE q;
+	Q mode;
+	int m;
+
+	obj = (Obj)ARG0(arg);
+	rule = BDY((LIST)ARG1(arg));
+	mode = (Q)ARG2(arg);
+	if ( length(rule) == 2 ) {
+		pat = ARG0(rule);
+		cond = (Obj)ONE;
+		action = (Obj)ARG1(rule);
+	} else {
+		pat = ARG0(rule);
+		cond = ARG1(rule);
+		action = (Obj)ARG2(rule);
+	}
+	Pqt_normalize(mknode(2,obj,mode),&q); f = (FNODE)BDY(q);
+	Pqt_normalize(mknode(2,pat,mode),&q); p = (FNODE)BDY(q);
+	Pqt_normalize(mknode(2,action,mode),&q);
+	a = (FNODE)BDY(q);
+	if ( OID(cond) == O_QUOTE ) c = BDY((QUOTE)cond);
+	else c = mkfnode(1,I_FORMULA,ONE);
+
+	m = QTOS(mode);
+	r = nfnode_match_rewrite(f,p,c,a,m);
+	if ( r ) {
+		MKQUOTE(q,r);
+		*rp = (Obj)q;
+	} else
+		*rp = obj;
+}
+
+/* f is NARYOP => do submatch */
+
+#define PV_ANY 99999999
+
+FNODE nfnode_match_rewrite(FNODE f,FNODE p,FNODE c,FNODE a,int mode)
+{
+	ARF op;
+	NODE arg,h0,t,h,valuen;
+	NODE r,s0,s,pair;
+	FNODE any,pany,head,tail,a1;
+	QUOTE q;
+	int ret;
+	FNODE value;
+	int ind;
+
+	if ( f->id == I_NARYOP ) {
+		op = (ARF)FA0(f);
+		arg = (NODE)FA1(f);
+		pany = 0;
+		for ( h0 = 0, t = arg; t; t = NEXT(t) ) {
+			tail = fnode_node_to_nary(op,t);
+			ret = nfnode_match(tail,p,&r) && eval(rewrite_fnode(c,r,1));
+			if ( ret ) break;
+
+			/* append a variable to the pattern */
+			if ( !pany ) {
+				any = mkfnode(1,I_PVAR,PV_ANY);
+				pany = mkfnode(3,I_BOP,op,p,any);
+				pany = fnode_normalize(pany,mode);
+			}
+			ret = nfnode_match(tail,pany,&r) && eval(rewrite_fnode(c,r,1));
+			if ( ret ) {
+				a = fnode_normalize(mkfnode(3,I_BOP,op,a,any),mode);
+				break;
+			}
+
+			NEXTNODE(h0,h);
+			BDY(h) = BDY(t);
+		}
+		if ( t ) {
+			if ( h0 ) NEXT(h) = 0;
+			head = fnode_node_to_nary(op,h0);
+			a = fnode_normalize(mkfnode(3,I_BOP,op,head,a),mode);
+			ret = 1;
+		} else
+			ret = 0;
+	} else
+		ret = nfnode_match(f,p,&r) && eval(rewrite_fnode(c,r,1));
+
+	if ( ret ) {
+		a1 = rewrite_fnode(a,r,1);
+		return fnode_normalize(partial_eval(a1),mode);
+	} else
+		return 0;
+}
+
 void do_assign(NODE arg)
 {
 	NODE t,pair;
@@ -818,14 +921,14 @@ int merge_matching_node(NODE n,NODE a,NODE *rp)
 	return 1;
 }
 
-int quote_match_node(NODE f,NODE pat,NODE *rp) {
+int qt_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_match((Obj)BDY(tf),(Obj)BDY(tp),&a);
+		ret = qt_match((Obj)BDY(tf),(Obj)BDY(tp),&a);
 		if ( !ret ) return 0;
 		ret = merge_matching_node(r,a,&r1);
 		if ( !ret ) return 0;
@@ -837,7 +940,7 @@ int quote_match_node(NODE f,NODE pat,NODE *rp) {
 
 /* f = [a,b,c,...] pat = [X,Y,...] rpat matches the rest of f */
 
-int quote_match_cons(NODE f,NODE pat,Obj rpat,NODE *rp) {
+int qt_match_cons(NODE f,NODE pat,Obj rpat,NODE *rp) {
 	QUOTE q;
 	Q id;
 	FNODE fn;
@@ -849,7 +952,7 @@ int quote_match_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_match((Obj)BDY(tf),(Obj)BDY(tp),&a);
+		ret = qt_match((Obj)BDY(tf),(Obj)BDY(tp),&a);
 		if ( !ret ) return 0;
 		ret = merge_matching_node(r,a,&r1);
 		if ( !ret ) return 0;
@@ -861,7 +964,7 @@ int quote_match_cons(NODE f,NODE pat,Obj rpat,NODE *rp
 	MKLIST(alist,a);
 	arg = mknode(1,alist);
 	Pfunargs_to_quote(arg,&q);
-	ret = quote_match((Obj)q,rpat,&a);
+	ret = qt_match((Obj)q,rpat,&a);
 	if ( !ret ) return 0;
 	ret = merge_matching_node(r,a,&r1);
 	if ( !ret ) return 0;
@@ -880,7 +983,7 @@ void get_quote_id_arg(QUOTE f,int *id,NODE *r)
 
 /* *rp : [[quote(A),quote(1)],...] */
 
-int quote_match(Obj f, Obj pat, NODE *rp)
+int qt_match(Obj f, Obj pat, NODE *rp)
 {
 	NODE tf,tp,head,body;
 	NODE parg,farg,r;
@@ -899,7 +1002,7 @@ int quote_match(Obj f, Obj pat, NODE *rp)
 			return 0;
 	else if ( OID(pat) == O_LIST ) {
 		if ( OID(f) == O_LIST )
-			return quote_match_node(BDY((LIST)f),BDY((LIST)pat),rp);
+			return qt_match_node(BDY((LIST)f),BDY((LIST)pat),rp);
 		else
 			return 0;
 	} else if ( OID(pat) == O_QUOTE ) {
@@ -926,10 +1029,10 @@ int quote_match(Obj f, Obj pat, NODE *rp)
 
 				tp = BDY((LIST)BDY(parg));
 				if ( pid == I_LIST )
-					return quote_match_node(tf,tp,rp);
+					return qt_match_node(tf,tp,rp);
 				else {
 					rpat = (Obj)BDY(NEXT(parg));
-					return quote_match_cons(tf,tp,rpat,rp);
+					return qt_match_cons(tf,tp,rpat,rp);
 				}
 
 			case I_PVAR:
@@ -945,7 +1048,7 @@ int quote_match(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_match(BDY(NEXT(farg)),
+					ret = qt_match(BDY(NEXT(farg)),
 								BDY(NEXT(parg)),&body);
 					if ( !ret ) return 0;
 					else return merge_matching_node(head,body,rp);
@@ -973,7 +1076,7 @@ int quote_match(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_match_node(NEXT(farg),NEXT(parg),rp);
+				return qt_match_node(NEXT(farg),NEXT(parg),rp);
 
 			default:
 				if ( OID(f) != O_QUOTE ) return 0;
@@ -981,7 +1084,7 @@ int quote_match(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_match_node(farg,parg,rp);
+				return qt_match_node(farg,parg,rp);
 		}
 	}
 }
@@ -2048,17 +2151,69 @@ void Pfunargs_to_quote(NODE arg,QUOTE *rp)
 	MKQUOTE(*rp,f);
 }
 
-FNODE fnode_apply(FNODE f,FNODE (*func)(),int expand);
-FNODE fnode_normalize(FNODE f,int expand);
+VL reordvars(VL vl0,NODE head)
+{
+	VL vl,svl,tvl;
+	int i,j;
+	NODE n;
+	P t;
+	V *va;
+	V v;
 
-void Pquote_normalize(NODE arg,QUOTE *rp)
+	for ( vl = 0, i = 0, n = head; n; n = NEXT(n), i++ ) {
+		NEXTVL(vl,tvl);
+		if ( !(t = (P)BDY(n)) || (OID(t) != O_P) )
+			error("reordvars : invalid argument");
+		VR(tvl) = VR(t);
+	}
+	va = (V *)ALLOCA(i*sizeof(V));
+	for ( j = 0, svl = vl; j < i; j++, svl = NEXT(svl) )
+		va[j] = VR(svl);
+	for ( svl = vl0; svl; svl = NEXT(svl) ) {
+		v = VR(svl);
+		for ( j = 0; j < i; j++ )
+			if ( v == va[j] )
+				break;
+		if ( j == i ) {
+			NEXTVL(vl,tvl);
+			VR(tvl) = v;
+		}
+	}
+	if ( vl )
+		NEXT(tvl) = 0;
+	return vl;
+}
+
+VL qt_current_ord;
+LIST qt_current_ord_obj;
+
+void Pqt_set_ord(NODE arg,LIST *rp)
 {
+	NODE r0,r;
+	VL vl;
+	P v;
+
+	if ( !argc(arg) ) 
+		*rp = qt_current_ord_obj;
+	else {
+		qt_current_ord = reordvars(CO,BDY((LIST)ARG0(arg)));
+		for ( r0 = 0, vl = qt_current_ord; vl; vl = NEXT(vl) ) {
+			NEXTNODE(r0,r); MKV(vl->v,v); BDY(r) = v;
+		}
+		if ( r0 ) NEXT(r) = 0;
+		MKLIST(*rp,r0);
+		qt_current_ord_obj = *rp;
+	}
+}
+
+void Pqt_normalize(NODE arg,QUOTE *rp)
+{
 	QUOTE q,r;
 	FNODE f;
 	int expand,ac;
 
 	ac = argc(arg);
-	if ( !ac ) error("quote_normalize : invalid argument");
+	if ( !ac ) error("qt_normalize : invalid argument");
 	q = (QUOTE)ARG0(arg);
 	if ( ac == 2 )
 		expand = QTOS((Q)ARG1(arg));
@@ -2073,7 +2228,7 @@ void Pquote_normalize(NODE arg,QUOTE *rp)
 
 NBP fnode_to_nbp(FNODE f);
 
-void Pquote_to_nbp(NODE arg,NBP *rp)
+void Pqt_to_nbp(NODE arg,NBP *rp)
 {
 	QUOTE q;
 	FNODE f;
@@ -2302,7 +2457,7 @@ NBP fnode_to_nbp(FNODE f)
 	}
 }
 
-void Pnquote_comp(NODE arg,Q *rp)
+void Pnqt_comp(NODE arg,Q *rp)
 {
 	QUOTE q1,q2;
 	FNODE f1,f2;
@@ -2460,19 +2615,7 @@ int fnode_is_dependent(FNODE f,V v)
 	}
 }
 
-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,int expand);
-FNODE to_narymul(FNODE f);
-FNODE to_naryadd(FNODE f);
-FNODE fnode_node_to_naryadd(NODE n);
-FNODE fnode_node_to_narymul(NODE n);
-void fnode_base_exp(FNODE f,FNODE *bp,FNODE *ep);
-void fnode_coef_body(FNODE f,Num *cp,FNODE *bp);
 
-
 FNODE fnode_normalize(FNODE f,int expand)
 {
 	FNODE a1,a2,mone,r,b2;
@@ -2618,23 +2761,20 @@ FNODE nfnode_add(FNODE f1,FNODE f2,int expand)
 	else if ( r0 )
 		NEXT(r) = 0;
 
-	return fnode_node_to_naryadd(r0);
+	return fnode_node_to_nary(addfs,r0);
 }
 
-FNODE fnode_node_to_naryadd(NODE n)
+FNODE fnode_node_to_nary(ARF op,NODE n)
 {
-	if ( !n ) return mkfnode(1,I_FORMULA,0);
-	else if ( !NEXT(n) ) return BDY(n);
-	else return mkfnode(2,I_NARYOP,addfs,n);
+	if ( !n ) {
+		if ( op->name[0] == '+' )
+			return mkfnode(1,I_FORMULA,0);
+		else
+			return mkfnode(1,I_FORMULA,ONE);
+	} else if ( !NEXT(n) ) return BDY(n);
+	else return mkfnode(2,I_NARYOP,op,n);
 }
 
-FNODE fnode_node_to_narymul(NODE n)
-{
-	if ( !n ) return mkfnode(1,I_FORMULA,ONE);
-	else if ( !NEXT(n) ) return BDY(n);
-	else return mkfnode(2,I_NARYOP,mulfs,n);
-}
-
 FNODE nfnode_mul(FNODE f1,FNODE f2,int expand)
 {
 	NODE n1,n2,r0,r,r1;
@@ -2696,7 +2836,7 @@ FNODE nfnode_mul(FNODE f1,FNODE f2,int expand)
 	if ( !UNIQ(c) ) {
 		cc = mkfnode(1,I_FORMULA,c); MKNODE(r1,cc,r); r = r1;
 	}
-	return fnode_node_to_narymul(r);
+	return fnode_node_to_nary(mulfs,r);
 }
 
 FNODE nfnode_pwr(FNODE f1,FNODE f2,int expand)
@@ -2742,13 +2882,13 @@ FNODE nfnode_pwr(FNODE f1,FNODE f2,int expand)
 				inv = mkfnode(3,I_BOP,pwrfs,BDY(n),mone);
 				MKNODE(t1,inv,t0); t0 = t1;
 			}
-			b1 = fnode_node_to_narymul(t0);
+			b1 = fnode_node_to_nary(mulfs,t0);
 			b = fnode_expand_pwr(b1,-ee,expand);
 		}
 		if ( fnode_is_one(cc) )
 			return b;
 		else
-			return fnode_node_to_narymul(mknode(2,cc,b));
+			return fnode_node_to_nary(mulfs,mknode(2,cc,b));
 	} else if ( expand && fnode_is_integer(f2) 
 			&& fnode_is_nonnegative_integer(f2) ) {
 		q = (Q)eval(f2);
@@ -2842,16 +2982,16 @@ FNODE nfnode_mul_coef(Num c,FNODE f,int expand)
 					return cc;
 			} else if ( IS_NARYMUL(b1) ) {
 				MKNODE(n,cc,FA1(b1));
-				return fnode_node_to_narymul(n);
+				return fnode_node_to_nary(mulfs,n);
 			} else if ( expand && IS_NARYADD(b1) ) {
 				for ( r0 = 0, n = (NODE)FA1(b1); n; n = NEXT(n) ) {
 					NEXTNODE(r0,r);
 					BDY(r) = nfnode_mul_coef(c2,BDY(n),expand);
 				}
 				if ( r0 ) NEXT(r) = 0;
-				return fnode_node_to_naryadd(r0);
+				return fnode_node_to_nary(addfs,r0);
 			} else 
-				return fnode_node_to_narymul(mknode(2,cc,b1));
+				return fnode_node_to_nary(mulfs,mknode(2,cc,b1));
 		}
 	}
 }
@@ -2866,7 +3006,7 @@ void fnode_coef_body(FNODE f,Num *cp,FNODE *bp)
 		c=(FNODE)BDY((NODE)FA1(f));
 		if ( fnode_is_number(c) ) {
 			*cp = eval(c);
-			*bp = fnode_node_to_narymul(NEXT((NODE)FA1(f)));
+			*bp = fnode_node_to_nary(mulfs,NEXT((NODE)FA1(f)));
 		} else {
 			*cp = (Num)ONE; *bp = f;
 		}
@@ -2942,25 +3082,25 @@ int nfnode_comp(FNODE f1,FNODE 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 */
+	/* I_IFUNC > I_PVAR > I_FUNC=I_FUNC_QARG > I_FORMULA */
 	switch ( f1->id ) {
 		case I_FORMULA:
 			switch ( f2->id ) {
 				case I_FORMULA:
-					return arf_comp(CO,FA0(f1),FA0(f2));
+					return arf_comp(qt_current_ord?qt_current_ord: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:
+		case I_FUNC: case I_FUNC_QARG:
 			switch ( f2->id ) {
 				case I_FORMULA:
 					return 1;
 				case I_PVAR: case I_IFUNC:
 					return -1;
-				case I_FUNC:
+				case I_FUNC: case I_FUNC_QARG:
 					nm1 = ((FUNC)FA0(f1))->name; nm2 = ((FUNC)FA0(f2))->name;
 					r = strcmp(nm1,nm2);
 					if ( r > 0 ) return 1;
@@ -2981,7 +3121,7 @@ int nfnode_comp(FNODE f1,FNODE f2)
 			}
 		case I_PVAR:
 			switch ( f2->id ) {
-				case I_FORMULA: case I_FUNC:
+				case I_FORMULA: case I_FUNC: case I_FUNC_QARG:
 					return 1;
 				case I_IFUNC:
 					return -1;
@@ -2996,7 +3136,7 @@ int nfnode_comp(FNODE f1,FNODE f2)
 			break;
 		case I_IFUNC:
 			switch ( f2->id ) {
-				case I_FORMULA: case I_FUNC: case I_PVAR:
+				case I_FORMULA: case I_FUNC: case I_FUNC_QARG: case I_PVAR:
 					return 1;
 				case I_IFUNC:
 					i1 = (int)FA0((FNODE)FA0(f1));
@@ -3093,7 +3233,7 @@ int nfnode_match(FNODE f,FNODE pat,NODE *rp)
 				fbase = f; fexp = mkfnode(1,I_FORMULA,ONE);
 			}
 			if ( !nfnode_match(fbase,FA1(pat),&base) ) return 0;
-			a = rewrite_fnode(FA2(pat),base);
+			a = rewrite_fnode(FA2(pat),base,0);
 			if ( !nfnode_match(fexp,a,&exp) ) return 0;
 			else {
 				*rp = append_node(base,exp);
@@ -3117,7 +3257,7 @@ int nfnode_match(FNODE f,FNODE pat,NODE *rp)
 			fa = (NODE)FA0((FNODE)FA1(f));
 			pa = (NODE)FA0((FNODE)FA1(pat));
 			while ( fa && pa ) {
-				a = rewrite_fnode(BDY(pa),m);
+				a = rewrite_fnode(BDY(pa),m,0);
 				if ( !nfnode_match(BDY(fa),a,&m1) ) return 0;
 				m = append_node(m1,m);
 				fa = NEXT(fa); pa = NEXT(pa);
@@ -3153,14 +3293,14 @@ FNODE fnode_removeith_naryadd(FNODE p,int i)
 	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));
+		return fnode_node_to_nary(addfs,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);
+		return fnode_node_to_nary(addfs,r0);
 	}
 	
 }
@@ -3182,7 +3322,7 @@ FNODE fnode_left_narymul(FNODE p,int i)
 			BDY(r) = BDY(t);
 		}
 		NEXT(r) = 0;
-		return fnode_node_to_narymul(r0);
+		return fnode_node_to_nary(mulfs,r0);
 	}
 }
 
@@ -3198,7 +3338,7 @@ FNODE fnode_right_narymul(FNODE p,int i)
 	if ( i == l-1 ) return 0;
 	else {
 		for ( k = 0, t = a; k <= i; k++, t = NEXT(t) );
-		return fnode_node_to_narymul(t);
+		return fnode_node_to_nary(mulfs,t);
 	}
 }
 
@@ -3240,7 +3380,7 @@ int nfnode_match_naryadd(FNODE f,FNODE p,NODE *rp)
 			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);
+					prr = rewrite_fnode(pr,m,0);
 					if ( nfnode_match(fr,prr,&m1) ) {
 						*rp = append_node(m,m1);
 						return 1;
@@ -3274,7 +3414,7 @@ int nfnode_match_narymul(FNODE f,FNODE p,NODE *rp)
 			/* 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);
+				pr = rewrite_fnode(BDY(t),m,0);
 				if ( !nfnode_match(BDY(s),pr,&m1) ) return 0;
 				m = append_node(m1,m);
 			}
@@ -3282,7 +3422,7 @@ int nfnode_match_narymul(FNODE f,FNODE p,NODE *rp)
 				fr = (FNODE)BDY(s);
 			else
 				fr = mkfnode(2,I_NARYOP,FA0(f),s);
-			pr = rewrite_fnode(BDY(t),m);
+			pr = rewrite_fnode(BDY(t),m,0);
 			if ( !nfnode_match(fr,pr,&m1) ) return 0;
 			*rp = append_node(m1,m);
 			return 1;
@@ -3295,11 +3435,11 @@ int nfnode_match_narymul(FNODE f,FNODE p,NODE *rp)
 				if ( fi < pi ) continue;
 				if ( nfnode_match(BDY(s),pivot,&m) ) {
 					fleft = fnode_left_narymul(f,fi);
-					pleft1 = rewrite_fnode(pleft,m);
+					pleft1 = rewrite_fnode(pleft,m,0);
 					if ( nfnode_match(fleft,pleft1,&m1) ) {
 						m = append_node(m1,m);
 						fright = fnode_right_narymul(f,fi);
-						pright1 = rewrite_fnode(pright,m);
+						pright1 = rewrite_fnode(pright,m,0);
 						if ( nfnode_match(fright,pright1,&m1) ) {
 							*rp = append_node(m1,m);
 							return 1;