===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v
retrieving revision 1.106
retrieving revision 1.123
diff -u -p -r1.106 -r1.123
--- OpenXM_contrib2/asir2000/builtin/strobj.c	2005/12/10 14:14:15	1.106
+++ OpenXM_contrib2/asir2000/builtin/strobj.c	2015/08/06 10:01:52	1.123
@@ -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.105 2005/12/09 08:10:44 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.122 2011/06/16 08:17:15 noro Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -60,7 +60,7 @@ extern jmp_buf environnement;
 
 #if defined(__GNUC__)
 #define INLINE inline
-#elif defined(VISUAL)
+#elif defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
 #define INLINE __inline
 #else
 #define INLINE
@@ -76,6 +76,7 @@ struct TeXSymbol {
 #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)=='*'))
+#define IS_MUL(f) (((f)->id==I_NARYOP||(f)->id==I_BOP) &&(OPNAME(f)=='*'))
 
 extern char *parse_strp;
 
@@ -92,24 +93,25 @@ void Pquotetotex();
 void Pquotetotex_env();
 void Pflatten_quote();
 
-void Pqt_is_integer(),Pqt_is_rational(),Pqt_is_number();
-void Pqt_is_dependent(),Pqt_is_function();
-void Pqt_set_ord();
+void Pqt_is_integer(),Pqt_is_rational(),Pqt_is_number(),Pqt_is_coef();
+void Pqt_is_dependent(),Pqt_is_function(),Pqt_is_var();
+void Pqt_set_ord(),Pqt_set_coef(),Pqt_set_weight();
 void Pqt_normalize();
-void Pnqt_comp();
+void Pnqt_comp(),Pnqt_weight();
 void Pnqt_match();
 void Pnqt_match_rewrite();
 
 void Pqt_to_nbp();
 void Pshuffle_mul(), Pharmonic_mul();
 void Pnbp_hm(), Pnbp_ht(), Pnbp_hc(), Pnbp_rest();
-void Pnbm_deg();
+void Pnbp_tm(), Pnbp_tt(), Pnbp_tc(), Pnbp_trest();
+void Pnbm_deg(), Pnbm_index();
 void Pnbm_hp_rest();
 void Pnbm_hxky(), Pnbm_xky_rest();
-void Pnbm_hv(), Pnbm_rest();
+void Pnbm_hv(), Pnbm_tv(), Pnbm_rest(),Pnbm_trest();
 
 void Pquote_to_funargs(),Pfunargs_to_quote(),Pget_function_name();
-void Pqt_match(),Pget_quote_id(),Pqt_match_rewrite();
+void Pqt_match(),Pget_quote_id();
 void Pqt_to_nary(),Pqt_to_bin();
 void fnode_do_assign(NODE arg);
 void do_assign(NODE arg);
@@ -127,16 +129,17 @@ FNODE partial_eval(FNODE), fnode_to_nary(FNODE), fnode
 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 nfnode_mul_coef(Obj 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);
+void fnode_coef_body(FNODE f,Obj *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);
+FNODE rewrite_fnode(FNODE f,NODE arg,int qarg);
 
 struct ftab str_tab[] = {
 	{"sprintf",Psprintf,-99999999},
@@ -154,18 +157,22 @@ struct ftab str_tab[] = {
 	{"string_to_tb",Pstring_to_tb,1},
 	{"get_quote_id",Pget_quote_id,1},
 
+	{"qt_is_var",Pqt_is_var,1},
+	{"qt_is_coef",Pqt_is_coef,1},
 	{"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},
 
+	{"qt_set_coef",Pqt_set_coef,-1},
 	{"qt_set_ord",Pqt_set_ord,-1},
+	{"qt_set_weight",Pqt_set_weight,-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},
 
+	{"nqt_weight",Pnqt_weight,1},
 	{"nqt_comp",Pnqt_comp,2},
 	{"nqt_match",Pnqt_match,-3},
 	{"qt_to_nbp",Pqt_to_nbp,1},
@@ -176,12 +183,19 @@ struct ftab str_tab[] = {
 	{"nbp_ht", Pnbp_ht,1},
 	{"nbp_hc", Pnbp_hc,1},
 	{"nbp_rest", Pnbp_rest,1},
+	{"nbp_tm", Pnbp_tm,1},
+	{"nbp_tt", Pnbp_tt,1},
+	{"nbp_tc", Pnbp_tc,1},
+	{"nbp_trest", Pnbp_trest,1},
 	{"nbm_deg", Pnbm_deg,1},
+	{"nbm_index", Pnbm_index,1},
 	{"nbm_hxky", Pnbm_hxky,1},
 	{"nbm_xky_rest", Pnbm_xky_rest,1},
 	{"nbm_hp_rest", Pnbm_hp_rest,1},
 	{"nbm_hv", Pnbm_hv,1},
+	{"nbm_tv", Pnbm_tv,1},
 	{"nbm_rest", Pnbm_rest,1},
+	{"nbm_trest", Pnbm_trest,1},
 
 	{"qt_to_nary",Pqt_to_nary,1},
 	{"qt_to_bin",Pqt_to_bin,2},
@@ -456,7 +470,7 @@ int register_conv_func(Obj arg)
 	if ( !arg ) {
 		convfunc = 0;
 		return 1;
-	} else if ( OID(arg) == O_P && (int)(VR((P)arg))->attr == V_SR ) {
+	} else if ( OID(arg) == O_P && (long)(VR((P)arg))->attr == V_SR ) {
 		convfunc = (FUNC)(VR((P)arg)->priv);
 		/* f must be a function which takes single argument */
 		return 1;
@@ -607,6 +621,28 @@ void Pqt_to_bin(NODE arg,QUOTE *rp)
 	MKQUOTE(*rp,f);	
 }
 
+void Pqt_is_var(NODE arg,Q *rp)
+{
+	QUOTE q;
+	int ret;
+
+	q = (QUOTE)ARG0(arg);
+	asir_assert(q,O_QUOTE,"qt_is_var");
+	ret = fnode_is_var(BDY(q));
+	STOQ(ret,*rp);
+}
+
+void Pqt_is_coef(NODE arg,Q *rp)
+{
+	QUOTE q;
+	int ret;
+
+	q = (QUOTE)ARG0(arg);
+	asir_assert(q,O_QUOTE,"qt_is_coef");
+	ret = fnode_is_coef(BDY(q));
+	STOQ(ret,*rp);
+}
+
 void Pqt_is_number(NODE arg,Q *rp)
 {
 	QUOTE q;
@@ -710,50 +746,6 @@ void Pnqt_match(NODE arg,Q *rp)
 		*rp = 0;
 }
 
-
-FNODE rewrite_fnode(FNODE,NODE,int);
-
-extern Obj VOIDobj;
-
-void Pqt_match_rewrite(NODE arg,Obj *rp)
-{
-	FNODE f,g,h,c,value;
-	Obj obj;
-	QUOTE q;
-	NODE r,t,s,s0,pair;
-	int ret,ind,ac;
-
-	obj = (Obj)ARG0(arg);
-	ret = qt_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 = 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,0);
-				MKQUOTE(q,h); *rp = (Obj)q;
-				break;
-			case 4:
-				c = rewrite_fnode(BDY((QUOTE)ARG2(arg)),s0,0);
-				if ( eval(c) ) {
-					h = rewrite_fnode(BDY((QUOTE)ARG3(arg)),s0,0);
-					MKQUOTE(q,h); *rp = (Obj)q;
-				} else
-					*rp = VOIDobj;
-				break;
-			default:
-				error("qt_match_rewrite : invalid argument");
-		}
-	} else
-		*rp = VOIDobj;
-}
-
 void Pnqt_match_rewrite(NODE arg,Obj *rp)
 {
 	FNODE f,p,c,a,r;
@@ -800,7 +792,7 @@ FNODE nfnode_match_rewrite(FNODE f,FNODE p,FNODE c,FNO
 	ARF op;
 	NODE arg,h0,t,h,valuen;
 	NODE r,s0,s,pair;
-	FNODE any,pany,head,tail,a1;
+	FNODE any,pany,head,tail,a1,a2;
 	QUOTE q;
 	int ret;
 	FNODE value;
@@ -841,8 +833,9 @@ FNODE nfnode_match_rewrite(FNODE f,FNODE p,FNODE c,FNO
 		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);
+		a1 = rewrite_fnode(a,r,0);
+		a2 = partial_eval(a1);
+		return fnode_normalize(a2,mode);
 	} else
 		return 0;
 }
@@ -856,7 +849,7 @@ void do_assign(NODE arg)
 
 	for ( t = arg; t; t = NEXT(t) ) {
 		pair = BDY((LIST)BDY(t));
-		pv = (int)FA0((FNODE)BDY((QUOTE)BDY(pair)));
+		pv = (long)FA0((FNODE)BDY((QUOTE)BDY(pair)));
 		value = (QUOTE)(BDY(NEXT(pair)));
 		ASSPV(pv,value);
 	}
@@ -1295,6 +1288,7 @@ NODE arg;
 Obj *rp;
 {
 	FNODE fnode;
+	SNODE snode;
 	char *cmd;
 #if defined(PARI)
 	void recover(int);
@@ -1308,8 +1302,13 @@ Obj *rp;
 #  endif
 #endif
 	cmd = BDY((STRING)ARG0(arg));
+#if 0
 	exprparse_create_var(0,cmd,&fnode);
 	*rp = eval(fnode);
+#else
+	exprparse_create_var(0,cmd,&snode);
+	*rp = evalstat(snode);
+#endif
 }
 
 void Prtostr(arg,rp)
@@ -1331,6 +1330,7 @@ NODE arg;
 P *rp;
 {
 	char *p;
+	FUNC f;
 
 	p = BDY((STRING)ARG0(arg));
 #if 0
@@ -1344,7 +1344,11 @@ P *rp;
 			makevar(p,rp);
 	}
 #else
-	makevar(p,rp);
+	gen_searchf_searchonly(p,&f);
+	if ( f )
+		makesrvar(f,rp);
+	else
+		makevar(p,rp);
 #endif
 }
 
@@ -1432,21 +1436,27 @@ char *symbol_name(char *name)
 
 void Pget_function_name(NODE arg,STRING *rp)
 {
-		QUOTEARG qa;
-		ARF f;
-		char *opname;
+	QUOTEARG qa;
 
-		qa = (QUOTEARG)BDY(arg);
-		if ( !qa || OID(qa) != O_QUOTEARG || qa->type != A_arf )
+	qa = (QUOTEARG)BDY(arg);
+	if ( !qa || OID(qa) != O_QUOTEARG ) {
+		*rp = 0; return;
+	}
+	switch ( qa->type ) {
+		case A_arf:
+			MKSTR(*rp,((ARF)BDY(qa))->name);
+			break;
+		case A_func:
+			MKSTR(*rp,((FUNC)BDY(qa))->name);
+			break;
+		default:
 			*rp = 0;
-		else {
-			f = (ARF)BDY(qa);
-			opname = f->name;
-			MKSTR(*rp,opname);
-		}
+			break;
+	}
 }
 
 FNODE strip_paren(FNODE);
+void objtotex_tb(Obj obj,TB tb);
 
 void fnodetotex_tb(FNODE f,TB tb)
 {
@@ -1455,7 +1465,6 @@ void fnodetotex_tb(FNODE f,TB tb)
 	char *opname,*vname_conv,*prefix_conv;
 	Obj obj;
 	int i,len,allzero,elen,elen2,si;
-	C cplx;
 	char *r;
 	FNODE fi,f2,f1;
 
@@ -1523,7 +1532,14 @@ void fnodetotex_tb(FNODE f,TB tb)
 					write_tb("}",tb);
 					break;
 				case '^':
-					fnodetotex_tb((FNODE)FA1(f),tb);
+					f1 = (FNODE)FA1(f);
+					if ( fnode_is_var(f1) )
+						fnodetotex_tb(f1,tb);
+					else {
+						write_tb("(",tb);
+						fnodetotex_tb(f1,tb);
+						write_tb(")",tb);
+					}
 					write_tb("^{",tb);
 					fnodetotex_tb(strip_paren((FNODE)FA2(f)),tb);
 					write_tb("} ",tb);
@@ -1540,43 +1556,41 @@ void fnodetotex_tb(FNODE f,TB tb)
 			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);
+						f1 = (FNODE)BDY(args);
+						/* if ( fnode_is_var(f1) || IS_MUL(f1) )
+							fnodetotex_tb(f1,tb);
+						else */ {
+							write_tb("(",tb);
+							fnodetotex_tb(f1,tb);
+							write_tb(")",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 */
+					if ( f1->id == I_FORMULA && MUNIQ(FA0(f1)) ) {
+						write_tb("- ",tb); args = NEXT(args);
+					}
+					for ( ; args; args = NEXT(args) ) {
 						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
+						if ( fnode_is_var(f2) || IS_BINARYPWR(f2) )
 							fnodetotex_tb(f2,tb);
+						else {
+							write_tb("(",tb);
+							fnodetotex_tb(f2,tb);
+							write_tb(")",tb);
+						}
 					}
 					break;
 				default:
 					error("invalid nary op");
 					break;
 			}
-			write_tb(")",tb);
 			break;
 
 		case I_COP:
@@ -1801,33 +1815,7 @@ void fnodetotex_tb(FNODE f,TB tb)
 
 		/* internal object */
 		case I_FORMULA:
-			obj = (Obj)FA0(f);
-			if ( !obj )
-				write_tb("0",tb);
-			else if ( OID(obj) == O_N && NID(obj) == N_C ) {
-				cplx = (C)obj;
-				write_tb("(",tb);
-				if ( cplx->r ) {
-					r = objtostr((Obj)cplx->r); write_tb(r,tb);
-				}
-				if ( cplx->i ) {
-					if ( cplx->r && compnum(0,cplx->i,0) > 0 ) {
-						write_tb("+",tb);
-						if ( !UNIQ(cplx->i) ) {
-							r = objtostr((Obj)cplx->i); write_tb(r,tb);
-						}
-					} else if ( MUNIQ(cplx->i) )
-						write_tb("-",tb);
-					else if ( !UNIQ(cplx->i) ) {
-						r = objtostr((Obj)cplx->i); write_tb(r,tb);
-					}
-					write_tb("\\sqrt{-1}",tb);
-				}
-				write_tb(")",tb);
-			} else if ( OID(obj) == O_P )
-				write_tb(conv_rule(VR((P)obj)->name),tb);
-			else
-				write_tb(objtostr(obj),tb);
+			objtotex_tb((Obj)FA0(f),tb);
 			break;
 
 		/* program variable */
@@ -1843,6 +1831,103 @@ void fnodetotex_tb(FNODE f,TB tb)
 	}
 }
 
