From 9873407ac4c92bfc3ef643bce7cc1026b17d1edb Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Mon, 16 Feb 2015 08:43:40 +0100
Subject: [PATCH] Fix parser to compile with bison 3

---
 src/query/wasaparse.y | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/query/wasaparse.y b/src/query/wasaparse.y
index c803dd41..e37f7e4e 100644
--- a/src/query/wasaparse.y
+++ b/src/query/wasaparse.y
@@ -12,7 +12,8 @@
 
 using namespace std;
 
-int yylex(yy::parser::semantic_type *, WasaParserDriver *);
+int yylex(yy::parser::semantic_type *, yy::parser::location_type *, 
+		  WasaParserDriver *);
 void yyerror(char const *);
 static void qualify(Rcl::SearchDataClauseDist *, const string &);
 
@@ -26,6 +27,7 @@ static void addSubQuery(WasaParserDriver *d,
 
 %skeleton "lalr1.cc"
 %defines
+%locations
 %error-verbose
 
 %parse-param {WasaParserDriver* d}
@@ -330,7 +332,8 @@ out:
 }
 
 
-int yylex(yy::parser::semantic_type *yylval, WasaParserDriver *d)
+int yylex(yy::parser::semantic_type *yylval, yy::parser::location_type *, 
+		  WasaParserDriver *d)
 {
     if (!d->qualifiers().empty()) {
         yylval->str = new string();