===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.h,v
retrieving revision 1.6
retrieving revision 1.13
diff -u -p -r1.6 -r1.13
--- OpenXM_contrib2/asir2000/parse/parse.h	2000/12/05 01:24:57	1.6
+++ 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.5 2000/09/21 09:19:27 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.h,v 1.12 2001/09/03 07:01:10 noro Exp $ 
 */
 # if defined(VISUAL)
 #include <time.h>
@@ -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_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)))
@@ -319,7 +322,7 @@ extern int Verbose;
 #define fflush w_fflush
 #endif
 
-#if defined(VISUAL)
+#if defined(VISUAL) || (defined(__MACH__) && defined(__ppc__))
 NODE mknode(int,...);
 FNODE mkfnode(int,fid,...);
 SNODE mksnode(int,sid,...);
@@ -333,9 +336,8 @@ void call_usrf();
 
 /* prototypes */
 
-void dp_ptozp2_d(NODE,int,DP,DP,DP *,DP *);
-void dp_ptozp_d(NODE,int,DP,DP *);
-void dp_ptozp_d_old(NODE,int,DP,DP *);
+void dp_ptozp2_d(DP,DP,DP *,DP *);
+void dp_ptozp_d(DP,DP *);
 void dp_vtod(Q *,DP,DP *);
 void dp_idivv_hist(Q,DP *);
 void dp_igcdv_hist(DP,Q *);