[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Provide convenience constructors for locations and positions.
From: |
Akim Demaille |
Subject: |
[PATCH] Provide convenience constructors for locations and positions. |
Date: |
Sat, 15 Nov 2008 09:27:08 -0000 |
* 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.
---
ChangeLog | 8 ++++++++
data/location.cc | 44 ++++++++++++++++++++++++++++++++------------
2 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c45ded0..a5cd3b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2008-11-15 Akim Demaille <address@hidden>
+ 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 <address@hidden>
+
Instead of using make_symbol<TOK_FOO>, generate make_FOO for each token
type.
Using template buys us nothing, and makes it uselessly complex to
construct a symbol. Besides, it could not be generalized to other
diff --git a/data/location.cc b/data/location.cc
index 39c7ca9..3ad89b3 100644
--- a/data/location.cc
+++ b/data/location.cc
@@ -42,29 +42,33 @@ 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 (0), line (]b4_location_initial_line[), column
(]b4_location_initial_column[)
+ explicit position (]b4_percent_define_get([[filename_type]])[* f = 0,
+ unsigned int l = ]b4_location_initial_line[u,
+ unsigned int c = ]b4_location_initial_column[u)
+ : filename (f)
+ , line (l)
+ , column (c)
{
}
-])[
+]])[
/// Initialization.
inline void initialize (]b4_percent_define_get([[filename_type]])[* fn)
{
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.
+ /// Set current column to initial value.
inline void lines (int count = 1)
{
- column = ]b4_location_initial_column[;
+ column = ]b4_location_initial_column[u;
line += count;
}
@@ -75,7 +79,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.
@@ -167,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.6.0.2.588.g3102
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] Provide convenience constructors for locations and positions.,
Akim Demaille <=