=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v retrieving revision 1.75 retrieving revision 1.79 diff -u -p -r1.75 -r1.79 --- OpenXM_contrib2/asir2000/builtin/strobj.c 2005/10/15 01:10:15 1.75 +++ OpenXM_contrib2/asir2000/builtin/strobj.c 2005/10/19 10:31:18 1.79 @@ -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.74 2005/10/14 07:49:21 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.78 2005/10/17 00:38:11 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -64,6 +64,7 @@ struct TeXSymbol { }; #define OPNAME(f) (((ARF)FA0(f))->name[0]) +#define IS_ZERO(f) (((f)->id==I_FORMULA) && FA0(f)==0 ) #define IS_BINARYPWR(f) (((f)->id==I_BOP) &&(OPNAME(f)=='^')) #define IS_NARYADD(f) (((f)->id==I_NARYOP) &&(OPNAME(f)=='+')) #define IS_NARYMUL(f) (((f)->id==I_NARYOP) &&(OPNAME(f)=='*')) @@ -124,7 +125,7 @@ struct ftab str_tab[] = { {"quote_is_function",Pquote_is_function,1}, {"quote_is_dependent",Pquote_is_dependent,2}, - {"quote_normalize",Pquote_normalize,1}, + {"quote_normalize",Pquote_normalize,-2}, {"quote_to_nary",Pquote_to_nary,1}, {"quote_to_bin",Pquote_to_bin,2}, @@ -533,7 +534,6 @@ void Pwrite_to_tb(NODE arg,Q *rp) } FNODE partial_eval(FNODE), fnode_to_nary(FNODE), fnode_to_bin(FNODE,int); -FNODE fnode_normalize(FNODE); void Pquote_to_nary(NODE arg,QUOTE *rp) { @@ -663,20 +663,20 @@ void Pquote_match_rewrite(NODE arg,Obj *rp) NEXTNODE(s0,s); pair = BDY((LIST)BDY(t)); ind = (int)FA0((FNODE)BDY((QUOTE)BDY(pair))); - value = mkfnode(1,I_FORMULA,BDY(NEXT(pair))); + value = BDY((QUOTE)(BDY(NEXT(pair)))); BDY(s) = mknode(2,ind,value); } if ( s0 ) NEXT(s) = 0; switch ( ac = argc(arg) ) { case 3: h = rewrite_fnode(BDY((QUOTE)ARG2(arg)),s0); - *rp = eval(h); + MKQUOTE(q,h); *rp = (Obj)q; break; case 4: c = rewrite_fnode(BDY((QUOTE)ARG2(arg)),s0); if ( eval(c) ) { h = rewrite_fnode(BDY((QUOTE)ARG3(arg)),s0); - *rp = eval(h); + MKQUOTE(q,h); *rp = (Obj)q; } else *rp = VOIDobj; break; @@ -1924,20 +1924,24 @@ void Pfunargs_to_quote(NODE arg,QUOTE *rp) MKQUOTE(*rp,f); } -FNODE fnode_apply(FNODE f,FNODE (*func)()); -FNODE fnode_normalize(FNODE f); +FNODE fnode_apply(FNODE f,FNODE (*func)(),int expand); +FNODE fnode_normalize(FNODE f,int expand); void Pquote_normalize(NODE arg,QUOTE *rp) { QUOTE q,r; FNODE f; + int expand,ac; + ac = argc(arg); + if ( !ac ) error("quote_normalize : invalid argument"); q = (QUOTE)ARG0(arg); + expand = ac==2 && ARG1(arg); if ( !q || OID(q) != O_QUOTE ) { *rp = q; return; } else { - f = fnode_normalize(BDY(q)); + f = fnode_normalize(BDY(q),expand); MKQUOTE(r,f); *rp = r; } @@ -2028,15 +2032,6 @@ int fnode_is_integer(FNODE f) } } -int fnode_is_zero(FNODE f) -{ - Q n; - - n = eval(f); - if ( !n ) return 1; - else return 0; -} - int fnode_is_nonnegative_integer(FNODE f) { Q n; @@ -2096,19 +2091,20 @@ int fnode_is_dependent(FNODE f,V v) } } -FNODE fnode_normalize_add(FNODE a1,FNODE a2); -FNODE fnode_normalize_mul(FNODE a1,FNODE a2); -FNODE fnode_normalize_pwr(FNODE a1,FNODE a2); +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 fnode_expand_pwr(FNODE f,int n); FNODE to_narymul(FNODE f); FNODE to_naryadd(FNODE f); FNODE fnode_node_to_naryadd(NODE n); FNODE fnode_node_to_narymul(NODE n); -FNODE fnode_normalize_mul_coef(Num c,FNODE f); 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) +FNODE fnode_normalize(FNODE f,int expand) { FNODE a1,a2,mone,r,b2; NODE n; @@ -2118,28 +2114,29 @@ FNODE fnode_normalize(FNODE f) mone = mkfnode(1,I_FORMULA,q); switch ( f->id ) { case I_PAREN: - return fnode_normalize(FA0(f)); + return fnode_normalize(FA0(f),expand); case I_MINUS: - return fnode_normalize_mul_coef((Num)q,fnode_normalize(FA0(f))); + return fnode_normalize_mul_coef((Num)q, + fnode_normalize(FA0(f),expand),expand); case I_BOP: /* arf fnode fnode */ - a1 = fnode_normalize(FA1(f)); - a2 = fnode_normalize(FA2(f)); + a1 = fnode_normalize(FA1(f),expand); + a2 = fnode_normalize(FA2(f),expand); switch ( OPNAME(f) ) { case '+': - return fnode_normalize_add(a1,a2); + return fnode_normalize_add(a1,a2,expand); case '-': - a2 = fnode_normalize_mul_coef((Num)q,a2); - return fnode_normalize_add(a1,a2); + a2 = fnode_normalize_mul_coef((Num)q,a2,expand); + return fnode_normalize_add(a1,a2,expand); case '*': - return fnode_normalize_mul(a1,a2); + return fnode_normalize_mul(a1,a2,expand); case '/': - a2 = fnode_normalize_pwr(a2,mone); - return fnode_normalize_mul(a1,a2); + a2 = fnode_normalize_pwr(a2,mone,expand); + return fnode_normalize_mul(a1,a2,expand); case '^': - return fnode_normalize_pwr(a1,a2); + return fnode_normalize_pwr(a1,a2,expand); default: return mkfnode(3,I_BOP,FA0(f),a1,a2); } @@ -2149,18 +2146,18 @@ FNODE fnode_normalize(FNODE f) switch ( OPNAME(f) ) { case '+': n = (NODE)FA1(f); - r = fnode_normalize(BDY(n)); n = NEXT(n); + r = fnode_normalize(BDY(n),expand); n = NEXT(n); for ( ; n; n = NEXT(n) ) { - a1 = fnode_normalize(BDY(n)); - r = fnode_normalize_add(r,a1); + a1 = fnode_normalize(BDY(n),expand); + r = fnode_normalize_add(r,a1,expand); } return r; case '*': n = (NODE)FA1(f); - r = fnode_normalize(BDY(n)); n = NEXT(n); + r = fnode_normalize(BDY(n),expand); n = NEXT(n); for ( ; n; n = NEXT(n) ) { - a1 = fnode_normalize(BDY(n)); - r = fnode_normalize_mul(r,a1); + a1 = fnode_normalize(BDY(n),expand); + r = fnode_normalize_mul(r,a1,expand); } return r; default: @@ -2168,11 +2165,11 @@ FNODE fnode_normalize(FNODE f) } default: - return fnode_apply(f,fnode_normalize); + return fnode_apply(f,fnode_normalize,expand); } } -FNODE fnode_apply(FNODE f,FNODE (*func)()) +FNODE fnode_apply(FNODE f,FNODE (*func)(),int expand) { fid_spec_p spec; FNODE r; @@ -2185,13 +2182,13 @@ FNODE fnode_apply(FNODE f,FNODE (*func)()) 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]; for ( t0 = 0; s; s = NEXT(s) ) { NEXTNODE(t0,t); - BDY(t) = (pointer)func((FNODE)BDY(s)); + BDY(t) = (pointer)func((FNODE)BDY(s),expand); } if ( t0 ) NEXT(t) = 0; r->arg[i] = t0; @@ -2204,15 +2201,15 @@ FNODE fnode_apply(FNODE f,FNODE (*func)()) return r; } -FNODE fnode_normalize_add(FNODE f1,FNODE f2) +FNODE fnode_normalize_add(FNODE f1,FNODE f2,int expand) { NODE n1,n2,r0,r; FNODE b1,b2; int s; Num c1,c2,c; - if ( fnode_is_zero(f1) ) return f2; - else if ( fnode_is_zero(f2) ) return f1; + if ( IS_ZERO(f1) ) return f2; + else if ( IS_ZERO(f2) ) return f1; f1 = to_naryadd(f1); f2 = to_naryadd(f2); n1 = (NODE)FA1(f1); n2 = (NODE)FA1(f2); r0 = 0; @@ -2225,7 +2222,7 @@ FNODE fnode_normalize_add(FNODE f1,FNODE f2) } else { addnum(0,c1,c2,&c); if ( c ) { - NEXTNODE(r0,r); BDY(r) = fnode_normalize_mul_coef(c,b1); + NEXTNODE(r0,r); BDY(r) = fnode_normalize_mul_coef(c,b1,expand); } n1 = NEXT(n1); n2 = NEXT(n2); } @@ -2256,25 +2253,43 @@ FNODE fnode_node_to_narymul(NODE n) else return mkfnode(2,I_NARYOP,mulfs,n); } -FNODE fnode_normalize_mul(FNODE f1,FNODE f2) +FNODE fnode_normalize_mul(FNODE f1,FNODE f2,int expand) { NODE n1,n2,r0,r,r1; - FNODE b1,b2,e1,e2,cc; + FNODE b1,b2,e1,e2,cc,t,t1; FNODE *m; int s; Num c1,c2,c,e; int l1,l,i,j; - if ( fnode_is_zero(f1) || fnode_is_zero(f2) ) return 0; + if ( IS_ZERO(f1) || IS_ZERO(f2) ) return mkfnode(1,I_FORMULA,0); else if ( fnode_is_number(f1) ) - return fnode_normalize_mul_coef((Num)eval(f1),f2); + return fnode_normalize_mul_coef((Num)eval(f1),f2,expand); else if ( fnode_is_number(f2) ) - return fnode_normalize_mul_coef((Num)eval(f2),f1); + return fnode_normalize_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); + } + 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); + } + return t; + } + 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); + n1 = (NODE)FA1(to_narymul(b1)); n2 = (NODE)FA1(to_narymul(b2)); l1 = length(n1); l = l1+length(n2); m = (FNODE *)ALLOCA(l*sizeof(FNODE)); @@ -2302,14 +2317,15 @@ FNODE fnode_normalize_mul(FNODE f1,FNODE f2) return fnode_node_to_narymul(r); } -FNODE fnode_normalize_pwr(FNODE f1,FNODE f2) +FNODE fnode_normalize_pwr(FNODE f1,FNODE f2,int expand) { FNODE b,b1,e1,e,cc,r; Num c,c1; NODE arg,n; + Q q; - if ( fnode_is_zero(f2) ) return mkfnode(1,I_FORMULA,ONE); - else if ( fnode_is_zero(f1) ) return mkfnode(1,I_FORMULA,0); + if ( IS_ZERO(f2) ) return mkfnode(1,I_FORMULA,ONE); + else if ( IS_ZERO(f1) ) return mkfnode(1,I_FORMULA,0); else if ( fnode_is_one(f2) ) return f1; else if ( fnode_is_number(f1) ) if ( fnode_is_integer(f2) ) { @@ -2319,7 +2335,7 @@ FNODE fnode_normalize_pwr(FNODE f1,FNODE f2) return mkfnode(3,I_BOP,pwrfs,f1,f2); else if ( IS_BINARYPWR(f1) ) { b1 = FA1(f1); e1 = FA2(f1); - e = fnode_normalize_mul(e1,f2); + e = fnode_normalize_mul(e1,f2,expand); if ( fnode_is_one(e) ) return b1; else @@ -2328,15 +2344,36 @@ FNODE fnode_normalize_pwr(FNODE f1,FNODE f2) fnode_coef_body(f1,&c1,&b1); pwrnum(0,(Num)c1,(Num)eval(f2),&c); cc = mkfnode(1,I_FORMULA,c); - b = fnode_normalize_pwr(b1,f2); + b = fnode_normalize_pwr(b1,f2,expand); 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) ) { + q = (Q)eval(f2); + if ( PL(NM(q)) > 1 ) error("fnode_normalize_pwr : exponent too large"); + return fnode_expand_pwr(f1,QTOS(q)); } else return mkfnode(3,I_BOP,pwrfs,f1,f2); } +FNODE fnode_expand_pwr(FNODE f,int n) +{ + int n1; + FNODE f1,f2; + + if ( !n ) return mkfnode(1,I_FORMULA,ONE); + else if ( IS_ZERO(f) ) return mkfnode(1,I_FORMULA,0); + else if ( n == 1 ) return f; + 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); + return f2; + } +} + /* f = b^e */ void fnode_base_exp(FNODE f,FNODE *bp,FNODE *ep) { @@ -2371,11 +2408,11 @@ FNODE to_narymul(FNODE f) return r; } -FNODE fnode_normalize_mul_coef(Num c,FNODE f) +FNODE fnode_normalize_mul_coef(Num c,FNODE f,int expand) { - FNODE b1,cc,r; + FNODE b1,cc; Num c1,c2; - NODE n; + NODE n,r,r0; if ( !c ) return mkfnode(I_FORMULA,0); @@ -2390,14 +2427,18 @@ FNODE fnode_normalize_mul_coef(Num c,FNODE f) error("fnode_normalize_mul_coef : cannot happen"); else return cc; - } else - if ( IS_NARYMUL(b1) ) { + } else if ( IS_NARYMUL(b1) ) { MKNODE(n,cc,FA1(b1)); - } else { - n = mknode(2,cc,b1); - } - r = fnode_node_to_narymul(n); - return r; + return fnode_node_to_narymul(n); + } 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); + } + if ( r0 ) NEXT(r) = 0; + return fnode_node_to_naryadd(r0); + } else + return fnode_node_to_narymul(mknode(2,cc,b1)); } } }