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

* NEWS: Document when yyparse started to return 2.

Browse Source 
* doc/bison.texinfo (Parser Function): Document when yyparse
returns 2.

* data/lalr1.cc: Revert part of previous change, as it's incompatible.
(b4_filename_type): Renamed back from b4_file_name_type.  All uses
changed.
(class position): file_name -> filename (reverting).  All uses changed.
This commit is contained in:
Paul Eggert
2005-09-15 14:06:52 +00:00
parent 94306d5282
commit b47dbebee5
4 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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_file_name_type], [std::string])
m4_define_default([b4_filename_type], [std::string])
# b4_lhs_location()
# -----------------
@@ -1256,7 +1256,7 @@ namespace yy
public:
/// Construct a position.
position () :
file_name (0),
filename (0),
line (initial_line),
column (initial_column)
{
@@ -1288,7 +1288,7 @@ namespace yy
public:
/// File name to which this position refers.
]b4_file_name_type[* file_name;
]b4_filename_type[* filename;
/// 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.file_name)
ostr << *pos.file_name << ':';
if (pos.filename)
ostr << *pos.filename << ':';
return ostr << pos.line << '.' << pos.column;
}
@@ -1435,9 +1435,9 @@ namespace yy
{
position last = loc.end - 1;
ostr << loc.begin;
if (last.file_name
&& (!loc.begin.file_name
|| *loc.begin.file_name != *last.file_name))
if (last.filename
&& (!loc.begin.filename
|| *loc.begin.filename != *last.filename))
ostr << '-' << last;
else if (loc.begin.line != last.line)
ostr << '-' << last.line << '.' << last.column;