===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/C.c,v
retrieving revision 1.7
retrieving revision 1.10
diff -u -p -r1.7 -r1.10
--- OpenXM_contrib2/asir2000/engine/C.c	2001/05/28 08:22:01	1.7
+++ 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.6 2001/03/14 06:04:53 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;
@@ -393,6 +423,63 @@ P *f;
 				NEXTDC(dc0,dc);
 				STOQ(i,DEG(dc));
 				STOQ(c[i],q), COEF(dc) = (P)q;
+			}
+		NEXT(dc) = 0;
+		MKP(v,dc0,*f);
+	}
+}
+
+void ptosfum(f,wf)
+P f;
+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;
+
+	for ( dc = DC(f); dc; dc = NEXT(dc) ) {
+		c = (GFS)COEF(dc);
+		if ( c )
+			COEF(wf)[QTOS(DEG(dc))] = FTOIF(CONT(c));
+	}
+	degum(wf,UDEG(f));
+}
+
+void sfumtop(v,w,f)
+V v;
+UM w;
+P *f;
+{
+	int *c;
+	DCP dc,dc0;
+	int i,t;
+	GFS q;
+
+	if ( DEG(w) < 0 )
+		*f = 0;
+	else if ( DEG(w) == 0 ) {
+		t = COEF(w)[0];
+		t = IFTOF(t);
+		MKGFS(t,q);
+		*f = (P)q;
+	} else {
+		for ( i = DEG(w), c = COEF(w), dc0 = 0; i >= 0; i-- ) 
+			if ( c[i] ) {
+				NEXTDC(dc0,dc);
+				STOQ(i,DEG(dc));
+				t = COEF(w)[i];
+				t = IFTOF(t);
+				MKGFS(t,q);
+				COEF(dc) = (P)q;
 			}
 		NEXT(dc) = 0;
 		MKP(v,dc0,*f);