=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v retrieving revision 1.23 retrieving revision 1.26 diff -u -p -r1.23 -r1.26 --- OpenXM_contrib2/asir2000/include/ca.h 2001/09/07 08:54:58 1.23 +++ OpenXM_contrib2/asir2000/include/ca.h 2001/09/17 07:16:59 1.26 @@ -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.22 2001/09/04 08:48:20 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.25 2001/09/13 03:04:28 noro Exp $ */ #include @@ -373,14 +373,23 @@ typedef struct oDL { typedef struct oCDP { int len; - struct oCMP *body; + int psindex; + unsigned short *body; } *CDP; -typedef struct oCMP { +typedef struct oCM { int index; int c; -} *CMP; +} *CM; +/* bucket list for DL */ + +typedef struct oDLBUCKET { + int td; + struct oNODE *body; + struct oDLBUCKET *next; +} *DLBUCKET; + typedef struct oVL { V v; struct oVL *next; @@ -607,6 +616,7 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int))) #define NEWV(v) ((v)=(V)MALLOC(sizeof(struct oV))) #define NEWVL(vl) ((vl)=(VL)MALLOC(sizeof(struct oVL))) #define NEWMP(m) ((m)=(MP)MALLOC(sizeof(struct oMP))) +#define NEWDLBUCKET(a) ((a)=(DLBUCKET)MALLOC(sizeof(struct oDLBUCKET))) #define NEWMAT(l) ((l)=(MAT)MALLOC(sizeof(struct oMAT)),OID(l)=O_MAT) #define NEWGF2MAT(l) ((l)=(GF2MAT)MALLOC(sizeof(struct oGF2MAT)),OID(l)=O_GF2MAT) @@ -662,6 +672,8 @@ if(!(r)){NEWNODE(r);(c)=(r);}else{NEWNODE(NEXT(c));(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 NEXTDLBUCKET(r,c) \ +if(!(r)){NEWDLBUCKET(r);(c)=(r);}else{NEWDLBUCKET(NEXT(c));(c)=NEXT(c);} /* convertors */ #define NTOQ(n,s,q) \