Backout yacc changes.

svn path=/head/; revision=16073

usr.bin/colldef/Makefile

@@ -7,7 +7,7 @@ CFLAGS += -I. -I${.CURDIR}/../../lib/libc/locale
 SRCS = parse.c scan.c
 LDADD = -ll
 DPADD = ${LIBL}
-CLEANFILES += parse.c scan.c parse.tab.h
+CLEANFILES += lex.yy.c parse.c scan.c y.tab.[ch]
 SUBDIR = data
 
 .include <bsd.prog.mk>

usr.bin/colldef/scan.l

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: scan.l,v 1.1.1.1 1995/02/17 17:29:50 ache Exp $
+ * $Id: scan.l,v 1.1 1995/02/17 17:29:49 ache Exp $
  */
 
 #include <err.h>
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <sysexits.h>
 #include "collate.h"
-#include "parse.tab.h"
+#include "y.tab.h"
 
 int line_no = 1;
 u_char buf[STR_LEN], *ptr;

usr.bin/fib/Makefile

@@ -4,7 +4,7 @@ NOMAN=notyet
 SRCS = fib.c parser.c lex.l
 LDADD = -ll
 DPADD = ${LIBL} ${LIBFORMS}
-CLEANFILES= parser.c lex.c parser.tab.h
+CLEANFILES= parser.c lex.c y.tab.h
 
 CFLAGS +=  -I${.CURDIR} -I. -g
 

usr.bin/fib/lex.l

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  */
-#include "parser.tab.h"
+#include "y.tab.h"
 extern int lineno;
 extern int charno;
 extern int off;

usr.bin/mk_cmds/Makefile

@@ -2,12 +2,12 @@
 
 PROG=	mk_cmds
 #
-# NB: ct.c must come before cmd_tbl.c so that ct.tab.h will be generated.
+# NB: ct.c must come before cmd_tbl.c so that y.tab.h will be generated.
 #
 SRCS=	mk_cmds.c options.c utils.c ct.c cmd_tbl.c
 CFLAGS+= -I. -I${.CURDIR}/../../lib/libss -DIN_MK_CMDS
 LFLAGS=	-l
-CLEANFILES+=	ct.tab.h cmd_tbl.c ct.c
+CLEANFILES+=	y.tab.c y.tab.h lex.yy.c cmd_tbl.c ct.c
 NOMAN=		# XXX
 
 LDADD+=	-ll

usr.bin/mk_cmds/cmd_tbl.l

@@ -6,7 +6,7 @@
  */
 
 #include <string.h>
-#include "ct.tab.h"
+#include "y.tab.h"
 #include "copyright.h"
 
 extern char *last_token, *ds();

usr.bin/mklocale/Makefile

@@ -3,7 +3,7 @@
 PROG=	mklocale
 SRCS=	yacc.c lex.c
 CFLAGS+=-I.
-CLEANFILES+=yacc.tab.h yacc.c lex.c
+CLEANFILES+=y.tab.h yacc.c lex.c
 MAN1=	mklocale.1
 SUBDIR= data
 

usr.bin/mklocale/lex.l

@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)lex.l	8.1 (Berkeley) 6/6/93";
 #include <stdlib.h>
 
 #include "ldef.h"
-#include "yacc.tab.h"
+#include "y.tab.h"
 %}
 
 ODIGIT	[0-7]

usr.bin/xlint/lint1/Makefile

@@ -9,7 +9,7 @@ DPADD+=	${LIBL}
 YFLAGS=	-d
 CFLAGS+=-I.
 LINTFLAGS=-aehpz
-CLEANFILES+=cgram.tab.h cgram.c scan.c
+CLEANFILES+=y.tab.h cgram.c scan.c
 
 BINDIR=	/usr/libexec
 

usr.bin/xlint/lint1/func.c

