* data/bison.simple (yyparse): Do not implement @$ = @1.

[bison.git] / doc / bison.texinfo

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 84a4ae8ebdb9fcdf58a7c7dff84e1380d2665d86..b38cdb2170886f71ff2ba59c63ee6528068fd278 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -766,7 +766,7 @@ general form of a Bison grammar file is as follows:
 
 @example
 %@{
-@var{Prologue (declarations)}
+@var{Prologue}
 %@}
 
 @var{Bison declarations}
@@ -774,7 +774,7 @@ general form of a Bison grammar file is as follows:
 %%
 @var{Grammar rules}
 %%
-@var{Epilogue (additional code)}
+@var{Epilogue}
 @end example
 
 @noindent
@@ -2043,7 +2043,7 @@ Comments enclosed in @samp{/* @dots{} */} may appear in any of the sections.
 @cindex Prologue
 @cindex declarations
 
-The @var{prologue} section contains macro definitions and
+The @var{Prologue} section contains macro definitions and
 declarations of functions and variables that are used in the actions in the
 grammar rules.  These are copied to the beginning of the parser file so
 that they precede the definition of @code{yyparse}.  You can use
@@ -2079,8 +2079,8 @@ if it is the first thing in the file.
 @cindex epilogue
 @cindex C code, section for additional
 
-The @var{epilogue} is copied verbatim to the end of the parser file, just as
-the @var{prologue} is copied to the beginning.  This is the most convenient
+The @var{Epilogue} is copied verbatim to the end of the parser file, just as
+the @var{Prologue} is copied to the beginning.  This is the most convenient
 place to put anything that you want to have in the parser file but which need
 not come before the definition of @code{yyparse}.  For example, the
 definitions of @code{yylex} and @code{yyerror} often go here.
@@ -2886,9 +2886,11 @@ By default, it is defined this way:
 
 @example
 @group
-#define YYLLOC_DEFAULT(Current, Rhs, N)         \
-  Current.last_line   = Rhs[N].last_line;       \
-  Current.last_column = Rhs[N].last_column;
+#define YYLLOC_DEFAULT(Current, Rhs, N)          \
+  Current.first_line   = Rhs[1].first_line;      \
+  Current.first_column = Rhs[1].first_column;    \
+  Current.last_line    = Rhs[N].last_line;       \
+  Current.last_column  = Rhs[N].last_column;
 @end group
 @end example
 
@@ -2900,12 +2902,8 @@ All arguments are free of side-effects. However, only the first one (the
 result) should be modified by @code{YYLLOC_DEFAULT}.
 
 @item
-Before @code{YYLLOC_DEFAULT} is executed, the output parser sets @code{@@$}
-to @code{@@1}.
-
-@item
-For consistency with semantic actions, valid indexes for the location array
-range from 1 to @var{n}.
+For consistency with semantic actions, valid indexes for the location
+array range from 1 to @var{n}.
 @end itemize
 
 @node Declarations
@@ -5233,7 +5231,6 @@ the output graph filename.
 @node Environment Variables
 @section Environment Variables
 @cindex environment variables
-@cindex BISON_HAIRY
 @cindex BISON_SIMPLE
 
 Here is a list of environment variables which affect the way Bison
@@ -5241,18 +5238,11 @@ runs.
 
 @table @samp
 @item BISON_SIMPLE
-@itemx BISON_HAIRY
 Much of the parser generated by Bison is copied verbatim from a file
 called @file{bison.simple}.  If Bison cannot find that file, or if you
 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.
-
-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.
-
 @end table
 
 @node Option Cross Key