===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v
retrieving revision 1.11
retrieving revision 1.23
diff -u -p -r1.11 -r1.23
--- OpenXM_contrib2/asir2000/include/ca.h	2000/12/22 10:03:29	1.11
+++ OpenXM_contrib2/asir2000/include/ca.h	2001/09/07 08:54:58	1.23
@@ -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/include/ca.h,v 1.10 2000/12/11 02:00:42 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.22 2001/09/04 08:48:20 noro Exp $ 
 */
 #include <stdio.h>
 
@@ -108,6 +108,7 @@ typedef void * pointer;
 #define O_F 14
 #define O_GFMMAT 15
 #define O_BYTEARRAY 16
+#define O_QUOTE 17
 #define O_VOID -1
 
 #define N_Q 0
@@ -119,6 +120,8 @@ typedef void * pointer;
 #define N_LM 6
 #define N_GF2N 7
 #define N_GFPN 8
+#define N_GFS 9
+#define N_GFSN 10
 
 #define ORD_REVGRADLEX 0
 #define ORD_GRADLEX 1
@@ -237,6 +240,20 @@ typedef struct oMQ {
 	int cont;
 } *MQ;
 
+typedef struct oGFS {
+	short id;
+	char nid;
+	char pad;
+	int cont;
+} *GFS;
+
+typedef struct oGFSN {
+	short id;
+	char nid;
+	char pad;
+	struct oUM *body;
+} *GFSN;
+
 typedef struct oP {
 	short id;
 	short pad;
@@ -322,6 +339,12 @@ typedef struct oBYTEARRAY {
 	unsigned char *body;
 } *BYTEARRAY;
 
+typedef struct oQUOTE {
+	short id;
+	short pad;
+	pointer body;
+} *QUOTE;
+
 typedef struct oObj {
 	short id;
 	short pad;
@@ -344,6 +367,20 @@ typedef struct oDL {
 	int d[1];
 } *DL;
 
+/* 
+ * compressed DP
+ */
+
+typedef struct oCDP {
+	int len;
+	struct oCMP *body;
+} *CDP;
+
+typedef struct oCMP {
+	int index;
+	int c;
+} *CMP;
+
 typedef struct oVL {
 	V v;
 	struct oVL *next;
@@ -354,16 +391,25 @@ typedef struct oNODE {
 	struct oNODE *next;
 } *NODE;
 
+/* univariate poly over small finite field; dense */
 typedef struct oUM {
 	int d;
 	int c[1];
 } *UM;
 
+/* univariate poly with padic coeff */
 typedef struct oLUM {
 	int d;
 	int *c[1];
 } *LUM;
 
+/* bivariate poly over small finite field; dense */
+
+typedef struct oBM {
+	int d;
+	UM c[1];
+} *BM;
+
 typedef struct oML {
 	int n;
 	int mod;
@@ -425,6 +471,8 @@ struct oEGT {
 #define FF_GFP 1
 #define FF_GF2N 2
 #define FF_GFPN 3
+#define FF_GFS 4
+#define FF_GFSN 5
 
 /* include interval.h */
 #include "interval.h"
@@ -512,6 +560,21 @@ bzero((char *)(p),(int)(((n)+1)*sizeof(type))))
 	(p) = ___q___;\
 }
 
+#define W_BMALLOC(dx,dy,p)\
+{\
+	BM ___q___;\
+	int ___i___;\
+	UM *___c___;\
+	(___q___) = (BM)ALLOCA(TRUESIZE(oBM,(dy),UM));\
+	DEG(___q___) = dy;\
+	___c___ = (UM *)COEF(___q___);\
+	for ( ___i___ = 0; ___i___ <= dy; ___i___++ ) {\
+		___c___[___i___] = W_UMALLOC(dx);\
+		clearum(___c___[___i___],dx);\
+	}\
+	(p) = ___q___;\
+}
+
 #define NEWUP2(q,w)\
 ((q)=(UP2)MALLOC_ATOMIC(TRUESIZE(oUP2,(w)-1,unsigned int)),\
 bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
@@ -524,6 +587,8 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 /* cell allocators */
 #define NEWQ(q) ((q)=(Q)MALLOC(sizeof(struct oQ)),OID(q)=O_N,NID(q)=N_Q)
 #define NEWMQ(q) ((q)=(MQ)MALLOC_ATOMIC(sizeof(struct oMQ)),OID(q)=O_N,NID(q)=N_M)
+#define NEWGFS(q) ((q)=(GFS)MALLOC_ATOMIC(sizeof(struct oGFS)),OID(q)=O_N,NID(q)=N_GFS)
+#define NEWGFSN(q) ((q)=(GFSN)MALLOC(sizeof(struct oGFSN)),OID(q)=O_N,NID(q)=N_GFSN)
 #define NEWP(p) ((p)=(P)MALLOC(sizeof(struct oP)),OID(p)=O_P)
 #define NEWR(r) ((r)=(R)MALLOC(sizeof(struct oR)),OID(r)=O_R,(r)->reduced=0)
 #define NEWLIST(l) ((l)=(LIST)MALLOC(sizeof(struct oLIST)),OID(l)=O_LIST)
@@ -535,6 +600,7 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #define NEWERR(e) ((e)=(ERR)MALLOC(sizeof(struct oERR)),OID(e)=O_ERR)
 #define NEWMATHCAP(e) ((e)=(MATHCAP)MALLOC(sizeof(struct oMATHCAP)),OID(e)=O_MATHCAP)
 #define NEWBYTEARRAY(e) ((e)=(BYTEARRAY)MALLOC(sizeof(struct oBYTEARRAY)),OID(e)=O_BYTEARRAY)
+#define NEWQUOTE(e) ((e)=(QUOTE)MALLOC(sizeof(struct oQUOTE)),OID(e)=O_QUOTE)
 
 #define NEWNODE(a) ((a)=(NODE)MALLOC(sizeof(struct oNODE)))
 #define NEWDC(dc) ((dc)=(DCP)MALLOC(sizeof(struct oDCP)))
@@ -586,6 +652,7 @@ DEG(DC(p))=ONE,COEF(DC(p))=(P)ONEM,NEXT(DC(p))=0)
 #define MKMATHCAP(e,b) (NEWMATHCAP(e),(e)->body=(LIST)(b))
 #define MKBYTEARRAY(m,l) \
 (NEWBYTEARRAY(m),(m)->len=(l),(m)->body=(char *)MALLOC_ATOMIC((l)),bzero((m)->body,(l)))
+#define MKQUOTE(q,b) (NEWQUOTE(q),(q)->body=(pointer)(b))
 
 #define NEXTDC(r,c) \
 if(!(r)){NEWDC(r);(c)=(r);}else{NEWDC(NEXT(c));(c)=NEXT(c);}
@@ -609,6 +676,10 @@ SGN(q)=((n)>0?1:-1),NM(q)=NALLOC(1),\
 PL(NM(q))=1,BD(NM(q))[0]=ABS(n),DN(q)=0,(q)))
 #define UTOMQ(a,b) \
 ((a)?(NEWMQ(b),CONT(b)=(unsigned int)(a),(b)):((b)=0))
+#define MKGFS(a,b) \
+((NEWGFS(b),CONT(b)=(a),(b)))
+#define MKGFSN(a,b) \
+((DEG(a)>=0)?(NEWGFSN(b),BDY(b)=(a),(b)):((b)=0))
 #define STOMQ(a,b) \
 ((a)?(NEWMQ(b),CONT(b)=(a),(b)):((b)=0))
 #define UTON(u,n) \
@@ -636,8 +707,8 @@ PL(NM(q))=1,BD(NM(q))[0]=(unsigned int)(n),DN(q)=0,(q)
 /* predicates */
 #define NUM(p) (OID(p)==O_N)
 #define RAT(p) (OID(p)==O_R)
-#define INT(q) (!DN((Q)q))
 #define RATN(a) (NID(a)==N_Q)
+#define INT(q) (!(q)||(NUM(q)&&RATN((Num)q)&&!DN((Q)q)))
 #define REAL(a) (NID(a)==N_R)
 #define BIGFLOAT(a) (NID(a)==N_B)
 #define SFF(a) (NID(a)==N_M)
@@ -655,6 +726,11 @@ PL(NM(q))=1,BD(NM(q))[0]=(unsigned int)(n),DN(q)=0,(q)
 #define ITOS(p) (((unsigned int)(p))&0x7fffffff)
 #define STOI(i) ((P)((unsigned int)(i)|0x80000000))
 
+/* immediate GFS representation */
+
+#define IFTOF(p) ((int)(((unsigned int)(p))&0x7fffffff))
+#define FTOIF(i) ((int)(((unsigned int)(i)|0x80000000)))
+
 struct cdl {
 	P c;
 	DL d;
@@ -712,12 +788,13 @@ extern UP2 ONEUP2;
 extern FILE *asir_out;
 #if defined(__GNUC__)
 extern const int sprime[];
-extern const int lprime[];
 #else
 extern int sprime[];
-extern int lprime[];
 #endif
 
+extern int lprime_size;
+extern int *lprime;
+
 extern void (*addnumt[])();
 extern void (*subnumt[])();
 extern void (*mulnumt[])();
@@ -1067,6 +1144,7 @@ int int_bits(int);
 
 
 LUM LUMALLOC(int, int);
+BM BMALLOC(int, int);
 Obj ToAlg(Num);
 UM *berlemain(register int, UM, UM *);
 void *Risa_GC_malloc(size_t);
@@ -1155,6 +1233,22 @@ void chsgngfpn(GFPN,GFPN *);
 void pwrgfpn(GFPN,Q, GFPN *);
 int cmpgfpn(GFPN,GFPN);
 
+void addgfs(GFS,GFS,GFS *);
+void subgfs(GFS,GFS,GFS *);
+void mulgfs(GFS,GFS,GFS *);
+void divgfs(GFS,GFS,GFS *);
+void chsgngfs(GFS,GFS *);
+void pwrgfs(GFS,Q, GFS *);
+int cmpgfs(GFS,GFS);
+
+void addgfsn(GFSN,GFSN,GFSN *);
+void subgfsn(GFSN,GFSN,GFSN *);
+void mulgfsn(GFSN,GFSN,GFSN *);
+void divgfsn(GFSN,GFSN,GFSN *);
+void chsgngfsn(GFSN,GFSN *);
+void pwrgfsn(GFSN,Q, GFSN *);
+int cmpgfsn(GFSN,GFSN);
+
 void addalg(Num,Num,Num *);
 void addbf(Num,Num,Num *);
 void addcplx(Num,Num,Num *);
@@ -1179,6 +1273,7 @@ void addlm(LM,LM,LM *);
 void addstr(VL,STRING,STRING,STRING *);
 void addum(int,UM,UM,UM);
 void addvect(VL,VECT,VECT,VECT *);
+void addquote(VL,QUOTE,QUOTE,QUOTE *);
 void adjc(VL,P,P,P,Q,P *,P *);
 void afctr(VL,P,P,DCP *);
 void afctrmain(VL,P,P,int,DCP *);
@@ -1202,6 +1297,7 @@ void chsgnreal(Num,Num *);
 void chsgnmi(MQ,MQ *);
 void chsgnlm(LM,LM *);
 void chsgnvect(VECT,VECT *);
+void chsgnquote(QUOTE,QUOTE *);
 void clctv(VL,P,VL *);
 void clctvr(VL,Obj,VL *);
 void cm2p(Q,Q,P,P *);
@@ -1243,6 +1339,7 @@ void divsrdcp(VL,P,P,P *,P *);
 void divsrmp(VL,int,P,P,P *,P *);
 void divsrp(VL,P,P,P *,P *);
 void divvect(VL,Obj,Obj,Obj *);
+void divquote(VL,QUOTE,QUOTE,QUOTE *);
 void dtest(P,ML,int,DCP *);
 void dtestroot(int,int,P,LUM,struct oDUM *,DCP *);
 void dtestroot1(int,int,P,LUM,P *);
@@ -1338,6 +1435,7 @@ void mulsgn(VN,VN,int,VN);
 void mulsum(register int,UM,register int,UM);
 void mulum(register int,UM,UM,UM);
 void mulvect(VL,Obj,Obj,Obj *);
+void mulquote(VL,QUOTE,QUOTE,QUOTE *);
 void mulvectmat(VL,VECT,MAT,VECT *);
 void next(VN);
 void nezgcdnp_sqfr_primitive(VL,P,P *,int,P *);
@@ -1383,6 +1481,7 @@ void pwrnum(VL,Num,Num,Num *);
 void pwrp(VL,P,Q,P *);
 void pwrq(Q,Q,Q *);
 void pwrr(VL,Obj,Obj,Obj *);
+void pwrquote(VL,QUOTE,QUOTE,QUOTE *);
 void pwrreal(Num,Num,Real *);
 void pwrmi(MQ,Q,MQ *);
 void pwrlm(LM,Q,LM *);
@@ -1441,6 +1540,7 @@ void substp(VL,P,V,P,P *);
 void substvp(VL,P,VN,P *);
 void subum(int,UM,UM,UM);
 void subvect(VL,VECT,VECT,VECT *);
+void subquote(VL,QUOTE,QUOTE,QUOTE *);
 void toreim(Num,Num *,Num *);
 void ucsump(P,Q *);
 void udivpwm(Q,P,P,P *,P *);