[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
maint: c++: locations: provide convenience constructors
From: |
Akim Demaille |
Subject: |
maint: c++: locations: provide convenience constructors |
Date: |
Fri, 30 Mar 2012 17:14:24 +0200 |
For maint, taken from master.
From 43cb87ff7aba174c089a66e80c52aedaa141af85 Mon Sep 17 00:00:00 2001
From: Akim Demaille <address@hidden>
Date: Tue, 23 Sep 2008 13:49:41 +0200
Subject: [PATCH 2/2] c++: locations: provide convenience constructors.
* 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.
(cherry picked from commit 0634493cdde92cbdb8d9fb95a5bebe596bb53798)
Conflicts:
ChangeLog-2012
data/location.cc
---
data/location.cc | 43 +++++++++++++++++++++++++++++++------------
1 file changed, 31 insertions(+), 12 deletions(-)
diff --git a/data/location.cc b/data/location.cc
index 970b14d..d492418 100644
--- a/data/location.cc
+++ b/data/location.cc
@@ -41,29 +41,32 @@ b4_copyright([Positions for Bison parsers in C++],
class position
{
public:
-]m4_ifdef([b4_location_constructors], [
+]m4_ifdef([b4_location_constructors], [[
/// Construct a position.
- position ()
- : filename (YY_NULL), line (]b4_location_initial_line[), column
(]b4_location_initial_column[)
+ explicit position (]b4_percent_define_get([[filename_type]])[* f = YY_NULL,
+ unsigned int l = ]b4_location_initial_line[u,
+ unsigned int c = ]b4_location_initial_column[u)
+ : filename (f)
+ , line (l)
+ , column (c)
{
}
-])[
+]])[
/// Initialization.
void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULL)
{
filename = fn;
- line = ]b4_location_initial_line[;
- column = ]b4_location_initial_column[;
+ line = ]b4_location_initial_line[u;
+ column = ]b4_location_initial_column[u;
}
/** \name Line and Column related manipulators
** \{ */
- public:
/// (line related) Advance to the COUNT next lines.
void lines (int count = 1)
{
- column = ]b4_location_initial_column[;
+ column = ]b4_location_initial_column[u;
line += count;
}
@@ -74,7 +77,6 @@ b4_copyright([Positions for Bison parsers in C++],
}
/** \} */
- public:
/// File name to which this position refers.
]b4_percent_define_get([[filename_type]])[* filename;
/// Current line number.
@@ -168,9 +170,26 @@ b4_copyright([Locations for Bison parsers in C++],
{
public:
]m4_ifdef([b4_location_constructors], [
- /// Construct a location.
- location ()
- : begin (), end ()
+ /// Construct a location from \a b to \a e.
+ location (const position& b, const position& e)
+ : 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)
{
}
--
1.7.9.4
- maint: c++: locations: provide convenience constructors,
Akim Demaille <=