+void objtotex_tb(Obj obj,TB tb)
+{
+	C cplx;
+	char *r;
+	P t;
+	DCP dc;
+	char *v;
+
+	if ( !obj ) {
+		write_tb("0",tb);
+		return;
+	}
+	switch ( OID(obj) ) {
+		case O_N:
+			switch ( NID(obj) ) {
+				case N_C:
+					cplx = (C)obj;
+					write_tb("(",tb);
+					if ( cplx->r ) {
+						r = objtostr((Obj)cplx->r); write_tb(r,tb);
+					}
+					if ( cplx->i ) {
+						if ( cplx->r && compnum(0,cplx->i,0) > 0 ) {
+							write_tb("+",tb);
+							if ( !UNIQ(cplx->i) ) {
+								r = objtostr((Obj)cplx->i); write_tb(r,tb);
+							}
+						} else if ( MUNIQ(cplx->i) )
+							write_tb("-",tb);
+						else if ( !UNIQ(cplx->i) ) {
+							r = objtostr((Obj)cplx->i); write_tb(r,tb);
+						}
+						write_tb("\\sqrt{-1}",tb);
+					}
+					write_tb(")",tb);
+					break;
+				default:
+					write_tb(objtostr(obj),tb);
+					break;
+			}
+			break;
+		case O_P:
+			v = conv_rule(VR((P)obj)->name);
+			for ( dc = DC((P)obj); dc; dc = NEXT(dc) ) {
+				if ( !DEG(dc) )
+					objtotex_tb((Obj)COEF(dc),tb);
+				else {
+					if ( NUM(COEF(dc)) && UNIQ((Q)COEF(dc)) )
+						;
+					else if ( NUM(COEF(dc)) && MUNIQ((Q)COEF(dc)) )
+						write_tb("-",tb);
+					else if ( NUM(COEF(dc)) || !NEXT(DC(COEF(dc)))) 
+						objtotex_tb((Obj)COEF(dc),tb); 
+					else {
+						write_tb("(",tb); objtotex_tb((Obj)COEF(dc),tb);
+						write_tb(")",tb);
+					}
+					write_tb(v,tb);
+					if ( cmpq(DEG(dc),ONE) ) {
+						write_tb("^",tb);
+						if ( INT(DEG(dc)) && SGN(DEG(dc))>0 ) {
+							write_tb("{",tb);
+							objtotex_tb((Obj)DEG(dc),tb);
+							write_tb("}",tb);
+						} else {
+							write_tb("{",tb); objtotex_tb((Obj)DEG(dc),tb);
+							write_tb("}",tb);
+						}
+					}
+				}
+				if ( NEXT(dc) ) {
+					t = COEF(NEXT(dc));
+					if ( !DEG(NEXT(dc)) ) {
+						if ( NUM(t) ) {
+							if ( !mmono(t) ) write_tb("+",tb);
+						} else {
+							if ( !mmono(COEF(DC(t))) ) write_tb("+",tb);
+						}
+					} else {
+						if ( !mmono(t) ) write_tb("+",tb);
+					}
+				}
+			}
+			break;
+		case O_R:
+			write_tb("\\frac{",tb);
+			objtotex_tb((Obj)NM((R)obj),tb);
+			write_tb("}{",tb);
+			objtotex_tb((Obj)DN((R)obj),tb);
+			write_tb("}",tb);
+			break;
+		default:
+			write_tb(objtostr(obj),tb);
+			break;
+	}
+}
+
 char *objtostr(Obj obj)
 {
 	int len;
@@ -1958,9 +2043,13 @@ int top_is_minus(FNODE f)
 					case O_N:
 						return mmono((P)obj);
 					case O_P:
+#if 0
 						/* must be a variable */
 						opname = conv_rule(VR((P)obj)->name);
 						return opname[0]=='-';
+#else
+						return mmono((P)obj);
+#endif
 					default:
 						/* ??? */
 						len = estimate_length(CO,obj);
@@ -2184,9 +2273,16 @@ VL reordvars(VL vl0,NODE head)
 	return vl;
 }
 
