Update.

[bison.git] / doc / bison.texinfo

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index bf0f790b371cd38698d5802c67e3904ecfa1c8bb..7c0b3454e1c99b1016d964a729611a226cd96da4 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -676,12 +676,13 @@ the grammar rules---for example, to build identifiers and operators into
 expressions.  As it does this, it runs the actions for the grammar rules it
 uses.
 
 expressions.  As it does this, it runs the actions for the grammar rules it
 uses.
 

-The tokens come from a function called the @dfn{lexical analyzer} that you
-must supply in some fashion (such as by writing it in C).  The Bison parser
-calls the lexical analyzer each time it wants a new token.  It doesn't know
-what is ``inside'' the tokens (though their semantic values may reflect
-this).  Typically the lexical analyzer makes the tokens by parsing
-characters of text, but Bison does not depend on this.  @xref{Lexical, ,The Lexical Analyzer Function @code{yylex}}.
+The tokens come from a function called the @dfn{lexical analyzer} that
+you must supply in some fashion (such as by writing it in C).  The Bison
+parser calls the lexical analyzer each time it wants a new token.  It
+doesn't know what is ``inside'' the tokens (though their semantic values
+may reflect this).  Typically the lexical analyzer makes the tokens by
+parsing characters of text, but Bison does not depend on this.
+@xref{Lexical, ,The Lexical Analyzer Function @code{yylex}}.

 
 The Bison parser file is C code which defines a function named
 @code{yyparse} which implements that grammar.  This function does not make
 
 The Bison parser file is C code which defines a function named
 @code{yyparse} which implements that grammar.  This function does not make


@@ -693,7 +694,7 @@ arrange for it to call @code{yyparse} or the parser will never run.
 @xref{Interface, ,Parser C-Language Interface}.
 
 Aside from the token type names and the symbols in the actions you
 @xref{Interface, ,Parser C-Language Interface}.
 
 Aside from the token type names and the symbols in the actions you

-write, all variable and function names used in the Bison parser file
+write, all symbols defined in the Bison parser file itself

 begin with @samp{yy} or @samp{YY}.  This includes interface functions
 such as the lexical analyzer function @code{yylex}, the error reporting
 function @code{yyerror} and the parser function @code{yyparse} itself.
 begin with @samp{yy} or @samp{YY}.  This includes interface functions
 such as the lexical analyzer function @code{yylex}, the error reporting
 function @code{yyerror} and the parser function @code{yyparse} itself.


@@ -702,6 +703,14 @@ Therefore, you should avoid using C identifiers starting with @samp{yy}
 or @samp{YY} in the Bison grammar file except for the ones defined in
 this manual.
 
 or @samp{YY} in the Bison grammar file except for the ones defined in
 this manual.
 

+In some cases the Bison parser file includes system headers, and in
+those cases your code should respect the identifiers reserved by those
+headers.  On some non-@sc{gnu} hosts, @code{<alloca.h>},
+@code{<stddef.h>}, and @code{<stdlib.h>} are included as needed to
+declare memory allocators and related types.
+Other system headers may be included if you define @code{YYDEBUG} to a
+nonzero value (@pxref{Debugging, ,Debugging Your Parser}).
+

 @node Stages
 @section Stages in Using Bison
 @cindex stages in using Bison
 @node Stages
 @section Stages in Using Bison
 @cindex stages in using Bison


@@ -713,15 +722,16 @@ to a working compiler or interpreter, has these parts:
 @enumerate
 @item
 Formally specify the grammar in a form recognized by Bison
 @enumerate
 @item
 Formally specify the grammar in a form recognized by Bison

-(@pxref{Grammar File, ,Bison Grammar Files}).  For each grammatical rule in the language,
-describe the action that is to be taken when an instance of that rule
-is recognized.  The action is described by a sequence of C statements.
+(@pxref{Grammar File, ,Bison Grammar Files}).  For each grammatical rule
+in the language, describe the action that is to be taken when an
+instance of that rule is recognized.  The action is described by a
+sequence of C statements.

 
 @item
 
 @item

-Write a lexical analyzer to process input and pass tokens to the
-parser.  The lexical analyzer may be written by hand in C
-(@pxref{Lexical, ,The Lexical Analyzer Function @code{yylex}}).  It could also be produced using Lex, but the use
-of Lex is not discussed in this manual.
+Write a lexical analyzer to process input and pass tokens to the parser.
+The lexical analyzer may be written by hand in C (@pxref{Lexical, ,The
+Lexical Analyzer Function @code{yylex}}).  It could also be produced
+using Lex, but the use of Lex is not discussed in this manual.

 
 @item
 Write a controlling function that calls the Bison-produced parser.
 
 @item
 Write a controlling function that calls the Bison-produced parser.


