Fix yyerror_range for user-defined location type in C++.

Reported by Georg Sauthoff at
<http://lists.gnu.org/archive/html/bug-bison/2008-08/msg00008.html>.
* data/lalr1.cc (parse): Change type of yyerror_range to location_type.
* THANKS (Georg Sauthoff): Add.

diff --git a/ChangeLog b/ChangeLog
index 8512a978adc4f57ef6cddcbed82f01d5b0b91f61..e11cef1fee4d56df94cd477f84d93a815ad2c40a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-18  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       Fix yyerror_range for user-defined location type in C++.  Reported by
+       Georg Sauthoff at
+       <http://lists.gnu.org/archive/html/bug-bison/2008-08/msg00008.html>.
+       * data/lalr1.cc (parse): Change type of yyerror_range to location_type.
+       * THANKS (Georg Sauthoff): Add.
+
 2008-10-18  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Update several administrative files mainly to facilitate releasing.

diff --git a/THANKS b/THANKS
index 7b16cf3cbc6f2851bb1722e62f612c9d341cecf2..6785e2a8cdd331dd8f29e0f18fb615148f9962fe 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -34,6 +34,7 @@ Fabrice Bauzac            noon@cote-dazur.com
 Florian Krohm             florian@edamail.fishkill.ibm.com
 Frank Heckenbach          frank@g-n-u.de
 Frans Englich             frans.englich@telia.com
+Georg Sauthoff            gsauthof@TechFak.Uni-Bielefeld.DE
 Goran Uddeborg            goeran@uddeborg.se
 Guido Trentalancia        trentalg@aston.ac.uk
 H. Merijn Brand           h.m.brand@hccnet.nl

diff --git a/data/lalr1.cc b/data/lalr1.cc
index bc371dcc300a9b56e9c3a16c6b2f29ca5670ffa4..927466a2205dc0eeb7994f862df05205c15c21a5 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -537,7 +537,7 @@ do {                                        \
     /// Location of the lookahead.
     location_type yylloc;
     /// The locations where the error started and ended.
-    location yyerror_range[2];
+    location_type yyerror_range[2];
 
     /// $$.
     semantic_type yyval;