===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v
retrieving revision 1.6
retrieving revision 1.10
diff -u -p -r1.6 -r1.10
--- OpenXM_contrib2/asir2000/include/ca.h	2000/11/08 08:02:50	1.6
+++ OpenXM_contrib2/asir2000/include/ca.h	2000/12/11 02:00:42	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/include/ca.h,v 1.5 2000/08/22 05:04:15 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.9 2000/12/05 08:29:45 noro Exp $ 
 */
 #include <stdio.h>
 
@@ -58,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
@@ -555,6 +551,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)))
@@ -592,6 +590,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) \
@@ -645,7 +645,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();
@@ -671,7 +707,7 @@ 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