From 87be6e697a0666206d4f0050112be07651554aa5 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Mon, 17 Jan 2000 02:04:06 +0000 Subject: [PATCH] Fixed breakage of K&R support in rev.1.26. yyparse() was defined as `int yyparse(;) ; { ... }' in K&R mode. Getting rid of the second unwanted semicolon in this made the ifdef tangle more tangled than before. Fixed a backwards comment in the tangle. --- usr.bin/yacc/skeleton.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c index e54d790ee414..c3b02b0ffe02 100644 --- a/usr.bin/yacc/skeleton.c +++ b/usr.bin/yacc/skeleton.c @@ -163,25 +163,25 @@ char *body[] = "#define YYERROR goto yyerrlab", "", "#ifndef YYPARSE_PARAM", - "#define YYPARSE_PARAM", "#if defined(__cplusplus) || __STDC__", - "#define YYPARSE_PARAM_TYPE void", + "#define YYPARSE_PARAM_ARG void", + "#define YYPARSE_PARAM_DECL", "#else /* ! ANSI-C/C++ */", - "#define YYPARSE_PARAM_TYPE", + "#define YYPARSE_PARAM_ARG", + "#define YYPARSE_PARAM_DECL", "#endif /* ANSI-C/C++ */", - "#else /* ! YYPARSE_PARAM */", + "#else /* YYPARSE_PARAM */", "#ifndef YYPARSE_PARAM_TYPE", "#define YYPARSE_PARAM_TYPE void *", "#endif", - "#endif /* ! YYPARSE_PARAM */", - "", "#if defined(__cplusplus) || __STDC__", "#define YYPARSE_PARAM_ARG YYPARSE_PARAM_TYPE YYPARSE_PARAM", "#define YYPARSE_PARAM_DECL", "#else /* ! ANSI-C/C++ */", - "#define YYPARSE_PARAM_ARG YYPARSE_PARAM;", + "#define YYPARSE_PARAM_ARG YYPARSE_PARAM", "#define YYPARSE_PARAM_DECL YYPARSE_PARAM_TYPE YYPARSE_PARAM;", "#endif /* ANSI-C/C++ */", + "#endif /* ! YYPARSE_PARAM */", "", "int", "yyparse (YYPARSE_PARAM_ARG)",