From 728c4be290a95081c272ca917c54987135cde7e3 Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Sun, 12 Aug 2007 02:12:30 +0000 Subject: [PATCH] Get rid of broken %no-parser, -n, and --no-parser implementation and documentation. * TODO: Don't mention them. * doc/bison.1: Likewise. * doc/bison.texinfo (Decl Summary): Likewise. (Bison Options): Likewise. (Option Cross Key): Likewise. * src/getargs.c (no_parser_flag): Remove global variable. (usage): Don't print description of -n and --no-parser. (long_options): Remove --no-parser entry here. (getargs): Remove -n case in the switch here. * src/getargs.h (no_parser_flag): Remove extern. * tests/regression.at (Web2c Actions): Remove comment that mentions --no-parser. --- ChangeLog | 17 +++++++++++++++++ TODO | 3 +-- doc/bison.1 | 19 ------------------- doc/bison.texinfo | 15 --------------- src/getargs.c | 7 ------- src/getargs.h | 1 - tests/regression.at | 3 +-- 7 files changed, 19 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index ffb7d5c0..957605ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2007-08-11 Joel E. Denny + + Get rid of broken %no-parser, -n, and --no-parser implementation and + documentation. + * TODO: Don't mention them. + * doc/bison.1: Likewise. + * doc/bison.texinfo (Decl Summary): Likewise. + (Bison Options): Likewise. + (Option Cross Key): Likewise. + * src/getargs.c (no_parser_flag): Remove global variable. + (usage): Don't print description of -n and --no-parser. + (long_options): Remove --no-parser entry here. + (getargs): Remove -n case in the switch here. + * src/getargs.h (no_parser_flag): Remove extern. + * tests/regression.at (Web2c Actions): Remove comment that mentions + --no-parser. + 2007-08-11 Joel E. Denny * tests/push.at (Push Parsing: Memory Leak for Early Deletion): Do not diff --git a/TODO b/TODO index 94bd12c8..8b1d9b31 100644 --- a/TODO +++ b/TODO @@ -168,10 +168,9 @@ Paul notes: Show reductions. * Broken options ? -** %no-parser ** %token-table ** Skeleton strategy -Must we keep %no-parser? %token-table? +Must we keep %token-table? * src/print_graph.c Find the best graph parameters. diff --git a/doc/bison.1 b/doc/bison.1 index 9397ec28..62c1721e 100644 --- a/doc/bison.1 +++ b/doc/bison.1 @@ -24,10 +24,6 @@ bison \- GNU Project parser generator (yacc replacement) ] [ .B \-\-no-lines ] [ -.B \-n -] [ -.B \-\-no-parser -] [ .BI \-o " outfile" ] [ .BI \-\-output-file= outfile @@ -211,21 +207,6 @@ and debuggers will associate errors with your source file, the grammar file. This option causes them to associate errors with the parser file, treating it an independent source file in its own right. .TP -.B \-n -.br -.ns -.TP -.B \-\-no-parser -Do not generate the parser code into the output; generate only -declarations. The generated -.IB name .tab.c -file will have only -constant declarations. In addition, a -.IB name .act -file is -generated containing a switch statement body containing all the -translated actions. -.TP .BI \-o " outfile" .br .ns diff --git a/doc/bison.texinfo b/doc/bison.texinfo index 55a7759a..1600bdab 100644 --- a/doc/bison.texinfo +++ b/doc/bison.texinfo @@ -4812,16 +4812,6 @@ Precedence}). @end deffn @end ifset -@deffn {Directive} %no-parser -Do not include any C code in the parser file; generate tables only. The -parser file contains just @code{#define} directives and static variable -declarations. - -This option also tells Bison to write the C code for the grammar actions -into a file named @file{@var{file}.act}, in the form of a -brace-surrounded body fit for a @code{switch} statement. -@end deffn - @deffn {Directive} %no-lines Don't generate any @code{#line} preprocessor commands in the parser file. Ordinarily Bison writes these commands in the parser file so that @@ -7468,10 +7458,6 @@ and debuggers will associate errors with your source file, the grammar file. This option causes them to associate errors with the parser file, treating it as an independent source file in its own right. -@item -n -@itemx --no-parser -Pretend that @code{%no-parser} was specified. @xref{Decl Summary}. - @item -S @var{file} @itemx --skeleton=@var{file} Specify the skeleton to use, similar to @code{%skeleton} @@ -7572,7 +7558,6 @@ the corresponding short option. @item @option{--help} @tab @option{-h} @item @option{--name-prefix=@var{prefix}} @tab @option{-p @var{name-prefix}} @item @option{--no-lines} @tab @option{-l} -@item @option{--no-parser} @tab @option{-n} @item @option{--output=@var{outfile}} @tab @option{-o @var{outfile}} @item @option{--print-localedir} @tab @item @option{--token-table} @tab @option{-k} diff --git a/src/getargs.c b/src/getargs.c index 4ff38fb1..73bc35e5 100644 --- a/src/getargs.c +++ b/src/getargs.c @@ -52,7 +52,6 @@ bool defines_flag; bool graph_flag; bool locations_flag; bool no_lines_flag; -bool no_parser_flag; bool token_table_flag; bool yacc_flag; /* for -y */ @@ -276,7 +275,6 @@ Parser:\n\ --locations enable locations computation\n\ -p, --name-prefix=PREFIX prepend PREFIX to the external symbols\n\ -l, --no-lines don't generate `#line' directives\n\ - -n, --no-parser generate the tables only\n\ -k, --token-table include a table of token names\n\ \n\ "), stdout); @@ -434,7 +432,6 @@ static struct option const long_options[] = { "debug", no_argument, 0, 't' }, { "locations", no_argument, 0, LOCATIONS_OPTION }, { "no-lines", no_argument, 0, 'l' }, - { "no-parser", no_argument, 0, 'n' }, { "raw", no_argument, 0, 0 }, { "skeleton", required_argument, 0, 'S' }, { "language", required_argument, 0, 'L' }, @@ -505,10 +502,6 @@ getargs (int argc, char *argv[]) no_lines_flag = true; break; - case 'n': - no_parser_flag = true; - break; - case 'o': spec_outfile = AS_FILE_NAME (optarg); break; diff --git a/src/getargs.h b/src/getargs.h index 886f2004..2728cfdc 100644 --- a/src/getargs.h +++ b/src/getargs.h @@ -40,7 +40,6 @@ extern bool defines_flag; /* for -d */ extern bool graph_flag; /* for -g */ extern bool locations_flag; extern bool no_lines_flag; /* for -l */ -extern bool no_parser_flag; /* for -n */ extern bool token_table_flag; /* for -k */ extern bool yacc_flag; /* for -y */ diff --git a/tests/regression.at b/tests/regression.at index 80a0ba5c..730dd2b8 100644 --- a/tests/regression.at +++ b/tests/regression.at @@ -709,8 +709,7 @@ else: "else" statement; AT_CHECK([bison -v -o input.c input.y]) -# Check only the tables. We don't use --no-parser, because it is -# still to be implemented in the experimental branch of Bison. +# Check only the tables. [sed -n 's/ *$//;/^static const.*\[\] =/,/^}/p' input.c >tables.c] AT_CHECK([[cat tables.c]], 0, -- 2.47.2