-VL qt_current_ord;
-LIST qt_current_ord_obj;
+struct wtab {
+	V v;
+	int w;
+};
 
+struct wtab *qt_weight_tab;
+VL qt_current_ord, qt_current_coef;
+LIST qt_current_ord_obj,qt_current_coef_obj,qt_current_weight_obj;
+LIST qt_current_weight_obj;
+
 void Pqt_set_ord(NODE arg,LIST *rp)
 {
 	NODE r0,r;
@@ -2195,7 +2291,10 @@ void Pqt_set_ord(NODE arg,LIST *rp)
 
 	if ( !argc(arg) ) 
 		*rp = qt_current_ord_obj;
-	else {
+	else if ( !ARG0(arg) ) {
+		qt_current_ord_obj = 0;
+		qt_current_ord = 0;
+	} 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;
@@ -2206,6 +2305,59 @@ void Pqt_set_ord(NODE arg,LIST *rp)
 	}
 }
 
+void Pqt_set_weight(NODE arg,LIST *rp)
+{
+	NODE n,pair;
+	int l,i;
+	struct wtab *tab;
+
+	if ( !argc(arg) ) 
+		*rp = qt_current_weight_obj;
+	else if ( !ARG0(arg) ) {
+		qt_current_weight_obj = 0;
+		qt_weight_tab = 0;
+	} else {
+		n = BDY((LIST)ARG0(arg));
+		l = length(n);
+		tab = qt_weight_tab = (struct wtab *)MALLOC((l+1)*sizeof(struct wtab));
+		for ( i = 0; i < l; i++, n = NEXT(n) ) {
+			pair = BDY((LIST)BDY(n));
+			tab[i].v = VR((P)ARG0(pair));
+			tab[i].w = QTOS((Q)ARG1(pair));
+		}
+		tab[i].v = 0;
+		qt_current_weight_obj = (LIST)ARG0(arg);
+		*rp = qt_current_weight_obj;
+	}
+}
+
+void Pqt_set_coef(NODE arg,LIST *rp)
+{
+	NODE r0,r,n;
+	VL vl0,vl;
+	P v;
+
+	if ( !argc(arg) ) 
+		*rp = qt_current_coef_obj;
+	else if ( !ARG0(arg) ) {
+		qt_current_coef_obj = 0;
+		qt_current_coef = 0;
+	} else {
+		n = BDY((LIST)ARG0(arg));
+		for ( vl0 = 0, r0 = 0; n; n = NEXT(n) ) {
+			NEXTNODE(r0,r);
+			NEXTVL(vl0,vl);
+			vl->v = VR((P)BDY(n));
+			MKV(vl->v,v); BDY(r) = v;
+		}
+		if ( r0 ) NEXT(r) = 0;
+		if ( vl0 ) NEXT(vl) = 0;
+		qt_current_coef = vl0;
+		MKLIST(*rp,r0);
+		qt_current_coef_obj = *rp;
+	}
+}
+
 void Pqt_normalize(NODE arg,QUOTE *rp)
 {
 	QUOTE q,r;
@@ -2282,13 +2434,13 @@ void Pnbp_ht(NODE arg, NBP *rp)
 	else {
 		m = (NBM)BDY(BDY(p));
 		NEWNBM(m1);
-		m1->d = m->d; m1->c = ONE; m1->b = m->b;
+		m1->d = m->d; m1->c = (P)ONE; m1->b = m->b;
 		MKNODE(n,m1,0);
 		MKNBP(*rp,n);
 	}
 }
 
