=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v retrieving revision 1.42 retrieving revision 1.44 diff -u -p -r1.42 -r1.44 --- OpenXM_contrib2/asir2000/include/ca.h 2004/02/03 23:31:58 1.42 +++ OpenXM_contrib2/asir2000/include/ca.h 2004/02/05 08:28:53 1.44 @@ -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.41 2003/12/23 10:39:57 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.43 2004/02/04 07:42:07 noro Exp $ */ #include #include @@ -119,6 +119,7 @@ typedef void * pointer; #define O_BYTEARRAY 16 #define O_QUOTE 17 #define O_OPTLIST 18 +#define O_SYMBOL 19 #define O_VOID -1 #define N_Q 0 @@ -361,6 +362,13 @@ typedef struct oOPTLIST { struct oNODE *body; } *OPTLIST; +typedef struct oSymbol { + short id; + short pad; + char *name; + int value; +} *Symbol; + typedef struct oObj { short id; short pad; @@ -693,6 +701,7 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int))) #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 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 NEWNODE(a) ((a)=(NODE)MALLOC(sizeof(struct oNODE))) #define NEWDC(dc) ((dc)=(DCP)MALLOC(sizeof(struct oDCP))) @@ -1013,6 +1022,7 @@ void square_rem_tab_up_gf2n(UP,UP *,UP *); void powertabup_gf2n(UP,UP,UP *); void find_root_gf2n(UP,GF2N *); +int cmpdl_composite(int,DL,DL); int cmpdl_matrix(int,DL,DL); int cmpdl_order_pair(int,DL,DL); int cmpdl_elim(int,DL,DL);