Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

4
data/glr.c
View File

@@ -179,7 +179,7 @@ b4_pre_prologue[
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
]m4_ifdef([b4_stype],
[b4_syncline([b4_stype_line], [b4_filename])
[b4_syncline([b4_stype_line], [b4_file_name])
typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ])b4_stype YYSTYPE;
/* Line __line__ of glr.c. */
b4_syncline([@oline@], [@ofile@])],
@@ -2306,7 +2306,7 @@ b4_token_defines(b4_tokens)
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
m4_ifdef([b4_stype],
[b4_syncline([b4_stype_line], [b4_filename])
[b4_syncline([b4_stype_line], [b4_file_name])
typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ])b4_stype YYSTYPE;
/* Line __line__ of glr.c. */
b4_syncline([@oline@], [@ofile@])],

18
data/lalr1.cc
View File

@@ -48,7 +48,7 @@ m4_define([b4_rhs_value],
[(yysemantic_stack_@{m4_eval([$1 - $2])@}m4_ifval([$3], [.$3]))])
m4_define_default([b4_location_type], [location])
m4_define_default([b4_filename_type], [std::string])
m4_define_default([b4_file_name_type], [std::string])
# b4_lhs_location()
# -----------------
@@ -164,7 +164,7 @@ b4_syncline([@oline@], [@ofile@])[
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
]m4_ifdef([b4_stype],
[b4_syncline([b4_stype_line], [b4_filename])
[b4_syncline([b4_stype_line], [b4_file_name])
union YYSTYPE b4_stype;
/* Line __line__ of lalr1.cc. */
b4_syncline([@oline@], [@ofile@])],
@@ -1256,7 +1256,7 @@ namespace yy
public:
/// Construct a position.
position () :
filename (0),
file_name (0),
line (initial_line),
column (initial_column)
{
@@ -1288,7 +1288,7 @@ namespace yy
public:
/// File name to which this position refers.
]b4_filename_type[* filename;
]b4_file_name_type[* file_name;
/// Current line number.
unsigned int line;
/// Current column number.
@@ -1332,8 +1332,8 @@ namespace yy
inline std::ostream&
operator<< (std::ostream& ostr, const position& pos)
{
if (pos.filename)
ostr << *pos.filename << ':';
if (pos.file_name)
ostr << *pos.file_name << ':';
return ostr << pos.line << '.' << pos.column;
}
@@ -1435,9 +1435,9 @@ namespace yy
{
position last = loc.end - 1;
ostr << loc.begin;
if (last.filename
&& (!loc.begin.filename
|| *loc.begin.filename != *last.filename))
if (last.file_name
&& (!loc.begin.file_name
|| *loc.begin.file_name != *last.file_name))
ostr << '-' << last;
else if (loc.begin.line != last.line)
ostr << '-' << last.line << '.' << last.column;

4
data/yacc.c
View File

@@ -189,7 +189,7 @@ b4_location_if([#define yylloc b4_prefix[]lloc])])[
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
]m4_ifdef([b4_stype],
[b4_syncline([b4_stype_line], [b4_filename])
[b4_syncline([b4_stype_line], [b4_file_name])
typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ])b4_stype YYSTYPE;
/* Line __line__ of yacc.c. */
b4_syncline([@oline@], [@ofile@])],
@@ -1414,7 +1414,7 @@ b4_token_defines(b4_tokens)
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
m4_ifdef([b4_stype],
[b4_syncline([b4_stype_line], [b4_filename])
[b4_syncline([b4_stype_line], [b4_file_name])
typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ])b4_stype YYSTYPE;
/* Line __line__ of yacc.c. */
b4_syncline([@oline@], [@ofile@])],