-void Pnbp_hc(NODE arg, Q *rp)
+void Pnbp_hc(NODE arg, P *rp)
 {
 	NBP p;
 	NBM m;
@@ -2316,6 +2468,76 @@ void Pnbp_rest(NODE arg, NBP *rp)
 	}
 }
 
+void Pnbp_tm(NODE arg, NBP *rp)
+{
+	NBP p;
+	NODE n;
+	NBM m;
+
+	p = (NBP)ARG0(arg);
+	if ( !p ) *rp = 0;
+	else {
+		for ( n = BDY(p); NEXT(n); n = NEXT(n) );
+		m = (NBM)BDY(n);
+		MKNODE(n,m,0);
+		MKNBP(*rp,n);
+	}
+}
+	
+void Pnbp_tt(NODE arg, NBP *rp)
+{
+	NBP p;
+	NODE n;
+	NBM m,m1;
+
+	p = (NBP)ARG0(arg);
+	if ( !p ) *rp = 0;
+	else {
+		for ( n = BDY(p); NEXT(n); n = NEXT(n) );
+		m = (NBM)BDY(n);
+		NEWNBM(m1);
+		m1->d = m->d; m1->c = (P)ONE; m1->b = m->b;
+		MKNODE(n,m1,0);
+		MKNBP(*rp,n);
+	}
+}
+
+void Pnbp_tc(NODE arg, P *rp)
+{
+	NBP p;
+	NBM m;
+	NODE n;
+
+	p = (NBP)ARG0(arg);
+	if ( !p ) *rp = 0;
+	else {
+		for ( n = BDY(p); NEXT(n); n = NEXT(n) );
+		m = (NBM)BDY(n);
+		*rp = m->c;
+	}
+}
+
+void Pnbp_trest(NODE arg, NBP *rp)
+{
+	NBP p;
+	NODE n,r,r0;
+
+	p = (NBP)ARG0(arg);
+	if ( !p ) *rp = 0;
+	else {
+		n = BDY(p);
+		for ( r0 = 0; NEXT(n); n = NEXT(n) ) {
+			NEXTNODE(r0,r);
+			BDY(r) = (pointer)BDY(n);
+		}
+		if ( r0 ) {
+			NEXT(r) = 0;
+			MKNBP(*rp,r0);
+		} else
+			*rp = 0;
+	}
+}
+
 void Pnbm_deg(NODE arg, Q *rp)
 {
 	NBP p;
@@ -2330,6 +2552,28 @@ void Pnbm_deg(NODE arg, Q *rp)
 	}
 }
 
