===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v
retrieving revision 1.1
retrieving revision 1.14
diff -u -p -r1.1 -r1.14
--- OpenXM_contrib2/asir2000/include/ca.h	1999/12/03 07:39:11	1.1
+++ OpenXM_contrib2/asir2000/include/ca.h	2001/06/07 04:54:41	1.14
@@ -1,4 +1,52 @@
-/* $OpenXM: OpenXM/src/asir99/include/ca.h,v 1.1.1.1 1999/11/10 08:12:30 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+ * non-exclusive and royalty-free license to use, copy, modify and
+ * redistribute, solely for non-commercial and non-profit purposes, the
+ * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+ * conditions of this Agreement. For the avoidance of doubt, you acquire
+ * only a limited right to use the SOFTWARE hereunder, and FLL or any
+ * third party developer retains all rights, including but not limited to
+ * copyrights, in and to the SOFTWARE.
+ * 
+ * (1) FLL does not grant you a license in any way for commercial
+ * purposes. You may use the SOFTWARE only for non-commercial and
+ * non-profit purposes only, such as academic, research and internal
+ * business use.
+ * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+ * international copyright treaties. If you make copies of the SOFTWARE,
+ * with or without modification, as permitted hereunder, you shall affix
+ * to all such copies of the SOFTWARE the above copyright notice.
+ * (3) An explicit reference to this SOFTWARE and its copyright owner
+ * shall be made on your publication or presentation in any form of the
+ * results obtained by use of the SOFTWARE.
+ * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
+ * for such modification or the source code of the modified part of the
+ * SOFTWARE.
+ * 
+ * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+ * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+ * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+ * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+ * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+ * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+ * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+ * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+ * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+ * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+ * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
+ * 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.13 2001/04/20 02:34:22 noro Exp $ 
+*/
 #include <stdio.h>
 
 #if defined(hpux)
@@ -10,10 +58,6 @@
 #include <stdlib.h>
 #endif
 
-#if defined(__MWERKS__)
-#define THINK_C
-#endif
-
 #if defined(linux) || (defined(sun) && !defined(SYSV)) || defined(news5000) || (defined(mips) && defined(ultrix))
 #include <alloca.h>
 #endif
@@ -31,11 +75,6 @@
 typedef caddr_t pointer;
 #endif
 
-#ifndef PARI
-/* for THINK C ... */
-#define PARI 1
-#endif
-
 typedef void * pointer;
 
 #if defined(VISUAL)
@@ -68,6 +107,8 @@ typedef void * pointer;
 #define O_MATHCAP 13
 #define O_F 14
 #define O_GFMMAT 15
+#define O_BYTEARRAY 16
+#define O_QUOTE 17
 #define O_VOID -1
 
 #define N_Q 0
@@ -79,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
@@ -197,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;
@@ -275,6 +325,19 @@ typedef struct oMATHCAP {
 	struct oLIST *body;
 } *MATHCAP;
 
+typedef struct oBYTEARRAY {
+	short id;
+	short pad;
+	int len;
+	unsigned char *body;
+} *BYTEARRAY;
+
+typedef struct oQUOTE {
+	short id;
+	short pad;
+	pointer body;
+} *QUOTE;
+
 typedef struct oObj {
 	short id;
 	short pad;
@@ -378,7 +441,11 @@ struct oEGT {
 #define FF_GFP 1
 #define FF_GF2N 2
 #define FF_GFPN 3
+#define FF_GFS 4
 
+/* include interval.h */
+#include "interval.h"
+
 #define INDEX 100
 
 #if USE_FLOAT
@@ -474,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)
@@ -484,6 +552,8 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #define NEWUSINT(u) ((u)=(USINT)MALLOC_ATOMIC(sizeof(struct oUSINT)),OID(u)=O_USINT)
 #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)))
@@ -503,6 +573,8 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #define NEWGFPN(r) ((r)=(GFPN)MALLOC(sizeof(struct oGFPN)),OID(r)=O_N,NID(r)=N_GFPN)
 #define NEWDL(d,n) \
 ((d)=(DL)MALLOC_ATOMIC(TRUESIZE(oDL,(n)-1,int)),bzero((char *)(d),TRUESIZE(oDL,(n)-1,int)))
+#define NEWDL_NOINIT(d,n) \
+((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)))
@@ -531,6 +603,9 @@ DEG(DC(p))=ONE,COEF(DC(p))=(P)ONEM,NEXT(DC(p))=0)
 #define MKUSINT(u,b) (NEWUSINT(u),(u)->body=(unsigned)(b))
 #define MKERR(e,b) (NEWERR(e),(e)->body=(Obj)(b))
 #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);}
