I pushed this to master and a similar patch to branch-2.4.2. >From 1d5b3c08fe51fa55ff258c40a9aea3e96de104e1 Mon Sep 17 00:00:00 2001 From: Joel E. Denny <[email protected]> Date: Mon, 6 Apr 2009 02:16:39 -0400 Subject: [PATCH] Fix options documentation.
* build-aux/cross-options.pl: As in --help output, write optional arguments as [=ARG] not =[ARG]. * doc/bison.texinfo (Bison Options): Add -W/--warnings argument. diff --git a/ChangeLog b/ChangeLog index fcd81db..141039d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-04-06 Joel E. Denny <[email protected]> + + Fix options documentation. + * build-aux/cross-options.pl: As in --help output, write optional + arguments as [=ARG] not =[ARG]. + * doc/bison.texinfo (Bison Options): Add -W/--warnings argument. + 2009-04-04 Joel E. Denny <[email protected]> Replace BISON_PROG_GNU_M4 with Autoconf's AC_PROG_GNU_M4. diff --git a/build-aux/cross-options.pl b/build-aux/cross-options.pl index 6d153a0..241c741 100755 --- a/build-aux/cross-options.pl +++ b/build-aux/cross-options.pl @@ -35,8 +35,11 @@ while (<STDIN>) # put each word in @var, to build @var{name...@var{value}], not # @var{name[=value]}]. $arg =~ s/(\w+)/\...@var{$1}/g; - $arg = '[' . $arg . ']' - if $opt eq '['; + my $long_arg = "=$arg"; + if ($opt eq '[') { + $long_arg = "[$long_arg]"; + $arg = "[$arg]"; + } # For arguments of directives: this only works if all arguments # are strings and have the same syntax as on the command line. if ($dir_arg eq 'name[=value]') @@ -49,7 +52,7 @@ while (<STDIN>) $dir_arg = '[' . $dir_arg . ']' if $opt eq '['; } - $long = "$long=$arg"; + $long = "$long$long_arg"; $short = "$short $arg" if $short && $short ne '-d'; $dir = "$dir $dir_arg" if $dir; } diff --git a/doc/bison.texinfo b/doc/bison.texinfo index 302bc4a..7c11dae 100644 --- a/doc/bison.texinfo +++ b/doc/bison.texinfo @@ -34,8 +34,8 @@ This manual (@value{UPDATED}) is for @acronym{GNU} Bison (version @value{VERSION}), the @acronym{GNU} parser generator. Copyright @copyright{} 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998, -1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software -Foundation, Inc. +1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free +Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -7843,8 +7843,8 @@ traditional Yacc grammars. If your grammar uses a Bison extension like @samp{%glr-parser}, Bison might not be Yacc-compatible even if this option is specified. -...@item -W -...@itemx --warnings +...@item -W [...@var{category}] +...@itemx --warning...@var{category}] Output warnings falling in @var{category}. @var{category} can be one of: @table @code -- 1.5.4.3