+void Pnbm_index(NODE arg, Q *rp)
+{
+	NBP p;
+	NBM m;
+	unsigned int *b;
+	int d,i,r;
+
+	p = (NBP)ARG0(arg);
+	if ( !p )
+		STOQ(0,*rp);
+	else {
+		m = (NBM)BDY(BDY(p));	
+		d = m->d;
+		if ( d > 32 )
+			error("nbm_index : weight too large");
+		b = m->b;
+		for ( r = 0, i = d-2; i > 0; i-- )
+			if ( !NBM_GET(b,i) ) r |= (1<<(d-2-i));
+		STOQ(r,*rp);
+	}
+}
+
 void Pnbm_hp_rest(NODE arg, LIST *rp)
 {
 	NBP p,h,r;
@@ -2351,14 +2595,14 @@ void Pnbm_hp_rest(NODE arg, LIST *rp)
 			for ( i = 1; i < d; i++ )
 				if ( NBM_GET(b,i) != v ) break;
 			NEWNBM(m1); NEWNBMBDY(m1,i); 
-			b1 = m1->b; m1->d = i; m1->c = ONE;
+			b1 = m1->b; m1->d = i; m1->c = (P)ONE;
 			if ( v ) for ( j = 0; j < i; j++ ) NBM_SET(b1,j);
 			else for ( j = 0; j < i; j++ ) NBM_CLR(b1,j);
 			MKNODE(n,m1,0); MKNBP(h,n);
 
 			d1 = d-i;
 			NEWNBM(m1); NEWNBMBDY(m1,d1);
-			b1 = m1->b; m1->d = d1; m1->c = ONE;
+			b1 = m1->b; m1->d = d1; m1->c = (P)ONE;
 			for ( j = 0, k = i; j < d1; j++, k++ )
 				if ( NBM_GET(b,k) ) NBM_SET(b1,j);
 				else NBM_CLR(b1,j);
@@ -2413,6 +2657,28 @@ void Pnbm_rest(NODE arg, NBP *rp)
 		separate_nbm((NBM)BDY(BDY(p)),0,0,rp);
 }
 
+void Pnbm_tv(NODE arg, NBP *rp)
+{
+	NBP p;
+	
+	p = (NBP)ARG0(arg);
+	if ( !p )
+		*rp = 0;
+	else
+		separate_tail_nbm((NBM)BDY(BDY(p)),0,0,rp);
+}
+
+void Pnbm_trest(NODE arg, NBP *rp)
+{
+	NBP p;
+	
+	p = (NBP)ARG0(arg);
+	if ( !p )
+		*rp = 0;
+	else
+		separate_tail_nbm((NBM)BDY(BDY(p)),0,rp,0);
+}
+
 NBP fnode_to_nbp(FNODE f)
 {
 	Q r;
@@ -2426,10 +2692,10 @@ NBP fnode_to_nbp(FNODE f)
 		r = eval(f);
 		NEWNBM(m);
 		if ( OID(r) == O_N ) {
-			m->d = 0; m->c = (Q)r; m->b = 0;
+			m->d = 0; m->c = (P)r; m->b = 0;
 		} else {
 			v = VR((P)r);
-			m->d = 1; m->c = ONE; NEWNBMBDY(m,1);
+			m->d = 1; m->c = (P)ONE; NEWNBMBDY(m,1);
 			if ( !strcmp(NAME(v),"x") ) NBM_SET(m->b,0);
 			else NBM_CLR(m->b,0);
 		}
@@ -2457,6 +2723,18 @@ NBP fnode_to_nbp(FNODE f)
 	}
 }
 
+void Pnqt_weight(NODE arg,Q *rp)
+{
+	QUOTE q;
+	FNODE f;
+	int w;
+
+	q = (QUOTE)ARG0(arg); f = (FNODE)BDY(q);
+	f = fnode_normalize(f,0);
+	w = nfnode_weight(qt_weight_tab,f);
+	STOQ(w,*rp);
+}
+
 void Pnqt_comp(NODE arg,Q *rp)
 {
 	QUOTE q1,q2;
@@ -2471,12 +2749,72 @@ void Pnqt_comp(NODE arg,Q *rp)
 	STOQ(r,*rp);
 }
 
