* doc/bison.texinfo: Correct typos in previous fix.

* data/glr.c: b4_filename -> b4_file_name.
* data/lalr1.cc: Likewise.  Also, b4_filename_type -> b4_file_name_type.
All uses changed.
(class position): filename -> file_name.  All uses changed.
* data/yacc.c: b4_filename -> b4_file_name.
* lib/bitset.h: filename -> file_name in local vars.
* lib/bitset_stats.c: Likewise.
* src/files.c: Likewise.
* src/scan-skel.l ("@output ".*\n): Likewise.
* src/files.c (file_name_split): Renamed from filename_split.
* src/muscle_tab.c (muscle_init): Output b4_file_name, not b4_filename.
This commit is contained in:
Paul Eggert
2005-09-09 22:42:15 +00:00
parent a420f9620e
commit 48b16bbc04
10 changed files with 57 additions and 45 deletions

View File

@@ -3779,10 +3779,11 @@ Declare that the @var{code} must be invoked before parsing each time
For instance, if your locations use a file name, you may use
@example
%parse-param @{ const char *file @};
%parse-param @{ char const *file_name @};
%initial-action
@{
@@$.begin.file = @@$.end.file = file;
@@$.begin.file_name = @@$.end.file_name = file_name;
@@$.begin.file_name = @@$.end.file_name = file_name;
@};
@end example
@@ -6950,7 +6951,7 @@ Symbols}.
@c - %locations
@c - class Position
@c - class Location
@c - %define "file_type" "const symbol::Symbol"
@c - %define "file_name_type" "const symbol::Symbol"
When the directive @code{%locations} is used, the C++ parser supports
location tracking, see @ref{Locations, , Locations Overview}. Two
@@ -6962,7 +6963,7 @@ and a @code{location}, a range composed of a pair of
The name of the file. It will always be handled as a pointer, the
parser will never duplicate nor deallocate it. As an experimental
feature you may change it to @samp{@var{type}*} using @samp{%define
"file_type" "@var{type}"}.
"file_name_type" "@var{type}"}.
@end deftypemethod
@deftypemethod {position} {unsigned int} line
@@ -7322,7 +7323,7 @@ automatically propagated.
%initial-action
@{
// Initialize the initial location.
@@$.begin.file = @@$.end.file = &driver.file;
@@$.begin.file_name = @@$.end.file_name = &driver.file;
@};
@end example