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

Provide convenience constructors for locations and positions.

Browse Source 
* data/location.cc (position::position): Accept file, line and
	column as arguments with default values.
	Always qualify initial line and column literals as unsigned.
	(location::location): Provide convenience constructors.
This commit is contained in:
Akim Demaille
2008-09-23 13:49:41 +02:00
parent fe1b448ada
commit 0634493cdd
2 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2008-11-15 Akim Demaille <demaille@gostai.com>
Provide convenience constructors for locations and positions.
* data/location.cc (position::position): Accept file, line and
column as arguments with default values.
Always qualify initial line and column literals as unsigned.
(location::location): Provide convenience constructors.
2008-11-15 Akim Demaille <demaille@gostai.com> 2008-11-15 Akim Demaille <demaille@gostai.com>
Instead of using make_symbol<TOK_FOO>, generate make_FOO for each token type. Instead of using make_symbol<TOK_FOO>, generate make_FOO for each token type.

44
data/location.cc
View File

@@ -42,29 +42,33 @@ b4_copyright([Positions for Bison parsers in C++])[
class position class position
{ {
public: public:
]m4_ifdef([b4_location_constructors], [ ]m4_ifdef([b4_location_constructors], [[
/// Construct a position. /// Construct a position.
position () explicit position (]b4_percent_define_get([[filename_type]])[* f = 0,
: filename (0), line (]b4_location_initial_line[), column (]b4_location_initial_column[) unsigned int l = ]b4_location_initial_line[u,
unsigned int c = ]b4_location_initial_column[u)
: filename (f)
, line (l)
, column (c)
{ {
} }
])[ ]])[
/// Initialization. /// Initialization.
inline void initialize (]b4_percent_define_get([[filename_type]])[* fn) inline void initialize (]b4_percent_define_get([[filename_type]])[* fn)
{ {
filename = fn; filename = fn;
line = ]b4_location_initial_line[; line = ]b4_location_initial_line[u;
column = ]b4_location_initial_column[; column = ]b4_location_initial_column[u;
} }
/** \name Line and Column related manipulators /** \name Line and Column related manipulators
** \{ */ ** \{ */
public:
/// (line related) Advance to the COUNT next lines. /// (line related) Advance to the COUNT next lines.
/// Set current column to initial value.
inline void lines (int count = 1) inline void lines (int count = 1)
{ {
column = ]b4_location_initial_column[; column = ]b4_location_initial_column[u;
line += count; line += count;
} }
@@ -75,7 +79,6 @@ b4_copyright([Positions for Bison parsers in C++])[
} }
/** \} */ /** \} */
public:
/// File name to which this position refers. /// File name to which this position refers.
]b4_percent_define_get([[filename_type]])[* filename; ]b4_percent_define_get([[filename_type]])[* filename;
/// Current line number. /// Current line number.
@@ -167,9 +170,26 @@ b4_copyright([Locations for Bison parsers in C++])[
{ {
public: public:
]m4_ifdef([b4_location_constructors], [ ]m4_ifdef([b4_location_constructors], [
/// Construct a location. /// Construct a location from \a b to \a e.
location () location (const position& b, const position& e)
: begin (), end () : begin (b)
, end (e)
{
}
/// Construct a 0-width location in \a p.
explicit location (const position& p = position ())
: begin (p)
, end (p)
{
}
/// Construct a 0-width location in \a f, \a l, \a c.
explicit location (]b4_percent_define_get([[filename_type]])[* f,
unsigned int l = ]b4_location_initial_line[u,
unsigned int c = ]b4_location_initial_column[u)
: begin (f, l, c)
, end (f, l, c)
{ {
} }