=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/C.c,v retrieving revision 1.8 retrieving revision 1.10 diff -u -p -r1.8 -r1.10 --- OpenXM_contrib2/asir2000/engine/C.c 2001/06/20 09:30:33 1.8 +++ OpenXM_contrib2/asir2000/engine/C.c 2001/06/29 09:08:53 1.10 @@ -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/engine/C.c,v 1.7 2001/05/28 08:22:01 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/engine/C.c,v 1.9 2001/06/25 01:35:20 noro Exp $ */ #include "ca.h" #include "inline.h" @@ -306,6 +306,36 @@ P *pr; } } +/* GF(pn)={0,1,a,a^2,...} -> GF(pm)={0,1,b,b^2,..} ; a -> b^k */ + +void sf_embed(p,k,pm,pr) +P p; +int k,pm; +P *pr; +{ + DCP dc,dcr,dcr0; + GFS a; + P t; + + if ( !p ) + *pr = 0; + else if ( NUM(p) ) { + gfs_embed(p,k,pm,&a); *pr = (P)a; + } else { + for ( dc = DC(p), dcr0 = 0; dc; dc = NEXT(dc) ) { + sf_embed(COEF(dc),k,pm,&t); + if ( t ) { + NEXTDC(dcr0,dcr); DEG(dcr) = DEG(dc); COEF(dcr) = t; + } + } + if ( !dcr0 ) + *pr = 0; + else { + NEXT(dcr) = 0; MKP(VR(p),dcr0,*pr); + } + } +} + void ptolmp(p,pr) P p; P *pr; @@ -406,6 +436,12 @@ UM wf; GFS c; int i; DCP dc; + + if ( OID(f) == O_N ) { + DEG(wf) = 0; + COEF(wf)[0] = FTOIF(CONT((GFS)f)); + return; + } for ( i = UDEG(f); i >= 0; i-- ) COEF(wf)[i] = 0;