===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v
retrieving revision 1.11
retrieving revision 1.14
diff -u -p -r1.11 -r1.14
--- OpenXM_contrib2/asir2000/include/ca.h	2000/12/22 10:03:29	1.11
+++ OpenXM_contrib2/asir2000/include/ca.h	2001/06/07 04:54:41	1.14
@@ -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.13 2001/04/20 02:34:22 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,7 @@ typedef void * pointer;
 #define N_LM 6
 #define N_GF2N 7
 #define N_GFPN 8
+#define N_GFS 9
 
 #define ORD_REVGRADLEX 0
 #define ORD_GRADLEX 1
@@ -237,6 +239,14 @@ typedef struct oMQ {
 	int cont;
 } *MQ;
 
+typedef struct oGFS {
+	short id;
+	char nid;
+	char pad;
+	int cont;
+} *GFS;
+
+
 typedef struct oP {
 	short id;
 	short pad;
@@ -322,6 +332,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;
@@ -425,6 +441,7 @@ struct oEGT {
 #define FF_GFP 1
 #define FF_GF2N 2
 #define FF_GFPN 3
+#define FF_GFS 4
 
 /* include interval.h */
 #include "interval.h"
@@ -524,6 +541,7 @@ 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 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 +553,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 +605,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 +629,8 @@ 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 STOMQ(a,b) \
 ((a)?(NEWMQ(b),CONT(b)=(a),(b)):((b)=0))
 #define UTON(u,n) \
@@ -712,12 +734,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[])();
@@ -1154,6 +1177,14 @@ void divgfpn(GFPN,GFPN,GFPN *);
 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 addalg(Num,Num,Num *);
 void addbf(Num,Num,Num *);