* doc/bison.1: Update.

* doc/bison.texinfo (Bison Options): Update --defines and --graph
descriptions.
(Option Cross Key): Update.
Add --graph.

diff --git a/ChangeLog b/ChangeLog
index c81b65164e0fcc8e4aea747ad34ef327f809c9da..57013a45a12177ad1238bfbc335351aa4a024bc0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-18  Marc Autret  <autret_m@epita.fr>
+
+       * doc/bison.1: Update.
+       * doc/bison.texinfo (Bison Options): Update --defines and --graph
+       descriptions.
+       (Option Cross Key): Update.
+       Add --graph.
+

 2001-09-18  Marc Autret  <autret_m@epita.fr>
 
        * tests/regression.at: New test (comment in %union).
 2001-09-18  Marc Autret  <autret_m@epita.fr>
 
        * tests/regression.at: New test (comment in %union).

diff --git a/doc/bison.1 b/doc/bison.1
index ed5edd081c7a3dc2c6b9d0b939c9dd4203d52712..927a128f8a0a31654c15984e592d3f11272e7a3f 100644 (file)
--- a/doc/bison.1
+++ b/doc/bison.1
@@ -10,11 +10,11 @@ bison \- GNU Project parser generator (yacc replacement)
 ] [
 .B \-d
 ] [
 ] [
 .B \-d
 ] [

-.B \-\-defines
+.BI \-\-defines= defines-file

 ] [
 .B \-g
 ] [
 ] [
 .B \-g
 ] [

-.B \-\-graph
+.BI \-\-graph= graph-file

 ] [
 .B \-k
 ] [
 ] [
 .B \-k
 ] [


@@ -127,8 +127,6 @@ chosen as if the input file were named
 .B \-d
 .br
 .ns
 .B \-d
 .br
 .ns

-.TP
-.B \-\-defines

 Write an extra output file containing macro definitions for the token
 type names defined in the grammar and the semantic value type
 .BR YYSTYPE ,
 Write an extra output file containing macro definitions for the token
 type names defined in the grammar and the semantic value type
 .BR YYSTYPE ,


@@ -149,17 +147,32 @@ in a separate source file, because
 needs to be able to refer to token type codes and the variable
 .BR yylval .
 .TP
 needs to be able to refer to token type codes and the variable
 .BR yylval .
 .TP

+.BI \-\-defines= defines-file
+The behaviour of
+.BI \-\-defines 
+is the same than 
+.BI \-d 
+option. 
+The only difference is that it has an optionnal argument which is 
+the name of the output filename.
+.TP

 .BI \-g
 .br
 .ns
 .BI \-g
 .br
 .ns

-.TP
-.BI \-\-graph

 Output a VCG definition of the LALR(1) grammar automaton computed by
 Bison. If the grammar file is 
 .BR foo.y
 , the VCG output file will be
 .BR foo.vcg .
 .TP
 Output a VCG definition of the LALR(1) grammar automaton computed by
 Bison. If the grammar file is 
 .BR foo.y
 , the VCG output file will be
 .BR foo.vcg .
 .TP

+.BI \-\-graph= graph-file
+The behaviour of 
+.BI \-\-graph 
+is the same than
+.BI \-g
+option. The only difference is that it has an optionnal argument which 
+is the name of the output graph filename.
+.TP

 .B \-k
 .br
 .ns
 .B \-k
 .br
 .ns

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index db9f2cf096368a75f6ace1162e9c16016520973f..dba99c3ee4abedc83f88dd2ea6db1f82e23950ee 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -5085,12 +5085,16 @@ Adjust the output:
 
 @table @option
 @item -d
 
 @table @option
 @item -d

-@itemx --defines

 Pretend that @code{%verbose} was specified, i.e., write an extra output
 file containing macro definitions for the token type names defined in
 the grammar and the semantic value type @code{YYSTYPE}, as well as a few
 @code{extern} variable declarations.  @xref{Decl Summary}.
 
 Pretend that @code{%verbose} was specified, i.e., write an extra output
 file containing macro definitions for the token type names defined in
 the grammar and the semantic value type @code{YYSTYPE}, as well as a few
 @code{extern} variable declarations.  @xref{Decl Summary}.
 

+@item --defines=@var{defines-file}
+The behaviour of @var{--defines} is the same than @samp{-d}. The only 
+difference is that it has an optionnal argument which is the name of
+the output filename.
+

 @item -b @var{file-prefix}
 @itemx --file-prefix=@var{prefix}
 Specify a prefix to use for all Bison output file names.  The names are
 @item -b @var{file-prefix}
 @itemx --file-prefix=@var{prefix}
 Specify a prefix to use for all Bison output file names.  The names are


@@ -5110,10 +5114,14 @@ The other output files' names are constructed from @var{outfile}
 as described under the @samp{-v} and @samp{-d} options.
 
 @item -g
 as described under the @samp{-v} and @samp{-d} options.
 
 @item -g

-@itemx --graph

 Output a VCG definition of the LALR(1) grammar automaton computed by
 Bison. If the grammar file is @file{foo.y}, the VCG output file will
 be @file{foo.vcg}.
 Output a VCG definition of the LALR(1) grammar automaton computed by
 Bison. If the grammar file is @file{foo.y}, the VCG output file will
 be @file{foo.vcg}.

+
+@item --graph=@var{graph-file}
+The behaviour of @var{--graph} is the same than @samp{-g}. The only 
+difference is that it has an optionnal argument which is the name of
+the output graph filename.

 @end table
 
 @node Environment Variables
 @end table
 
 @node Environment Variables


@@ -5171,9 +5179,10 @@ the corresponding short option.
 @ifinfo
 @example
 --debug                               -t
 @ifinfo
 @example
 --debug                               -t

---defines                             -d
+--defines=@var{defines-file}          -d

 --file-prefix=@var{prefix}                  -b @var{file-prefix}
 --fixed-output-files --yacc           -y
 --file-prefix=@var{prefix}                  -b @var{file-prefix}
 --fixed-output-files --yacc           -y

+--graph=@var{graph-file}              -d

 --help                                -h
 --name-prefix=@var{prefix}                  -p @var{name-prefix}
 --no-lines                            -l
 --help                                -h
 --name-prefix=@var{prefix}                  -p @var{name-prefix}
 --no-lines                            -l