Re: Using "%define location_type" c++ skeleton should exclude default location

[Akim Demaille]

Le 14 avr. 2010 à 13:19, Akim Demaille a écrit :
> I have installed a first batch of changes in 2.5 and 2.6 to this end.  I 
> think I failed to keep you in CC, please have a look at the archive (it 
> should appear in 
> http://lists.gnu.org/archive/html/bison-patches/2010-04/threads.html I guess).

Installed in master and 2.5.

From 36dc3637a40459dbf1043f6ada9badbbba291957 Mon Sep 17 00:00:00 2001
From: Akim Demaille <address@hidden>
Date: Sat, 10 Apr 2010 13:37:21 +0200
Subject: [PATCH 02/18] tests: don't depend on the actual location type.

        * tests/calc.at: Use yy::parser::location_type rather than
        yy::location, since the former is always right, and might point to
        another type than the latter.
---
 ChangeLog     |    7 +++++++
 tests/calc.at |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 02fe9ce..5e38cd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-04-13  Akim Demaille  <address@hidden>
 
+       tests: don't depend on the actual location type.
+       * tests/calc.at: Use yy::parser::location_type rather than
+       yy::location, since the former is always right, and might point to
+       another type than the latter.
+
+2010-04-13  Akim Demaille  <address@hidden>
+
        formatting changes.
        * tests/calc.at: Formatting changes.
 
diff --git a/tests/calc.at b/tests/calc.at
index 61a7a1e..2f85baa 100644
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -176,7 +176,7 @@ typedef int semantic_value;
 /* The input.  */
 extern FILE *input;]AT_SKEL_CC_IF([[
 #ifndef YYLTYPE
-# define YYLTYPE ]AT_NAME_PREFIX[::location
+# define YYLTYPE ]AT_NAME_PREFIX[::parser::location_type
 #endif
 #define first_line   begin.line
 #define first_column begin.column
@@ -269,7 +269,7 @@ exp:
 ]AT_SKEL_CC_IF(
 [/* A C++ error reporting function.  */
 void
-AT_NAME_PREFIX::parser::error (AT_LOCATION_IF([const location& l, ])const 
std::string& m)
+AT_NAME_PREFIX::parser::error (AT_LOCATION_IF([const location_type& l, ])const 
std::string& m)
 {
   std::cerr << AT_LOCATION_IF([l << ": " << ])m << std::endl;
 }
-- 
1.7.0.5