===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/ytab.h,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -p -r1.3 -r1.5
--- OpenXM_contrib2/asir2000/parse/ytab.h	2001/10/05 08:55:47	1.3
+++ OpenXM_contrib2/asir2000/parse/ytab.h	2004/03/18 01:24:23	1.5
@@ -1,51 +1,7 @@
-#ifndef YYERRCODE
-#define YYERRCODE 256
-#endif
+#ifndef BISON_Y_TAB_H
+# define BISON_Y_TAB_H
 
-#define STRUCT 257
-#define POINT 258
-#define NEWSTRUCT 259
-#define ANS 260
-#define FDEF 261
-#define PFDEF 262
-#define GLOBAL 263
-#define CMP 264
-#define OR 265
-#define AND 266
-#define CAR 267
-#define CDR 268
-#define QUOTED 269
-#define DO 270
-#define WHILE 271
-#define FOR 272
-#define IF 273
-#define ELSE 274
-#define BREAK 275
-#define RETURN 276
-#define CONTINUE 277
-#define PARIF 278
-#define MAP 279
-#define RECMAP 280
-#define TIMER 281
-#define GF2NGEN 282
-#define GFPNGEN 283
-#define GFSNGEN 284
-#define GETOPT 285
-#define FOP_AND 286
-#define FOP_OR 287
-#define FOP_IMPL 288
-#define FOP_REPL 289
-#define FOP_EQUIV 290
-#define FOP_NOT 291
-#define LOP 292
-#define FORMULA 293
-#define UCASE 294
-#define LCASE 295
-#define STR 296
-#define SELF 297
-#define BOPASS 298
-#define PLUS 299
-#define MINUS 300
+#ifndef YYSTYPE
 typedef union {
 	FNODE f;
 	SNODE s;
@@ -53,5 +9,62 @@ typedef union {
 	NODE2 n2;
 	int i;
 	pointer p;
-} YYSTYPE;
+} yystype;
+# define YYSTYPE yystype
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+# define	STRUCT	257
+# define	POINT	258
+# define	NEWSTRUCT	259
+# define	ANS	260
+# define	FDEF	261
+# define	PFDEF	262
+# define	MODDEF	263
+# define	MODEND	264
+# define	GLOBAL	265
+# define	MGLOBAL	266
+# define	LOCAL	267
+# define	LOCALF	268
+# define	CMP	269
+# define	OR	270
+# define	AND	271
+# define	CAR	272
+# define	CDR	273
+# define	QUOTED	274
+# define	COLONCOLON	275
+# define	DO	276
+# define	WHILE	277
+# define	FOR	278
+# define	IF	279
+# define	ELSE	280
+# define	BREAK	281
+# define	RETURN	282
+# define	CONTINUE	283
+# define	PARIF	284
+# define	MAP	285
+# define	RECMAP	286
+# define	TIMER	287
+# define	GF2NGEN	288
+# define	GFPNGEN	289
+# define	GFSNGEN	290
+# define	GETOPT	291
+# define	FOP_AND	292
+# define	FOP_OR	293
+# define	FOP_IMPL	294
+# define	FOP_REPL	295
+# define	FOP_EQUIV	296
+# define	FOP_NOT	297
+# define	LOP	298
+# define	FORMULA	299
+# define	UCASE	300
+# define	LCASE	301
+# define	STR	302
+# define	SELF	303
+# define	BOPASS	304
+# define	PLUS	305
+# define	MINUS	306
+
+
 extern YYSTYPE yylval;
+
+#endif /* not BISON_Y_TAB_H */