@@ -875,9 +885,10 @@ which is a floating point number.
 The @code{#include} directive is used to declare the exponentiation
 function @code{pow}.
 
 The @code{#include} directive is used to declare the exponentiation
 function @code{pow}.
 

-The second section, Bison declarations, provides information to Bison about
-the token types (@pxref{Bison Declarations, ,The Bison Declarations Section}).  Each terminal symbol that is
-not a single-character literal must be declared here.  (Single-character
+The second section, Bison declarations, provides information to Bison
+about the token types (@pxref{Bison Declarations, ,The Bison
+Declarations Section}).  Each terminal symbol that is not a
+single-character literal must be declared here.  (Single-character

 literals normally don't need to be declared.)  In this example, all the
 arithmetic operators are designated by single-character literals, so the
 only terminal symbol that needs to be declared is @code{NUM}, the token
 literals normally don't need to be declared.)  In this example, all the
 arithmetic operators are designated by single-character literals, so the
 only terminal symbol that needs to be declared is @code{NUM}, the token


@@ -1057,9 +1068,10 @@ The latter, however, is much more readable.
 @cindex writing a lexical analyzer
 @cindex lexical analyzer, writing
 
 @cindex writing a lexical analyzer
 @cindex lexical analyzer, writing
 

-The lexical analyzer's job is low-level parsing: converting characters or
-sequences of characters into tokens.  The Bison parser gets its tokens by
-calling the lexical analyzer.  @xref{Lexical, ,The Lexical Analyzer Function @code{yylex}}.
+The lexical analyzer's job is low-level parsing: converting characters
+or sequences of characters into tokens.  The Bison parser gets its
+tokens by calling the lexical analyzer.  @xref{Lexical, ,The Lexical
+Analyzer Function @code{yylex}}.

 
 Only a simple lexical analyzer is needed for the RPN calculator.  This
 lexical analyzer skips blanks and tabs, then reads in numbers as
 
 Only a simple lexical analyzer is needed for the RPN calculator.  This
 lexical analyzer skips blanks and tabs, then reads in numbers as


@@ -1316,12 +1328,14 @@ Operator precedence is determined by the line ordering of the
 declarations; the higher the line number of the declaration (lower on
 the page or screen), the higher the precedence.  Hence, exponentiation
 has the highest precedence, unary minus (@code{NEG}) is next, followed
 declarations; the higher the line number of the declaration (lower on
 the page or screen), the higher the precedence.  Hence, exponentiation
 has the highest precedence, unary minus (@code{NEG}) is next, followed

-by @samp{*} and @samp{/}, and so on.  @xref{Precedence, ,Operator Precedence}.
+by @samp{*} and @samp{/}, and so on.  @xref{Precedence, ,Operator
+Precedence}.

 
 

-The other important new feature is the @code{%prec} in the grammar section
-for the unary minus operator.  The @code{%prec} simply instructs Bison that
-the rule @samp{| '-' exp} has the same precedence as @code{NEG}---in this
-case the next-to-highest.  @xref{Contextual Precedence, ,Context-Dependent Precedence}.
+The other important new feature is the @code{%prec} in the grammar
+section for the unary minus operator.  The @code{%prec} simply instructs
+Bison that the rule @samp{| '-' exp} has the same precedence as
+@code{NEG}---in this case the next-to-highest.  @xref{Contextual
+Precedence, ,Context-Dependent Precedence}.

 
 Here is a sample run of @file{calc.y}:
 
 
 Here is a sample run of @file{calc.y}:
 


@@ -1674,11 +1688,12 @@ are @code{NUM}, @code{VAR}, @code{FNCT}, and @code{exp}.  Their
 declarations are augmented with information about their data type (placed
 between angle brackets).
 
 declarations are augmented with information about their data type (placed
 between angle brackets).
 

-The Bison construct @code{%type} is used for declaring nonterminal symbols,
-just as @code{%token} is used for declaring token types.  We have not used
-@code{%type} before because nonterminal symbols are normally declared
-implicitly by the rules that define them.  But @code{exp} must be declared
-explicitly so we can specify its value type.  @xref{Type Decl, ,Nonterminal Symbols}.
+The Bison construct @code{%type} is used for declaring nonterminal
+symbols, just as @code{%token} is used for declaring token types.  We
+have not used @code{%type} before because nonterminal symbols are
+normally declared implicitly by the rules that define them.  But
+@code{exp} must be declared explicitly so we can specify its value type.
+@xref{Type Decl, ,Nonterminal Symbols}.

 
 @node Mfcalc Rules
 @subsection Grammar Rules for @code{mfcalc}
 
 @node Mfcalc Rules
 @subsection Grammar Rules for @code{mfcalc}


@@ -1952,8 +1967,8 @@ yylex (void)
 @end smallexample
 
 This program is both powerful and flexible. You may easily add new
 @end smallexample
 
 This program is both powerful and flexible. You may easily add new

-functions, and it is a simple job to modify this code to install predefined
-variables such as @code{pi} or @code{e} as well.
+functions, and it is a simple job to modify this code to install
+predefined variables such as @code{pi} or @code{e} as well.

 
 @node Exercises
 @section Exercises
 
 @node Exercises
 @section Exercises


@@ -2416,7 +2431,8 @@ requires you to do two things:
 @itemize @bullet
 @item
 Specify the entire collection of possible data types, with the
 @itemize @bullet
 @item
 Specify the entire collection of possible data types, with the

-@code{%union} Bison declaration (@pxref{Union Decl, ,The Collection of Value Types}).
+@code{%union} Bison declaration (@pxref{Union Decl, ,The Collection of
+Value Types}).

 
 @item
 Choose one of those types for each symbol (terminal or nonterminal) for
 
 @item
 Choose one of those types for each symbol (terminal or nonterminal) for


@@ -2438,10 +2454,11 @@ is to compute a semantic value for the grouping built by the rule from the
 semantic values associated with tokens or smaller groupings.
 
 An action consists of C statements surrounded by braces, much like a
 semantic values associated with tokens or smaller groupings.
 
 An action consists of C statements surrounded by braces, much like a

-compound statement in C.  It can be placed at any position in the rule; it
-is executed at that position.  Most rules have just one action at the end
-of the rule, following all the components.  Actions in the middle of a rule
-are tricky and used only for special purposes (@pxref{Mid-Rule Actions, ,Actions in Mid-Rule}).
+compound statement in C.  It can be placed at any position in the rule;
+it is executed at that position.  Most rules have just one action at the
+end of the rule, following all the components.  Actions in the middle of
+a rule are tricky and used only for special purposes (@pxref{Mid-Rule
+Actions, ,Actions in Mid-Rule}).

 
 The C code in an action can refer to the semantic values of the components
 matched by the rule with the construct @code{$@var{n}}, which stands for
 
 The C code in an action can refer to the semantic values of the components
 matched by the rule with the construct @code{$@var{n}}, which stands for


@@ -2721,8 +2738,8 @@ especially symbol locations.
 
 @c (terminal or not) ?
 
 
 @c (terminal or not) ?
 

-The way locations are handled is defined by providing a data type, and actions
-to take when rules are matched.
+The way locations are handled is defined by providing a data type, and
+actions to take when rules are matched.

 
 @menu
 * Location Type::               Specifying a data type for locations.
 
 @menu
 * Location Type::               Specifying a data type for locations.


@@ -2823,11 +2840,11 @@ exp:    @dots{}
 @subsection Default Action for Locations
 @vindex YYLLOC_DEFAULT
 
 @subsection Default Action for Locations
 @vindex YYLLOC_DEFAULT
 

-Actually, actions are not the best place to compute locations. Since locations
-are much more general than semantic values, there is room in the output parser
-to redefine the default action to take for each rule. The
-@code{YYLLOC_DEFAULT} macro is called each time a rule is matched, before the
-associated action is run.
+Actually, actions are not the best place to compute locations. Since
+locations are much more general than semantic values, there is room in
+the output parser to redefine the default action to take for each
+rule. The @code{YYLLOC_DEFAULT} macro is invoked each time a rule is
+matched, before the associated action is run.

 
 Most of the time, this macro is general enough to suppress location
 dedicated code from semantic actions.
 
 Most of the time, this macro is general enough to suppress location
 dedicated code from semantic actions.


@@ -2879,7 +2896,8 @@ value (@pxref{Multiple Types, ,More Than One Value Type}).
 
 The first rule in the file also specifies the start symbol, by default.
 If you want some other symbol to be the start symbol, you must declare
 
 The first rule in the file also specifies the start symbol, by default.
 If you want some other symbol to be the start symbol, you must declare

-it explicitly (@pxref{Language and Grammar, ,Languages and Context-Free Grammars}).
+it explicitly (@pxref{Language and Grammar, ,Languages and Context-Free
+Grammars}).

 
 @menu
 * Token Decl::        Declaring terminal symbols.
 
 @menu
 * Token Decl::        Declaring terminal symbols.


@@ -2928,7 +2946,8 @@ with each other or with ASCII characters.
 
 In the event that the stack type is a union, you must augment the
 @code{%token} or other token declaration to include the data type
 
 In the event that the stack type is a union, you must augment the
 @code{%token} or other token declaration to include the data type

-alternative delimited by angle-brackets (@pxref{Multiple Types, ,More Than One Value Type}).
+alternative delimited by angle-brackets (@pxref{Multiple Types, ,More
+Than One Value Type}).

 
 For example:
 
 
 For example:
 


@@ -2975,7 +2994,8 @@ obtain the token type code number (@pxref{Calling Convention}).
 Use the @code{%left}, @code{%right} or @code{%nonassoc} declaration to
 declare a token and specify its precedence and associativity, all at
 once.  These are called @dfn{precedence declarations}.
 Use the @code{%left}, @code{%right} or @code{%nonassoc} declaration to
 declare a token and specify its precedence and associativity, all at
 once.  These are called @dfn{precedence declarations}.

-@xref{Precedence, ,Operator Precedence}, for general information on operator precedence.
+@xref{Precedence, ,Operator Precedence}, for general information on
+operator precedence.

 
 The syntax of a precedence declaration is the same as that of
 @code{%token}: either
 
 The syntax of a precedence declaration is the same as that of
 @code{%token}: either


@@ -3062,11 +3082,12 @@ used.  This is done with a @code{%type} declaration, like this:
 @end example
 
 @noindent
 @end example
 
 @noindent

-Here @var{nonterminal} is the name of a nonterminal symbol, and @var{type}
-is the name given in the @code{%union} to the alternative that you want
-(@pxref{Union Decl, ,The Collection of Value Types}).  You can give any number of nonterminal symbols in
-the same @code{%type} declaration, if they have the same value type.  Use
-spaces to separate the symbol names.
+Here @var{nonterminal} is the name of a nonterminal symbol, and
+@var{type} is the name given in the @code{%union} to the alternative
+that you want (@pxref{Union Decl, ,The Collection of Value Types}).  You
+can give any number of nonterminal symbols in the same @code{%type}
+declaration, if they have the same value type.  Use spaces to separate
+the symbol names.

 
 You can also declare the value type of a terminal symbol.  To do this,
 use the same @code{<@var{type}>} construction in a declaration for the
 
 You can also declare the value type of a terminal symbol.  To do this,
 use the same @code{<@var{type}>} construction in a declaration for the


@@ -3141,7 +3162,7 @@ may override this restriction with the @code{%start} declaration as follows:
 @subsection A Pure (Reentrant) Parser
 @cindex reentrant parser
 @cindex pure parser
 @subsection A Pure (Reentrant) Parser
 @cindex reentrant parser
 @cindex pure parser

-@findex %pure_parser
+@findex %pure-parser

 
 A @dfn{reentrant} program is one which does not alter in the course of
 execution; in other words, it consists entirely of @dfn{pure} (read-only)
 
 A @dfn{reentrant} program is one which does not alter in the course of
 execution; in other words, it consists entirely of @dfn{pure} (read-only)


@@ -3157,11 +3178,11 @@ statically allocated variables for communication with @code{yylex},
 including @code{yylval} and @code{yylloc}.)
 
 Alternatively, you can generate a pure, reentrant parser.  The Bison
 including @code{yylval} and @code{yylloc}.)
 
 Alternatively, you can generate a pure, reentrant parser.  The Bison

-declaration @code{%pure_parser} says that you want the parser to be
+declaration @code{%pure-parser} says that you want the parser to be

 reentrant.  It looks like this:
 
 @example
 reentrant.  It looks like this:
 
 @example

-%pure_parser
+%pure-parser

 @end example
 
 The result is that the communication variables @code{yylval} and
 @end example
 
 The result is that the communication variables @code{yylval} and


@@ -3227,9 +3248,9 @@ directives:
 
 @table @code
 @item %debug
 
 @table @code
 @item %debug

-Output a definition of the macro @code{YYDEBUG} into the parser file, so
-that the debugging facilities are compiled.  @xref{Debugging, ,Debugging
-Your Parser}.
+In the parser file, define the macro @code{YYDEBUG} to 1 if it is not
+already defined, so that the debugging facilities are compiled.
+@xref{Debugging, ,Debugging Your Parser}.

 
 @item %defines
 Write an extra output file containing macro definitions for the token
 
 @item %defines
 Write an extra output file containing macro definitions for the token


@@ -3248,12 +3269,12 @@ be able to refer to token type codes and the variable
 Specify a prefix to use for all Bison output file names.  The names are
 chosen as if the input file were named @file{@var{prefix}.y}.
 
 Specify a prefix to use for all Bison output file names.  The names are
 chosen as if the input file were named @file{@var{prefix}.y}.
 

-@c @item %header_extension
+@c @item %header-extension

 @c Specify the extension of the parser header file generated when
 @c @code{%define} or @samp{-d} are used.
 @c
 @c For example, a grammar file named @file{foo.ypp} and containing a
 @c Specify the extension of the parser header file generated when
 @c @code{%define} or @samp{-d} are used.
 @c
 @c For example, a grammar file named @file{foo.ypp} and containing a

-@c @code{%header_extension .hh} directive will produce a header file
+@c @code{%header-extension .hh} directive will produce a header file

 @c named @file{foo.tab.hh}
 
 @item %locations
 @c named @file{foo.tab.hh}
 
 @item %locations


@@ -3267,10 +3288,10 @@ accurate parse error messages.
 Rename the external symbols used in the parser so that they start with
 @var{prefix} instead of @samp{yy}.  The precise list of symbols renamed
 is @code{yyparse}, @code{yylex}, @code{yyerror}, @code{yynerrs},
 Rename the external symbols used in the parser so that they start with
 @var{prefix} instead of @samp{yy}.  The precise list of symbols renamed
 is @code{yyparse}, @code{yylex}, @code{yyerror}, @code{yynerrs},

-@code{yylval}, @code{yychar} and @code{yydebug}.  For example, if you
-use @samp{%name-prefix="c_"}, the names become @code{c_parse},
-@code{c_lex}, and so on.  @xref{Multiple Parsers, ,Multiple Parsers in
-the Same Program}.
+@code{yylval}, @code{yychar}, @code{yydebug}, and possible
+@code{yylloc}.  For example, if you use @samp{%name-prefix="c_"}, the
+names become @code{c_parse}, @code{c_lex}, and so on.  @xref{Multiple
+Parsers, ,Multiple Parsers in the Same Program}.

 
 @item %no-parser
 Do not include any C code in the parser file; generate tables only.  The
 
 @item %no-parser
 Do not include any C code in the parser file; generate tables only.  The


@@ -3296,14 +3317,14 @@ Specify the @var{filename} for the parser file.
 Request a pure (reentrant) parser program (@pxref{Pure Decl, ,A Pure
 (Reentrant) Parser}).
 
 Request a pure (reentrant) parser program (@pxref{Pure Decl, ,A Pure
 (Reentrant) Parser}).
 

-@c @item %source_extension
+@c @item %source-extension

 @c Specify the extension of the parser output file.
 @c
 @c For example, a grammar file named @file{foo.yy} and containing a
 @c Specify the extension of the parser output file.
 @c
 @c For example, a grammar file named @file{foo.yy} and containing a

-@c @code{%source_extension .cpp} directive will produce a parser file
+@c @code{%source-extension .cpp} directive will produce a parser file

 @c named @file{foo.tab.cpp}
 
 @c named @file{foo.tab.cpp}
 

-@item %token_table
+@item %token-table

 Generate an array of token names in the parser file.  The name of the
 array is @code{yytname}; @code{yytname[@var{i}]} is the name of the
 token whose internal Bison token code number is @var{i}.  The first three
 Generate an array of token names in the parser file.  The name of the
 array is @code{yytname}; @code{yytname[@var{i}]} is the name of the
 token whose internal Bison token code number is @var{i}.  The first three


@@ -3321,7 +3342,7 @@ consists of three characters @samp{*"*}, its string in @code{yytname}
 contains @samp{"*"*"}.  (In C, that would be written as
 @code{"\"*\"*\""}).
 
 contains @samp{"*"*"}.  (In C, that would be written as
 @code{"\"*\"*\""}).
 

-When you specify @code{%token_table}, Bison also generates macro
+When you specify @code{%token-table}, Bison also generates macro

 definitions for macros @code{YYNTOKENS}, @code{YYNNTS}, and
 @code{YYNRULES}, and @code{YYNSTATES}:
 
 definitions for macros @code{YYNTOKENS}, @code{YYNNTS}, and
 @code{YYNRULES}, and @code{YYNSTATES}:
 


@@ -3352,7 +3373,6 @@ called @file{foo.tab.c} by default.  As a consequence, the verbose
 output file is called @file{foo.output}.@refill
 
 @item %yacc
 output file is called @file{foo.output}.@refill
 
 @item %yacc

-@itemx %fixed-output-files

 Pretend the option @option{--yacc} was given, i.e., imitate Yacc,
 including its naming conventions.  @xref{Bison Options}, for more.
 @end table
 Pretend the option @option{--yacc} was given, i.e., imitate Yacc,
 including its naming conventions.  @xref{Bison Options}, for more.
 @end table


@@ -3369,10 +3389,10 @@ language with the same program?  Then you need to avoid a name conflict
 between different definitions of @code{yyparse}, @code{yylval}, and so on.
 
 The easy way to do this is to use the option @samp{-p @var{prefix}}
 between different definitions of @code{yyparse}, @code{yylval}, and so on.
 
 The easy way to do this is to use the option @samp{-p @var{prefix}}

-(@pxref{Invocation, ,Invoking Bison}).  This renames the interface functions and
-variables of the Bison parser to start with @var{prefix} instead of
-@samp{yy}.  You can use this to give each parser distinct names that do
-not conflict.
+(@pxref{Invocation, ,Invoking Bison}).  This renames the interface
+functions and variables of the Bison parser to start with @var{prefix}
+instead of @samp{yy}.  You can use this to give each parser distinct
+names that do not conflict.

 
 The precise list of symbols renamed is @code{yyparse}, @code{yylex},
 @code{yyerror}, @code{yynerrs}, @code{yylval}, @code{yychar} and
 
 The precise list of symbols renamed is @code{yyparse}, @code{yylex},
 @code{yyerror}, @code{yynerrs}, @code{yylval}, @code{yychar} and


@@ -3543,7 +3563,7 @@ for (i = 0; i < YYNTOKENS; i++)
 @end smallexample
 
 The @code{yytname} table is generated only if you use the
 @end smallexample
 
 The @code{yytname} table is generated only if you use the

-@code{%token_table} declaration.  @xref{Decl Summary}.
+@code{%token-table} declaration.  @xref{Decl Summary}.

 @end itemize
 
 @node Token Values
 @end itemize
 
 @node Token Values


@@ -3566,9 +3586,10 @@ Thus, if the type is @code{int} (the default), you might write this in
 @end example
 
 When you are using multiple data types, @code{yylval}'s type is a union
 @end example
 
 When you are using multiple data types, @code{yylval}'s type is a union

-made from the @code{%union} declaration (@pxref{Union Decl, ,The Collection of Value Types}).  So when
-you store a token's value, you must use the proper member of the union.
-If the @code{%union} declaration looks like this:
+made from the @code{%union} declaration (@pxref{Union Decl, ,The
+Collection of Value Types}).  So when you store a token's value, you
+must use the proper member of the union.  If the @code{%union}
+declaration looks like this:

 
 @example
 @group
 
 @example
 @group


@@ -3616,7 +3637,7 @@ The data type of @code{yylloc} has the name @code{YYLTYPE}.
 @node Pure Calling
 @subsection Calling Conventions for Pure Parsers
 
 @node Pure Calling
 @subsection Calling Conventions for Pure Parsers
 

-When you use the Bison declaration @code{%pure_parser} to request a
+When you use the Bison declaration @code{%pure-parser} to request a

 pure, reentrant parser, the global communication variables @code{yylval}
 and @code{yylloc} cannot be used.  (@xref{Pure Decl, ,A Pure (Reentrant)
 Parser}.)  In such parsers the two global variables are replaced by
 pure, reentrant parser, the global communication variables @code{yylval}
 and @code{yylloc} cannot be used.  (@xref{Pure Decl, ,A Pure (Reentrant)
 Parser}.)  In such parsers the two global variables are replaced by


@@ -3716,7 +3737,7 @@ arguments in total, depending on whether an argument of type
 the proper object type, or you can declare it as @code{void *} and
 access the contents as shown above.
 
 the proper object type, or you can declare it as @code{void *} and
 access the contents as shown above.
 

-You can use @samp{%pure_parser} to request a reentrant parser without
+You can use @samp{%pure-parser} to request a reentrant parser without

 also using @code{YYPARSE_PARAM}.  Then you should call @code{yyparse}
 with no arguments, as usual.
 
 also using @code{YYPARSE_PARAM}.  Then you should call @code{yyparse}
 with no arguments, as usual.
 


@@ -3777,8 +3798,8 @@ immediately return 1.
 @vindex yynerrs
 The variable @code{yynerrs} contains the number of syntax errors
 encountered so far.  Normally this variable is global; but if you
 @vindex yynerrs
 The variable @code{yynerrs} contains the number of syntax errors
 encountered so far.  Normally this variable is global; but if you

-request a pure parser (@pxref{Pure Decl, ,A Pure (Reentrant) Parser}) then it is a local variable
-which only the actions can access.
+request a pure parser (@pxref{Pure Decl, ,A Pure (Reentrant) Parser})
+then it is a local variable which only the actions can access.

 
 @node Action Features
 @section Special Features for Use in Actions
 
 @node Action Features
 @section Special Features for Use in Actions


@@ -3799,7 +3820,8 @@ Acts like a variable that contains the semantic value for the
 
 @item $<@var{typealt}>$
 Like @code{$$} but specifies alternative @var{typealt} in the union
 
 @item $<@var{typealt}>$
 Like @code{$$} but specifies alternative @var{typealt} in the union

-specified by the @code{%union} declaration.  @xref{Action Types, ,Data Types of Values in Actions}.
+specified by the @code{%union} declaration.  @xref{Action Types, ,Data
+Types of Values in Actions}.

 
 @item $<@var{typealt}>@var{n}
 Like @code{$@var{n}} but specifies alternative @var{typealt} in the
 
 @item $<@var{typealt}>@var{n}
 Like @code{$@var{n}} but specifies alternative @var{typealt} in the


@@ -4228,18 +4250,19 @@ and therefore are represented by names, not character literals.)
 
 The first effect of the precedence declarations is to assign precedence
 levels to the terminal symbols declared.  The second effect is to assign
 
 The first effect of the precedence declarations is to assign precedence
 levels to the terminal symbols declared.  The second effect is to assign

-precedence levels to certain rules: each rule gets its precedence from the
-last terminal symbol mentioned in the components.  (You can also specify
-explicitly the precedence of a rule.  @xref{Contextual Precedence, ,Context-Dependent Precedence}.)
-
-Finally, the resolution of conflicts works by comparing the
-precedence of the rule being considered with that of the
-look-ahead token.  If the token's precedence is higher, the
-choice is to shift.  If the rule's precedence is higher, the
-choice is to reduce.  If they have equal precedence, the choice
-is made based on the associativity of that precedence level.  The
-verbose output file made by @samp{-v} (@pxref{Invocation, ,Invoking Bison}) says
-how each conflict was resolved.
+precedence levels to certain rules: each rule gets its precedence from
+the last terminal symbol mentioned in the components.  (You can also
+specify explicitly the precedence of a rule.  @xref{Contextual
+Precedence, ,Context-Dependent Precedence}.)
+
+Finally, the resolution of conflicts works by comparing the precedence
+of the rule being considered with that of the look-ahead token.  If the
+token's precedence is higher, the choice is to shift.  If the rule's
+precedence is higher, the choice is to reduce.  If they have equal
+precedence, the choice is made based on the associativity of that
+precedence level.  The verbose output file made by @samp{-v}
+(@pxref{Invocation, ,Invoking Bison}) says how each conflict was
+resolved.

 
 Not all rules and not all tokens have precedence.  If either the rule or
 the look-ahead token has no precedence, then the default is to shift.
 
 Not all rules and not all tokens have precedence.  If either the rule or
 the look-ahead token has no precedence, then the default is to shift.


@@ -4916,14 +4939,21 @@ If a Bison grammar compiles properly but doesn't do what you want when it
 runs, the @code{yydebug} parser-trace feature can help you figure out why.
 
 To enable compilation of trace facilities, you must define the macro
 runs, the @code{yydebug} parser-trace feature can help you figure out why.
 
 To enable compilation of trace facilities, you must define the macro

-@code{YYDEBUG} when you compile the parser.  You could use @samp{-DYYDEBUG=1}
-as a compiler option or you could put @samp{#define YYDEBUG 1} in the prologue
-of the grammar file (@pxref{Prologue, , The Prologue}). Alternatively, use the
-@samp{-t} option when you run Bison (@pxref{Invocation, ,Invoking Bison}).
-We always define @code{YYDEBUG} so that debugging is always possible.
-
-The trace facility uses @code{stderr}, so you must add
-@w{@code{#include <stdio.h>}} to the prologue unless it is already there.
+@code{YYDEBUG} to a nonzero value when you compile the parser.  You
+could use @samp{-DYYDEBUG=1} as a compiler option or you could put
+@samp{#define YYDEBUG 1} in the prologue of the grammar file
+(@pxref{Prologue, , The Prologue}).  Alternatively, use the @samp{-t}
+option when you run Bison (@pxref{Invocation, ,Invoking Bison}) or the
+@code{%debug} declaration (@pxref{Decl Summary, ,Bison Declaration
+Summary}).  We suggest that you always define @code{YYDEBUG} so that
+debugging is always possible.
+
+The trace facility outputs messages with macro calls of the form
+@code{YYFPRINTF (stderr, @var{format}, @var{args})} where
+@var{format} and @var{args} are the usual @code{printf} format and
+arguments.  If you define @code{YYDEBUG} to a nonzero value but do not
+define @code{YYFPRINTF}, @code{<stdio.h>} is automatically included
+and @code{YYPRINTF} is defined to @code{fprintf}.

 
 Once you have compiled the program with trace facilities, the way to
 request a trace is to store a nonzero value in the variable @code{yydebug}.
 
 Once you have compiled the program with trace facilities, the way to
 request a trace is to store a nonzero value in the variable @code{yydebug}.


@@ -4948,13 +4978,14 @@ of the state stack afterward.
 @end itemize
 
 To make sense of this information, it helps to refer to the listing file
 @end itemize
 
 To make sense of this information, it helps to refer to the listing file

-produced by the Bison @samp{-v} option (@pxref{Invocation, ,Invoking Bison}).  This file
-shows the meaning of each state in terms of positions in various rules, and
-also what each state will do with each possible input token.  As you read
-the successive trace messages, you can see that the parser is functioning
-according to its specification in the listing file.  Eventually you will
-arrive at the place where something undesirable happens, and you will see
-which parts of the grammar are to blame.
+produced by the Bison @samp{-v} option (@pxref{Invocation, ,Invoking
+Bison}).  This file shows the meaning of each state in terms of
+positions in various rules, and also what each state will do with each
+possible input token.  As you read the successive trace messages, you
+can see that the parser is functioning according to its specification in
+the listing file.  Eventually you will arrive at the place where
+something undesirable happens, and you will see which parts of the
+grammar are to blame.

 
 The parser file is a C program and you can use C debuggers on it, but it's
 not easy to interpret what it is doing.  The parser function is a
 
 The parser file is a C program and you can use C debuggers on it, but it's
 not easy to interpret what it is doing.  The parser function is a


@@ -5002,7 +5033,7 @@ Here @var{infile} is the grammar file name, which usually ends in
 @samp{.y}.  The parser file's name is made by replacing the @samp{.y}
 with @samp{.tab.c}.  Thus, the @samp{bison foo.y} filename yields
 @file{foo.tab.c}, and the @samp{bison hack/foo.y} filename yields
 @samp{.y}.  The parser file's name is made by replacing the @samp{.y}
 with @samp{.tab.c}.  Thus, the @samp{bison foo.y} filename yields
 @file{foo.tab.c}, and the @samp{bison hack/foo.y} filename yields

-@file{hack/foo.tab.c}. It's is also possible, in case you are writting
+@file{hack/foo.tab.c}. It's is also possible, in case you are writing

 C++ code instead of C in your grammar file, to name it @file{foo.ypp}
 or @file{foo.y++}. Then, the output files will take an extention like
 the given one as input (repectively @file{foo.tab.cpp} and @file{foo.tab.c++}).
 C++ code instead of C in your grammar file, to name it @file{foo.ypp}
 or @file{foo.y++}. Then, the output files will take an extention like
 the given one as input (repectively @file{foo.tab.cpp} and @file{foo.tab.c++}).


@@ -5061,7 +5092,6 @@ Print the version number of Bison and exit.
 @need 1750
 @item -y
 @itemx --yacc
 @need 1750
 @item -y
 @itemx --yacc

-@itemx --fixed-output-files

 Equivalent to @samp{-o y.tab.c}; the parser output file is called
 @file{y.tab.c}, and the other outputs are called @file{y.output} and
 @file{y.tab.h}.  The purpose of this option is to imitate Yacc's output
 Equivalent to @samp{-o y.tab.c}; the parser output file is called
 @file{y.tab.c}, and the other outputs are called @file{y.output} and
 @file{y.tab.h}.  The purpose of this option is to imitate Yacc's output


@@ -5084,9 +5114,9 @@ you are developing Bison.
 
 @item -t
 @itemx --debug
 
 @item -t
 @itemx --debug

-Output a definition of the macro @code{YYDEBUG} into the parser file, so
-that the debugging facilities are compiled.  @xref{Debugging, ,Debugging
-Your Parser}.
+In the parser file, define the macro @code{YYDEBUG} to 1 if it is not
+already defined, so that the debugging facilities are compiled.
+@xref{Debugging, ,Debugging Your Parser}.

 
 @item --locations
 Pretend that @code{%locations} was specified.  @xref{Decl Summary}.
 
 @item --locations
 Pretend that @code{%locations} was specified.  @xref{Decl Summary}.


@@ -5174,7 +5204,7 @@ would like to direct Bison to use a different copy, setting the
 environment variable @code{BISON_SIMPLE} to the path of the file will
 cause Bison to use that copy instead.
 
 environment variable @code{BISON_SIMPLE} to the path of the file will
 cause Bison to use that copy instead.
 

-When the @samp{%semantic_parser} declaration is used, Bison copies from
+When the @samp{%semantic-parser} declaration is used, Bison copies from

 a file called @file{bison.hairy} instead.  The location of this file can
 also be specified or overridden in a similar fashion, with the
 @code{BISON_HAIRY} environment variable.
 a file called @file{bison.hairy} instead.  The location of this file can
 also be specified or overridden in a similar fashion, with the
 @code{BISON_HAIRY} environment variable.


@@ -5194,7 +5224,6 @@ the corresponding short option.
 \line{ --debug \leaderfill -t}
 \line{ --defines \leaderfill -d}
 \line{ --file-prefix \leaderfill -b}
 \line{ --debug \leaderfill -t}
 \line{ --defines \leaderfill -d}
 \line{ --file-prefix \leaderfill -b}

-\line{ --fixed-output-files \leaderfill -y}

 \line{ --graph \leaderfill -g}
 \line{ --help \leaderfill -h}
 \line{ --name-prefix \leaderfill -p}
 \line{ --graph \leaderfill -g}
 \line{ --help \leaderfill -h}
 \line{ --name-prefix \leaderfill -p}


@@ -5213,7 +5242,6 @@ the corresponding short option.
 --debug                               -t
 --defines=@var{defines-file}          -d
 --file-prefix=@var{prefix}                  -b @var{file-prefix}
 --debug                               -t
 --defines=@var{defines-file}          -d
 --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}
 --graph=@var{graph-file}              -d
 --help                                -h
 --name-prefix=@var{prefix}                  -p @var{name-prefix}


@@ -5223,6 +5251,7 @@ the corresponding short option.
 --token-table                         -k
 --verbose                             -v
 --version                             -V
 --token-table                         -k
 --verbose                             -v
 --version                             -V

+--yacc                                -y

 @end example
 @end ifinfo
 
 @end example
 @end ifinfo
 


@@ -5360,8 +5389,9 @@ containing an error message.  @xref{Error Reporting, ,The Error
 Reporting Function @code{yyerror}}.
 
 @item yylex
 Reporting Function @code{yyerror}}.
 
 @item yylex

-User-supplied lexical analyzer function, called with no arguments
-to get the next token.  @xref{Lexical, ,The Lexical Analyzer Function @code{yylex}}.
+User-supplied lexical analyzer function, called with no arguments to get
+the next token.  @xref{Lexical, ,The Lexical Analyzer Function
+@code{yylex}}.

 
 @item yylval
 External variable in which @code{yylex} should place the semantic
 
 @item yylval
 External variable in which @code{yylex} should place the semantic


@@ -5397,11 +5427,11 @@ Bison declaration to create a header file meant for the scanner.
 Bison declaration to set tge prefix of the output files. @xref{Decl
 Summary}.
 
 Bison declaration to set tge prefix of the output files. @xref{Decl
 Summary}.
 

-@c @item %source_extension
+@c @item %source-extension

 @c Bison declaration to specify the generated parser output file extension.
 @c @xref{Decl Summary}.
 @c
 @c Bison declaration to specify the generated parser output file extension.
 @c @xref{Decl Summary}.
 @c

-@c @item %header_extension
+@c @item %header-extension

 @c Bison declaration to specify the generated parser header file extension
 @c if required. @xref{Decl Summary}.
 
 @c Bison declaration to specify the generated parser header file extension
 @c if required. @xref{Decl Summary}.
 


@@ -5437,7 +5467,8 @@ Bison declaration to assign right associativity to token(s).
 @xref{Precedence Decl, ,Operator Precedence}.
 
 @item %start
 @xref{Precedence Decl, ,Operator Precedence}.
 
 @item %start

-Bison declaration to specify the start symbol.  @xref{Start Decl, ,The Start-Symbol}.
+Bison declaration to specify the start symbol.  @xref{Start Decl, ,The
+Start-Symbol}.

 
 @item %token
 Bison declaration to declare token(s) without specifying precedence.
 
 @item %token
 Bison declaration to declare token(s) without specifying precedence.


@@ -5448,7 +5479,8 @@ Bison declaration to include a token name table in the parser file.
 @xref{Decl Summary}.
 
 @item %type
 @xref{Decl Summary}.
 
 @item %type

-Bison declaration to declare nonterminals.  @xref{Type Decl, ,Nonterminal Symbols}.
+Bison declaration to declare nonterminals.  @xref{Type Decl,
+,Nonterminal Symbols}.

 
 @item %union
 Bison declaration to specify several possible data types for semantic
 
 @item %union
 Bison declaration to specify several possible data types for semantic