@@ -538,6 +613,8 @@ if(!(r)){NEWDC(r);(c)=(r);}else{NEWDC(NEXT(c));(c)=NEX
 if(!(r)){NEWNODE(r);(c)=(r);}else{NEWNODE(NEXT(c));(c)=NEXT(c);}
 #define NEXTMP(r,c) \
 if(!(r)){NEWMP(r);(c)=(r);}else{NEWMP(NEXT(c));(c)=NEXT(c);}
+#define NEXTMP2(r,c,s) \
+if(!(r)){(c)=(r)=(s);}else{NEXT(c)=(s);(c)=(s);}
 
 /* convertors */
 #define NTOQ(n,s,q) \
@@ -552,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) \
@@ -570,7 +649,11 @@ 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 ToReal(a) (!(a)?(double)0.0:REAL(a)?BDY((Real)a):RATN(a)?RatnToReal((Q)a):0)
+#if 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
+#define ToReal(a) (!(a)?(double)0.0:REAL(a)?BDY((Real)a):RATN(a)?RatnToReal((Q)a):0.0)
+#endif
 
 /* predicates */
 #define NUM(p) (OID(p)==O_N)
@@ -578,6 +661,7 @@ PL(NM(q))=1,BD(NM(q))[0]=(unsigned int)(n),DN(q)=0,(q)
 #define INT(q) (!DN((Q)q))
 #define RATN(a) (NID(a)==N_Q)
 #define REAL(a) (NID(a)==N_R)
+#define BIGFLOAT(a) (NID(a)==N_B)
 #define SFF(a) (NID(a)==N_M)
 #define UNIQ(q) ((q)&&NUM(q)&&RATN(q)&&(SGN((Q)q)==1)&&UNIN(NM((Q)q))&&(!DN((Q)q)))
 #define UNIMQ(q) ((q)&&NUM(q)&&SFF(q)&&(CONT((MQ)q)==1))
@@ -586,7 +670,43 @@ PL(NM(q))=1,BD(NM(q))[0]=(unsigned int)(n),DN(q)=0,(q)
 #define UNIN(n) ((n)&&(PL(n)==1)&&(BD(n)[0]==1))
 #define EVENN(n) ((!(n))||(!(BD(n)[0]%2)))
 
+/* special macros for private memory management */
 
+#define NV(p) ((p)->nv)
+#define C(p) ((p)->c)
+#define ITOS(p) (((unsigned int)(p))&0x7fffffff)
+#define STOI(i) ((P)((unsigned int)(i)|0x80000000))
+
+struct cdl {
+	P c;
+	DL d;
+};
+
+struct cdlm {
+	int c;
+	DL d;
+};
+
+extern MP _mp_free_list;
+extern DP _dp_free_list;       
+extern DL _dl_free_list;       
+extern int current_dl_length;      
+
+#define _NEWDL_NOINIT(d,n) if ((n)!= current_dl_length){_dl_free_list=0; current_dl_length=(n);} if(!_dl_free_list)_DL_alloc(); (d)=_dl_free_list; _dl_free_list = *((DL *)_dl_free_list)
+#define _NEWDL(d,n) if ((n)!= current_dl_length){_dl_free_list=0; current_dl_length=(n);} if(!_dl_free_list)_DL_alloc(); (d)=_dl_free_list; _dl_free_list = *((DL *)_dl_free_list); bzero((d),(((n)+1)*sizeof(int)))
+#define _NEWMP(m) if(!_mp_free_list)_MP_alloc(); (m)=_mp_free_list; _mp_free_list = NEXT(_mp_free_list)
+#define _MKDP(n,m,d) if(!_dp_free_list)_DP_alloc(); (d)=_dp_free_list; _dp_free_list = (DP)BDY(_dp_free_list); (d)->id = O_DP; (d)->nv=(n); BDY(d)=(m)
+
+#define _NEXTMP(r,c) \
+if(!(r)){_NEWMP(r);(c)=(r);}else{_NEWMP(NEXT(c));(c)=NEXT(c);}
+
+#define _NEXTMP2(r,c,s) \
+if(!(r)){(c)=(r)=(s);}else{NEXT(c)=(s);(c)=(s);}
+
+#define _FREEDL(m) *((DL *)m)=_dl_free_list; _dl_free_list=(m)
+#define _FREEMP(m) NEXT(m)=_mp_free_list; _mp_free_list=(m)
+#define _FREEDP(m) BDY(m)=(MP)_dp_free_list; _dp_free_list=(m)
+
 /* externals */
 #if 0
 double NatToReal();
@@ -612,14 +732,15 @@ extern N ONEN;
 extern UP2 ONEUP2;
 
 extern FILE *asir_out;
-#if defined(__GNUC__) || defined(THINK_C)
+#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[])();
@@ -630,6 +751,7 @@ extern void (*chsgnnumt[])();
 
 /* prototypes */
 int compui(VL,USINT,USINT);
+int compbytearray(VL,BYTEARRAY,BYTEARRAY);
 
 void powermodup(UP,UP *);
 void hybrid_powermodup(UP,UP *);
@@ -979,6 +1101,7 @@ void *GC_realloc(void *,size_t);
 double NatToReal(N,int *);
 double RatnToReal(Q);
 double pwrreal0(double,int);
+double rtodbl(); /* XXX */
 int **almat(int,int);
 pointer **almat_pointer(int,int);
 int berlecnt(register int,UM);
@@ -1054,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 *);