From a7f36c96bfa22b224a9fd0932fdb9b8c9fe1718a Mon Sep 17 00:00:00 2001
From: jtc <jtc@NetBSD.org>
Date: Tue, 5 Mar 1996 00:12:50 +0000
Subject: [PATCH] Build c-parse.c / c-parse.h from c-parse.y. Comment out
 %expect in c-parse.y.

---
 gnu/usr.bin/gcc/common/Makefile  | 19 +++++++---
 gnu/usr.bin/gcc/common/c-parse.h | 64 --------------------------------
 gnu/usr.bin/gcc/common/c-parse.y |  2 +-
 3 files changed, 15 insertions(+), 70 deletions(-)
 delete mode 100644 gnu/usr.bin/gcc/common/c-parse.h

diff --git a/gnu/usr.bin/gcc/common/Makefile b/gnu/usr.bin/gcc/common/Makefile
index 4234e995a717..96eb10091d81 100644
--- a/gnu/usr.bin/gcc/common/Makefile
+++ b/gnu/usr.bin/gcc/common/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 1996/03/01 00:13:51 jtc Exp $
+#	$NetBSD: Makefile,v 1.3 1996/03/05 00:12:50 jtc Exp $
 
 LIB=	cc1
 
@@ -173,11 +173,20 @@ bi-lexer.o: bi-parser.h
 
 bi-parser.h: bi-parser.c
 bi-parser.c: bi-parser.y
-	$(YACC) -d $(.IMPSRC)
-	mv -f y.tab.c bi-parser.c
-	mv -f y.tab.h bi-parser.h
+	$(YACC) -b bi -d $(.IMPSRC)
+	mv -f bi.tab.c bi-parser.c
+	mv -f bi.tab.h bi-parser.h
+
+CLEANFILES += c-parse.c c-parse.h
+
+c-lex.o: c-parse.h
+
+c-parse.h: c-parse.c
+c-parse.c: c-parse.y
+	$(YACC) -b c -d $(.IMPSRC)
+	mv -f c.tab.c c-parse.c
+	mv -f c.tab.h c-parse.h
 
 install:
 
 .include <bsd.lib.mk>
-
diff --git a/gnu/usr.bin/gcc/common/c-parse.h b/gnu/usr.bin/gcc/common/c-parse.h
deleted file mode 100644
index 21b3d0caf6bd..000000000000
--- a/gnu/usr.bin/gcc/common/c-parse.h
+++ /dev/null
@@ -1,64 +0,0 @@
-typedef union {long itype; tree ttype; enum tree_code code;
-	char *filename; int lineno; int ends_in_label; } YYSTYPE;
-#define	IDENTIFIER	258
-#define	TYPENAME	259
-#define	SCSPEC	260
-#define	TYPESPEC	261
-#define	TYPE_QUAL	262
-#define	CONSTANT	263
-#define	STRING	264
-#define	ELLIPSIS	265
-#define	SIZEOF	266
-#define	ENUM	267
-#define	STRUCT	268
-#define	UNION	269
-#define	IF	270
-#define	ELSE	271
-#define	WHILE	272
-#define	DO	273
-#define	FOR	274
-#define	SWITCH	275
-#define	CASE	276
-#define	DEFAULT	277
-#define	BREAK	278
-#define	CONTINUE	279
-#define	RETURN	280
-#define	GOTO	281
-#define	ASM_KEYWORD	282
-#define	TYPEOF	283
-#define	ALIGNOF	284
-#define	ATTRIBUTE	285
-#define	EXTENSION	286
-#define	LABEL	287
-#define	REALPART	288
-#define	IMAGPART	289
-#define	ASSIGN	290
-#define	OROR	291
-#define	ANDAND	292
-#define	EQCOMPARE	293
-#define	ARITHCOMPARE	294
-#define	LSHIFT	295
-#define	RSHIFT	296
-#define	UNARY	297
-#define	PLUSPLUS	298
-#define	MINUSMINUS	299
-#define	HYPERUNARY	300
-#define	POINTSAT	301
-#define	INTERFACE	302
-#define	IMPLEMENTATION	303
-#define	END	304
-#define	SELECTOR	305
-#define	DEFS	306
-#define	ENCODE	307
-#define	CLASSNAME	308
-#define	PUBLIC	309
-#define	PRIVATE	310
-#define	PROTECTED	311
-#define	PROTOCOL	312
-#define	OBJECTNAME	313
-#define	CLASS	314
-#define	ALIAS	315
-#define	OBJC_STRING	316
-
-
-extern YYSTYPE yylval;
diff --git a/gnu/usr.bin/gcc/common/c-parse.y b/gnu/usr.bin/gcc/common/c-parse.y
index e7aed2c036cf..b220bac19b49 100644
--- a/gnu/usr.bin/gcc/common/c-parse.y
+++ b/gnu/usr.bin/gcc/common/c-parse.y
@@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA.  */
 /* To whomever it may concern: I have heard that such a thing was once
    written by AT&T, but I have never seen it.  */
 
-%expect 34
+/* %expect 34 */
 
 /* These are the 23 conflicts you should get in parse.output;
    the state numbers may vary if minor changes in the grammar are made.