=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.h,v retrieving revision 1.9 retrieving revision 1.13 diff -u -p -r1.9 -r1.13 --- OpenXM_contrib2/asir2000/parse/parse.h 2001/06/04 02:49:48 1.9 +++ OpenXM_contrib2/asir2000/parse/parse.h 2001/09/03 08:52:39 1.13 @@ -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/parse/parse.h,v 1.8 2001/04/20 02:34:24 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.h,v 1.12 2001/09/03 07:01:10 noro Exp $ */ # if defined(VISUAL) #include @@ -64,11 +64,11 @@ typedef enum { I_BOP, I_COP, I_AND, I_OR, I_NOT, I_CE, I_PRESELF, I_POSTSELF, - I_FUNC, I_FUNC_OPT, I_IFUNC, I_MAP, I_PFDERIV, + I_FUNC, I_FUNC_OPT, I_IFUNC, I_MAP, I_RECMAP, I_PFDERIV, I_ANS, I_PVAR, I_ASSPVAR, I_FORMULA, I_LIST, I_STR, I_NEWCOMP, I_CAR, I_CDR, I_CAST, - I_COM, I_PROC, I_INDEX, I_EV, I_TIMER, I_GF2NGEN, I_GFPNGEN, I_LOP, - I_OPT, I_GETOPT, I_POINT, I_QUOTE + I_COM, I_PROC, I_INDEX, I_EV, I_TIMER, I_GF2NGEN, I_GFPNGEN, I_GFSNGEN, + I_LOP, I_OPT, I_GETOPT, I_POINT, I_QUOTE, I_PAREN } fid; /* identifiers for statements */ @@ -287,6 +287,9 @@ switch ( id ) {\ #define GETPV(i,p) \ ((int)(i)>=0 ? (int)((p)=CPVS->va[(unsigned int)(i)].priv)\ : (int)((p)=GPVS->va[(unsigned int)(i)&(~MSB)].priv)) +#define GETPVNAME(i,p) \ +((int)(i)>=0 ? (int)((p)=CPVS->va[(unsigned int)(i)].name)\ + : (int)((p)=GPVS->va[(unsigned int)(i)&(~MSB)].name)) #define ASSPV(i,p) \ ((int)(i)>=0 ? (int)(CPVS->va[(unsigned int)(i)].priv=(pointer)(p))\ : (int)(GPVS->va[(unsigned int)(i)&(~MSB)].priv=(pointer)(p)))