=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v retrieving revision 1.110 retrieving revision 1.124 diff -u -p -r1.110 -r1.124 --- OpenXM_contrib2/asir2000/builtin/strobj.c 2005/12/14 09:06:54 1.110 +++ OpenXM_contrib2/asir2000/builtin/strobj.c 2015/08/14 13:51:54 1.124 @@ -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.109 2005/12/14 06:07:30 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.123 2015/08/06 10:01:52 fujimoto 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__) #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; @@ -96,17 +97,18 @@ void Pqt_is_integer(),Pqt_is_rational(),Pqt_is_number( 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(); @@ -170,6 +172,7 @@ struct ftab str_tab[] = { {"qt_match",Pqt_match,2}, {"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}, @@ -180,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}, @@ -460,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; @@ -839,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); } @@ -1278,6 +1288,7 @@ NODE arg; Obj *rp; { FNODE fnode; + SNODE snode; char *cmd; #if defined(PARI) void recover(int); @@ -1291,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) @@ -1314,6 +1330,7 @@ NODE arg; P *rp; { char *p; + FUNC f; p = BDY((STRING)ARG0(arg)); #if 0 @@ -1327,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 } @@ -1415,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) { @@ -1438,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; @@ -1506,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); @@ -1523,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: @@ -1784,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 */ @@ -1826,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; @@ -1941,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); @@ -2328,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; @@ -2362,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; @@ -2376,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; @@ -2397,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); @@ -2459,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; @@ -2472,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); } @@ -2503,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; @@ -2560,9 +2792,11 @@ int fnode_is_coef(FNODE f) 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; + if ( !s ) + return 0; } return 1; } else return 0; @@ -2872,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); @@ -2888,14 +3122,14 @@ FNODE nfnode_mul(FNODE f1,FNODE f2,int expand) Obj c1,c2,c,e; int l1,l,i,j; - if ( IS_ZERO(f1) || IS_ZERO(f2) ) return mkfnode(1,I_FORMULA,0); + 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); @@ -2903,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); @@ -2913,7 +3147,7 @@ FNODE nfnode_mul(FNODE f1,FNODE f2,int expand) fnode_coef_body(f1,&c1,&b1); fnode_coef_body(f2,&c2,&b2); arf_mul(CO,c1,c2,&c); - if ( !c ) return mkfnode(1,I_FORMULA,0); + if ( !c ) return mkfnode(1,I_FORMULA,NULLP); n1 = (NODE)FA1(to_narymul(b1)); n2 = (NODE)FA1(to_narymul(b2)); @@ -2921,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; 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)); @@ -2953,7 +3197,7 @@ FNODE nfnode_pwr(FNODE f1,FNODE f2,int expand) 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 ( 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; @@ -3012,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 ) { @@ -3075,7 +3319,7 @@ FNODE nfnode_mul_coef(Obj c,FNODE f,int expand) NODE n,r,r0; if ( !c ) - return mkfnode(I_FORMULA,0); + return mkfnode(1,I_FORMULA,NULLP); else { fnode_coef_body(f,&c1,&b1); arf_mul(CO,c,c1,&c2); @@ -3134,10 +3378,11 @@ int nfnode_weight(struct wtab *tab,FNODE f) 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 w; + return 0; } else return 0; /* XXX */ @@ -3194,7 +3439,7 @@ 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; + FNODE b1,b2,e1,e2,g,a1,a2,fn1,fn2,h1,h2; Num ee,ee1; Obj c1,c2; int w1,w2; @@ -3202,12 +3447,14 @@ int nfnode_comp_lex(FNODE f1,FNODE f2) 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_lex(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); @@ -3215,51 +3462,23 @@ int nfnode_comp_lex(FNODE f1,FNODE f2) 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_lex(b1,b2) ) { - if ( r > 0 ) - return nfnode_comp_lex(e1,mkfnode(1,I_FORMULA,0)); - else if ( r < 0 ) - return nfnode_comp_lex(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_lex(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) ) { 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,0)); + return nfnode_comp_lex(e1,mkfnode(1,I_FORMULA,NULLP)); else if ( r < 0 ) - return nfnode_comp_lex(mkfnode(1,I_FORMULA,0),e2); + return nfnode_comp_lex(mkfnode(1,I_FORMULA,NULLP),e2); } else return nfnode_comp_lex(e1,e2); } @@ -3418,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));