===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v
retrieving revision 1.49
retrieving revision 1.52
diff -u -p -r1.49 -r1.52
--- OpenXM_contrib2/asir2000/include/ca.h	2004/05/14 06:02:54	1.49
+++ OpenXM_contrib2/asir2000/include/ca.h	2004/10/06 11:58:52	1.52
@@ -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.48 2004/03/10 02:41:08 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.51 2004/08/18 00:17:02 noro Exp $ 
 */
 #include <stdio.h>
 #include <stdlib.h>
@@ -123,6 +123,7 @@ typedef void * pointer;
 #define O_RANGE 20
 #define O_TB 21
 #define O_DPV 22
+#define O_QUOTEARG 23
 #define O_VOID -1
 
 #define N_Q 0
@@ -141,6 +142,10 @@ typedef void * pointer;
 #define ORD_GRADLEX 1
 #define ORD_LEX 2
 
+typedef enum {
+	A_end=0,A_fnode,A_arf,A_int,A_str,A_internal,A_node,A_notimpl,A_func
+} farg_type;
+
 #if defined(LONG_IS_32BIT)
 #if defined(VISUAL)
 typedef _int64 L;
@@ -159,6 +164,11 @@ typedef struct oN {
 	unsigned int b[1];
 } *N;
 
+typedef struct oZ {
+	int p;
+	unsigned int b[1];
+} *Z;
+
 typedef struct oUP2 {
 	int w;
 	unsigned int b[1];
@@ -366,6 +376,13 @@ typedef struct oQUOTE {
 	pointer body;
 } *QUOTE;
 
+typedef struct oQUOTEARG {
+	short id;
+	short pad;
+	farg_type type;
+	pointer body;
+} *QUOTEARG;
+
 typedef struct oOPTLIST {
 	short id;
 	short pad;
@@ -732,6 +749,7 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #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 NEWQUOTEARG(e) ((e)=(QUOTEARG)MALLOC(sizeof(struct oQUOTEARG)),OID(e)=O_QUOTEARG)
 #define NEWOPTLIST(l) ((l)=(OPTLIST)MALLOC(sizeof(struct oOPTLIST)),OID(l)=O_OPTLIST)
 #define NEWSYMBOL(l) ((l)=(SYMBOL)MALLOC(sizeof(struct oSYMBOL)),OID(l)=O_SYMBOL)
 #define NEWRANGE(l) ((l)=(RANGE)MALLOC(sizeof(struct oRANGE)),OID(l)=O_RANGE)
@@ -761,7 +779,7 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 ((d)=(DL)MALLOC_ATOMIC(TRUESIZE(oDL,(n)-1,int)))
 
 #define MKP(v,dc,p) \
-(!DEG(dc)?((p)=COEF(dc)):(NEWP(p),VR(p)=(v),DC(p)=(dc),(p)))
+((!DEG(dc)&&!NEXT(dc))?((p)=COEF(dc)):(NEWP(p),VR(p)=(v),DC(p)=(dc),(p)))
 #define MKV(v,p) \
 (NEWP(p),VR(p)=(v),NEWDC(DC(p)),\
 DEG(DC(p))=ONE,COEF(DC(p))=(P)ONE,NEXT(DC(p))=0)
@@ -791,6 +809,7 @@ DEG(DC(p))=ONE,COEF(DC(p))=(P)ONEM,NEXT(DC(p))=0)
 #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 MKQUOTEARG(q,t,b) (NEWQUOTEARG(q),(q)->type=(t),(q)->body=(pointer)(b))
 
 #define NEXTDC(r,c) \
 if(!(r)){NEWDC(r);(c)=(r);}else{NEWDC(NEXT(c));(c)=NEXT(c);}
@@ -842,6 +861,12 @@ PL(NM(q))=1,BD(NM(q))[0]=(unsigned int)(n),DN(q)=0,(q)
 #define MKAlg(b,r) \
 (!(b)?((r)=0):NUM(b)?((r)=(Alg)(b)):(NEWAlg(r),BDY(r)=(Obj)(b),(r)))
 
+#define IMM_MAX 1073741823
+#define IMM_MIN -1073741823
+
+#define SL(n) ((n)->p)
+#define ZALLOC(d) ((Z)MALLOC_ATOMIC(TRUESIZE(oZ,(d)-1,int)))
+
 #if defined(PARI)
 #define ToReal(a) (!(a)?(double)0.0:REAL(a)?BDY((Real)a):RATN(a)?RatnToReal((Q)a):BIGFLOAT(a)?rtodbl(BDY((BF)a)):0)
 #else
@@ -2472,6 +2497,27 @@ void afctrmain(VL vl,P p0,P p,int init,DCP *dcp);
 int divtmp(VL vl,int mod,P p1,P p2,P *q);
 int divtdcmp(VL vl,int mod,P p1,P p2,P *q);
 void GC_gcollect();
+
+Z stoz(int c);
+Z utoz(unsigned int c);
+Z qtoz(Q n);
+Q ztoq(Z n);
+Z chsgnz(Z n);
+Z simpz(Z n);
+Z dupz(Z n);
+Z absz(Z n);
+Z addz(Z n1,Z n2);
+Z subz(Z n1,Z n2);
+Z mulz(Z n1,Z n2);
+Z divsz(Z n1,Z n2);
+Z divz(Z n1,Z n2,Z *rem);
+Z gcdz(Z n1,Z n2);
+Z gcdz_cofactor(Z n1,Z n2,Z *c1,Z *c2);
+Z estimate_array_gcdz(Z *a,int n);
+Z array_gcdz(Z *a,int n);
+void mkwcz(int k,int l,Z *t);
+int remzi(Z n,int m);
+
 
 #if 0 && !defined(VISUAL)
 void bzero(const void *,int);