@@ -39,7 +39,7 @@ static char rcsid[] = "$NetBSD: func.c,v 1.7 1995/10/02 17:31:40 jpo Exp $";
 #include <string.h>
 
 #include "lint1.h"
-#include "cgram.tab.h"
+#include "y.tab.h"
 
 /*
  * Contains a pointer to the symbol table entry of the current function

usr.bin/xlint/lint1/scan.l

@@ -45,7 +45,7 @@ static char rcsid[] = "$NetBSD: scan.l,v 1.8 1995/10/23 13:38:51 jpo Exp $";
 #include <err.h>
 
 #include "lint1.h"
-#include "cgram.tab.h"
+#include "y.tab.h"
 
 #define CHAR_MASK	(~(~0 << CHAR_BIT))
 

usr.bin/xlint/lint1/tree.c

@@ -41,7 +41,7 @@ static char rcsid[] = "$NetBSD: tree.c,v 1.12 1995/10/02 17:37:57 jpo Exp $";
 #include <limits.h>
 
 #include "lint1.h"
-#include "cgram.tab.h"
+#include "y.tab.h"
 
 /* Various flags for each operator. */
 static	mod_t	modtab[NOPS];

usr.sbin/config/Makefile

@@ -7,7 +7,7 @@ SRCS=	config.c main.c lang.c mkioconf.c mkmakefile.c mkglue.c mkheaders.c \
 MAN8=	config.8
 DPADD=	${LIBL}
 LDADD=	-ll
-CLEANFILES+= config.c lang.c config.tab.h
+CLEANFILES+= config.c lang.c lex.yy.c y.tab.[ch]
 .if defined(CONFIG_NO_CLOBBER_EVER)
 CFLAGS+=-DNO_CLOBBER_EVER
 .endif

usr.sbin/config/lang.l

@@ -36,7 +36,7 @@
 
 #include <ctype.h>
 #include <string.h>
-#include "config.tab.h"
+#include "y.tab.h"
 #include "config.h"
 
 #define tprintf if (do_trace) printf

usr.sbin/config/main.c

@@ -49,7 +49,7 @@ static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #include <ctype.h>
 #include <err.h>
 #include <sysexits.h>
-#include "config.tab.h"
+#include "y.tab.h"
 #include "config.h"
 
 #ifndef TRUE

usr.sbin/config/mkglue.c

@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)mkglue.c	8.1 (Berkeley) 6/6/93";
  */
 #include <stdio.h>
 #include "config.h"
-#include "config.tab.h"
+#include "y.tab.h"
 #include <ctype.h>
 
 /*

usr.sbin/config/mkheaders.c

@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)mkheaders.c	8.1 (Berkeley) 6/6/93";
 #include <stdio.h>
 #include <ctype.h>
 #include "config.h"
-#include "config.tab.h"
+#include "y.tab.h"
 
 headers()
 {

usr.sbin/config/mkioconf.c

@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)mkioconf.c	8.2 (Berkeley) 1/21/94";
 #endif /* not lint */
 
 #include <stdio.h>
-#include "config.tab.h"
+#include "y.tab.h"
 #include "config.h"
 
 /*

usr.sbin/config/mkmakefile.c

@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)mkmakefile.c	8.1 (Berkeley) 6/6/93";
 
 #include <stdio.h>
 #include <ctype.h>
-#include "config.tab.h"
+#include "y.tab.h"
 #include "config.h"
 
 #define next_word(fp, wd) \

usr.sbin/config/mkoptions.c

@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)mkheaders.c	8.1 (Berkeley) 6/6/93";
 #include <stdio.h>
 #include <ctype.h>
 #include "config.h"
-#include "config.tab.h"
+#include "y.tab.h"
 
 options()
 {

usr.sbin/config/mkubglue.c

@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)mkubglue.c	8.1 (Berkeley) 6/6/93";
  */
 #include <stdio.h>
 #include "config.h"
-#include "config.tab.h"
+#include "y.tab.h"
 
 ubglue()
 {