-INLINE int fnode_is_number(FNODE f)
+int fnode_is_var(FNODE f)
 {
 	Obj obj;
+	VL vl,t,s;
+	DCP dc;
 
+	if ( fnode_is_coef(f) ) return 0;
 	switch ( f->id ) {
+		case I_PAREN:
+			return fnode_is_var(FA0(f));
+				
+		case I_FORMULA:
+			obj = FA0(f);
+			if ( obj && OID(obj) == O_P ) {
+				dc = DC((P)obj);
+				if ( !cmpq(DEG(dc),ONE) && !NEXT(dc) 
+					&& !arf_comp(CO,(Obj)COEF(dc),(Obj)ONE) ) return 1;
+				else return 0;
+			} else return 0;
+		
+		default:
+			return 0;
+	}
+}
+
+int fnode_is_coef(FNODE f)
+{
+	Obj obj;
+	VL vl,t,s;
+
+	switch ( f->id ) {
 		case I_MINUS: case I_PAREN:
+			return fnode_is_coef(FA0(f));
+				
+		case I_FORMULA:
+			obj = FA0(f);
+			if ( !obj ) return 1;
+			else if ( OID(obj) == O_QUOTE ) 
+				return fnode_is_coef(BDY((QUOTE)obj));
+			else if ( NUM(obj) ) return 1;
+			else if ( OID(obj) == O_P || OID(obj) == O_R) {
+				get_vars_recursive(obj,&vl);
+				for ( t = vl; t; t = NEXT(t) ) {
+					if ( t->v->attr == (pointer)V_PF ) continue;
+					for ( s = qt_current_coef; s; s = NEXT(s) )
+						if ( t->v == s->v ) break;
+					if ( !s )
+						return 0;
+				}
+				return 1;
+			} else return 0;
+		
+		case I_BOP:
+			return fnode_is_coef(FA1(f)) && fnode_is_coef(FA2(f));
+		
+		default:
+			return 0;
+	}
+}
+
+int fnode_is_number(FNODE f)
+{
+	Obj obj;
+
+	switch ( f->id ) {
+		case I_MINUS: case I_PAREN:
 			return fnode_is_number(FA0(f));
 				
 		case I_FORMULA:
@@ -2631,7 +2969,7 @@ FNODE fnode_normalize(FNODE f,int expand)
 			break;
 		
 		case I_MINUS:
-			r = nfnode_mul_coef((Num)q,
+			r = nfnode_mul_coef((Obj)q,
 				fnode_normalize(FA0(f),expand),expand);
 			break;
 
@@ -2644,7 +2982,7 @@ FNODE fnode_normalize(FNODE f,int expand)
 					r = nfnode_add(a1,a2,expand);
 					break;
 				case '-':
-					a2 = nfnode_mul_coef((Num)q,a2,expand);
+					a2 = nfnode_mul_coef((Obj)q,a2,expand);
 					r = nfnode_add(a1,a2,expand);
 					break;
 				case '*':
@@ -2731,7 +3069,7 @@ FNODE nfnode_add(FNODE f1,FNODE f2,int expand)
 	NODE n1,n2,r0,r;
 	FNODE b1,b2;
 	int s;
-	Num c1,c2,c;
+	Obj c1,c2,c;
 
 	if ( IS_ZERO(f1) ) return f2;
 	else if ( IS_ZERO(f2) ) return f1;
@@ -2745,7 +3083,7 @@ FNODE nfnode_add(FNODE f1,FNODE f2,int expand)
 		} else if ( s < 0 ) {
 			NEXTNODE(r0,r); BDY(r) = BDY(n2); n2 = NEXT(n2);
 		} else {
-			addnum(0,c1,c2,&c);
+			arf_add(CO,c1,c2,&c);
 			if ( c ) {
 				NEXTNODE(r0,r); BDY(r) = nfnode_mul_coef(c,b1,expand);
 			}
@@ -2768,7 +3106,7 @@ FNODE fnode_node_to_nary(ARF op,NODE n)
 {
 	if ( !n ) {
 		if ( op->name[0] == '+' )
-			return mkfnode(1,I_FORMULA,0);
+			return mkfnode(1,I_FORMULA,NULLP);
 		else
 			return mkfnode(1,I_FORMULA,ONE);
 	} else if ( !NEXT(n) ) return BDY(n);
@@ -2781,17 +3119,17 @@ FNODE nfnode_mul(FNODE f1,FNODE f2,int expand)
 	FNODE b1,b2,e1,e2,cc,t,t1;
 	FNODE *m;
 	int s;
-	Num c1,c2,c,e;
+	Obj c1,c2,c,e;
 	int l1,l,i,j;
 
-	if ( IS_ZERO(f1) || IS_ZERO(f2) ) return mkfnode(1,I_FORMULA,0);
-	else if ( fnode_is_number(f1) ) 
-		return nfnode_mul_coef((Num)eval(f1),f2,expand);
-	else if ( fnode_is_number(f2) ) 
-		return nfnode_mul_coef((Num)eval(f2),f1,expand);
+	if ( IS_ZERO(f1) || IS_ZERO(f2) ) return mkfnode(1,I_FORMULA,NULLP);
+	else if ( fnode_is_coef(f1) ) 
+		return nfnode_mul_coef((Obj)eval(f1),f2,expand);
+	else if ( fnode_is_coef(f2) ) 
+		return nfnode_mul_coef((Obj)eval(f2),f1,expand);
 
 	if ( expand && IS_NARYADD(f1) ) {
-		t = mkfnode(1,I_FORMULA,0);
+		t = mkfnode(1,I_FORMULA,NULLP);
 		for ( n1 = (NODE)FA1(f1); n1; n1 = NEXT(n1) ) {
 			t1 = nfnode_mul(BDY(n1),f2,expand);
 			t = nfnode_add(t,t1,expand);
@@ -2799,7 +3137,7 @@ FNODE nfnode_mul(FNODE f1,FNODE f2,int expand)
 		return t;
 	}
 	if ( expand && IS_NARYADD(f2) ) {
-		t = mkfnode(1,I_FORMULA,0);
+		t = mkfnode(1,I_FORMULA,NULLP);
 		for ( n2 = (NODE)FA1(f2); n2; n2 = NEXT(n2) ) {
 			t1 = nfnode_mul(f1,BDY(n2),expand);
 			t = nfnode_add(t,t1,expand);
@@ -2808,8 +3146,8 @@ FNODE nfnode_mul(FNODE f1,FNODE f2,int expand)
 	}
 
 	fnode_coef_body(f1,&c1,&b1); fnode_coef_body(f2,&c2,&b2);
-	mulnum(0,c1,c2,&c);
-	if ( !c ) return mkfnode(1,I_FORMULA,0);
+	arf_mul(CO,c1,c2,&c);
+	if ( !c ) return mkfnode(1,I_FORMULA,NULLP);
 
 
 	n1 = (NODE)FA1(to_narymul(b1)); n2 = (NODE)FA1(to_narymul(b2));
@@ -2817,14 +3155,24 @@ FNODE nfnode_mul(FNODE f1,FNODE f2,int expand)
 	m = (FNODE *)ALLOCA(l*sizeof(FNODE));
 	for ( r = n1, i = 0; i < l1; r = NEXT(r), i++ ) m[i] = BDY(r);
 	for ( r = n2; r; r = NEXT(r) ) {
-		if ( i == 0 || (expand == 2) )
+		if ( i == 0 )
 			m[i++] = BDY(r);
 		else {
 			fnode_base_exp(m[i-1],&b1,&e1); fnode_base_exp(BDY(r),&b2,&e2);
 			if ( compfnode(b1,b2) ) break;
-			addnum(0,eval(e1),eval(e2),&e);
+			arf_add(CO,eval(e1),eval(e2),&e);
 			if ( !e ) i--;
-			else if ( UNIQ(e) )
+			else if ( expand == 2 ) {
+				if ( INT(e) && SGN((Q)e) < 0 ) {
+					t1 = mkfnode(3,I_BOP,pwrfs,b1,mkfnode(1,I_FORMULA,e));
+					/* r=(r0|rest)->(r0,t1|rest) */
+					t = BDY(r);
+					MKNODE(r1,t1,NEXT(r));
+					MKNODE(r,t,r1);
+					i--;
+				} else
+					m[i++] = BDY(r);
+			} else if ( UNIQ(e) )
 				m[i-1] = b1;
 			else
 				m[i-1] = mkfnode(3,I_BOP,pwrfs,b1,mkfnode(1,I_FORMULA,e));
@@ -2842,22 +3190,25 @@ FNODE nfnode_mul(FNODE f1,FNODE f2,int expand)
 FNODE nfnode_pwr(FNODE f1,FNODE f2,int expand)
 {
 	FNODE b,b1,e1,e,cc,r,mf2,mone,inv;
-	Num c,c1,nf2;
+	Obj c,c1;
+	Num 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_number(f1) ) {
+	else if ( IS_ZERO(f1) ) return mkfnode(1,I_FORMULA,NULLP);
+	else if ( fnode_is_coef(f1) ) {
 		if ( fnode_is_integer(f2) ) {
 			if ( fnode_is_one(f2) ) return f1;
 			else {
-				pwrnum(0,(Num)eval(f1),(Num)eval(f2),&c);
+				arf_pwr(CO,eval(f1),(Obj)eval(f2),&c);
 				return mkfnode(1,I_FORMULA,c);
 			}
-		} else
+		} else {
+			f1 = mkfnode(1,I_FORMULA,eval(f1));
 			return mkfnode(3,I_BOP,pwrfs,f1,f2);
+		}
 	} else if ( IS_BINARYPWR(f1) ) {
 		b1 = FA1(f1); e1 = FA2(f1);
 		e = nfnode_mul(e1,f2,expand);
@@ -2869,7 +3220,7 @@ FNODE nfnode_pwr(FNODE f1,FNODE f2,int expand)
 		&& fnode_is_integer(f2) ) {
 		fnode_coef_body(f1,&c1,&b1);
 		nf2 = (Num)eval(f2);
-		pwrnum(0,(Num)c1,nf2,&c);
+		arf_pwr(CO,c1,(Obj)nf2,&c);
 		ee = QTOS((Q)nf2);
 		cc = mkfnode(1,I_FORMULA,c);
 		if ( fnode_is_nonnegative_integer(f2) )
@@ -2905,7 +3256,7 @@ FNODE fnode_expand_pwr(FNODE f,int n,int expand)
 	Q q;
 
 	if ( !n ) return mkfnode(1,I_FORMULA,ONE);
-	else if ( IS_ZERO(f) ) return mkfnode(1,I_FORMULA,0);
+	else if ( IS_ZERO(f) ) return mkfnode(1,I_FORMULA,NULLP);
 	else if ( n == 1 ) return f;
 	else {
 		switch ( expand ) {
@@ -2961,17 +3312,17 @@ FNODE to_narymul(FNODE f)
 	return r;
 }
 
-FNODE nfnode_mul_coef(Num c,FNODE f,int expand)
+FNODE nfnode_mul_coef(Obj c,FNODE f,int expand)
 {
 	FNODE b1,cc;
-	Num c1,c2;
+	Obj c1,c2;
 	NODE n,r,r0;
 
 	if ( !c )
-		return mkfnode(I_FORMULA,0);
+		return mkfnode(1,I_FORMULA,NULLP);
 	else {
 		fnode_coef_body(f,&c1,&b1);
-		mulnum(0,c,c1,&c2);
+		arf_mul(CO,c,c1,&c2);
 		if ( UNIQ(c2) ) return b1;
 		else {
 			cc = mkfnode(1,I_FORMULA,c2);
@@ -2996,90 +3347,140 @@ FNODE nfnode_mul_coef(Num c,FNODE f,int expand)
 	}
 }
 
-void fnode_coef_body(FNODE f,Num *cp,FNODE *bp)
+void fnode_coef_body(FNODE f,Obj *cp,FNODE *bp)
 {
 	FNODE c;
 
-	if ( fnode_is_number(f) ) {
-		*cp = eval(f); *bp = mkfnode(1,I_FORMULA,ONE);
+	if ( fnode_is_coef(f) ) {
+		*cp = (Obj)eval(f); *bp = mkfnode(1,I_FORMULA,ONE);
 	} else if ( IS_NARYMUL(f) ) {
 		c=(FNODE)BDY((NODE)FA1(f));
-		if ( fnode_is_number(c) ) {
-			*cp = eval(c);
+		if ( fnode_is_coef(c) ) {
+			*cp = (Obj)eval(c);
 			*bp = fnode_node_to_nary(mulfs,NEXT((NODE)FA1(f)));
 		} else {
-			*cp = (Num)ONE; *bp = f;
+			*cp = (Obj)ONE; *bp = f;
 		}
 	} else {
-		*cp = (Num)ONE; *bp = f;
+		*cp = (Obj)ONE; *bp = f;
 	}
 }
 
-int nfnode_comp_pwr(FNODE f1,FNODE f2);
+int nfnode_weight(struct wtab *tab,FNODE f)
+{
+	NODE n;
+	int w,w1;
+	int i;
+	Q a2;
+	V v;
 
+	switch ( f->id ) {
+		case I_FORMULA:
+			if ( fnode_is_coef(f) ) return 0;
+			else if ( fnode_is_var(f) ) {
+				if ( !tab ) return 0;
+				v = VR((P)FA0(f));
+				for ( i = 0; tab[i].v; i++ )
+					if ( v == tab[i].v ) return tab[i].w;
+				return 0;
+			} else return 0;
+
+		/* XXX */
+		case I_PVAR: return 1;
+		/* XXX */
+		case I_FUNC: I_FUNC: I_FUNC_QARG:
+			/* w(f) = 1 */
+			/* w(f(a1,...,an)=w(a1)+...+w(an) */
+			n = FA0((FNODE)FA1(f));
+			for ( w = 0; n; n = NEXT(n) )
+				w += nfnode_weight(tab,BDY(n));
+			return w;
+		case I_NARYOP:
+			n = (NODE)FA1(f);
+			if ( IS_NARYADD(f) )
+				for ( w = nfnode_weight(tab,BDY(n)),
+					n = NEXT(n); n; n = NEXT(n) ) {
+					w1 = nfnode_weight(tab,BDY(n));
+					w = MAX(w,w1);
+				}
+			else
+				for ( w = 0; n; n = NEXT(n) )
+					w += nfnode_weight(tab,BDY(n));
+			return w;
+		case I_BOP:
+			/* must be binary power */
+			/* XXX w(2^x)=0 ? */
+			if ( fnode_is_rational(FA2(f)) ) {
+				a2 = (Q)eval(FA2(f));
+				w = QTOS(a2);
+			} else
+				w = nfnode_weight(tab,FA2(f));
+			return nfnode_weight(tab,FA1(f))*w;
+		default:
+			error("nfnode_weight : not_implemented");
+	}
+}
+
 int nfnode_comp(FNODE f1,FNODE f2)
 {
+	int w1,w2;
+
+	if ( qt_weight_tab ) {
+		w1 = nfnode_weight(qt_weight_tab,f1);
+		w2 = nfnode_weight(qt_weight_tab,f2);
+		if ( w1 > w2 ) return 1;
+		if ( w1 < w2 ) return -1;
+	}
+	return nfnode_comp_lex(f1,f2);
+}
+
+int nfnode_comp_lex(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;
+	FNODE b1,b2,e1,e2,g,a1,a2,fn1,fn2,h1,h2;
+	Num ee,ee1;
+	Obj c1,c2;
+	int w1,w2;
 
 	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);
+		for ( ; n1 && n2; n1 = NEXT(n1), n2 = NEXT(n2) ) {
+			r = nfnode_comp_lex(BDY(n1),BDY(n2));
+			if ( r ) return r;
+		}
+		if ( !n1 && !n2 ) return 0;
+		h1 = n1 ? (FNODE)BDY(n1) : mkfnode(1,I_FORMULA,NULLP);
+		h2 = n2 ? (FNODE)BDY(n2) : mkfnode(1,I_FORMULA,NULLP);
+		return nfnode_comp_lex(h1,h2);
 	}
 	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);
+		if ( !compfnode(b1,b2) ) return arf_comp(CO,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;
-				}
-			}
+		for ( ; n1 && n2; n1 = NEXT(n1), n2 = NEXT(n2) ) {
+			r = nfnode_comp_lex(BDY(n1),BDY(n2));
+			if ( r ) return r;
 		}
+		if ( !n1 && !n2 ) return 0;
+		h1 = n1 ? (FNODE)BDY(n1) : mkfnode(1,I_FORMULA,ONE);
+		h2 = n2 ? (FNODE)BDY(n2) : mkfnode(1,I_FORMULA,ONE);
+		return nfnode_comp_lex(h1,h2);
 	}
-	if ( IS_BINARYPWR(f1) || IS_BINARYPWR(f2) )
-		return nfnode_comp_pwr(f1,f2);
+	if ( IS_BINARYPWR(f1) || IS_BINARYPWR(f2) ) {
+		fnode_base_exp(f1,&b1,&e1);
+		fnode_base_exp(f2,&b2,&e2);
+		if ( r = nfnode_comp_lex(b1,b2) ) {
+			if ( r > 0 )
+				return nfnode_comp_lex(e1,mkfnode(1,I_FORMULA,NULLP));
+			else if ( r < 0 )
+				return nfnode_comp_lex(mkfnode(1,I_FORMULA,NULLP),e2);
+		} else return nfnode_comp_lex(e1,e2);
+	}
 				
 	/* now, IDs of f1 and f2 must be I_FORMULA, I_FUNC, I_IFUNC or I_PVAR */
 	/* I_IFUNC > I_PVAR > I_FUNC=I_FUNC_QARG > I_FORMULA */
@@ -3091,7 +3492,7 @@ int nfnode_comp(FNODE f1,FNODE f2)
 				case I_FUNC: case I_IFUNC: case I_PVAR:
 					return -1;
 				default:
-					error("nfnode_comp : undefined");
+					error("nfnode_comp_lex : undefined");
 			}
 			break;
 		case I_FUNC: case I_FUNC_QARG:
@@ -3109,7 +3510,7 @@ int nfnode_comp(FNODE f1,FNODE f2)
 						/* 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;
+							if ( r = nfnode_comp_lex(BDY(n1),BDY(n2)) ) return r;
 							else {
 								n1 = NEXT(n1); n2 = NEXT(n2);
 							}
@@ -3117,7 +3518,7 @@ int nfnode_comp(FNODE f1,FNODE f2)
 					}
 					break;
 				default:
-					error("nfnode_comp : undefined");
+					error("nfnode_comp_lex : undefined");
 			}
 		case I_PVAR:
 			switch ( f2->id ) {
@@ -3131,7 +3532,7 @@ int nfnode_comp(FNODE f1,FNODE f2)
 					else if ( i1 < i2 ) return -1;
 					else return 0;
 				default:
-					error("nfnode_comp : undefined");
+					error("nfnode_comp_lex : undefined");
 			}
 			break;
 		case I_IFUNC:
@@ -3147,7 +3548,7 @@ int nfnode_comp(FNODE f1,FNODE f2)
 						/* 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;
+							if ( r = nfnode_comp_lex(BDY(n1),BDY(n2)) ) return r;
 							else {
 								n1 = NEXT(n1); n2 = NEXT(n2);
 							}
@@ -3156,29 +3557,14 @@ int nfnode_comp(FNODE f1,FNODE f2)
 					break;
 
 				default:
-					error("nfnode_comp : undefined");
+					error("nfnode_comp_lex : undefined");
 			}
 			break;
 		default:
-			error("nfnode_comp : undefined");
+			error("nfnode_comp_lex : 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;
@@ -3251,7 +3637,7 @@ int nfnode_match(FNODE f,FNODE pat,NODE *rp)
 			} else {
 				/* XXX : I_FUNC_HEAD is a dummy id to pass FUNC */
 				fh = mkfnode(1,I_FUNC_HEAD,FA0(f));
-				m = mknode(1,mknode(2,FA0((FNODE)FA0(pat)),fh),0);
+				m = mknode(1,mknode(2,FA0((FNODE)FA0(pat)),fh),NULLP);
 			}
 			/* FA1(f) and FA1(pat) are I_LIST */
 			fa = (NODE)FA0((FNODE)FA1(f));