From 234c9c298f7079c23d764e89c6f27042e37b5b24 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Mon, 29 Oct 2018 15:31:14 +0100 Subject: [PATCH] require bison 3.0 and fix obsolete api.location.type usage * spot/parseaut/parseaut.yy, spot/parsetl/parsetl.yy: Explicitly Bison 3.0, and use a code argument instead of an (deprecated) string argument for api.location.type. --- spot/parseaut/parseaut.yy | 3 ++- spot/parsetl/parsetl.yy | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spot/parseaut/parseaut.yy b/spot/parseaut/parseaut.yy index 08270fc76..1e17afd20 100644 --- a/spot/parseaut/parseaut.yy +++ b/spot/parseaut/parseaut.yy @@ -17,6 +17,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ +%require "3.0" %language "C++" %locations %defines @@ -26,7 +27,7 @@ %error-verbose %parse-param {void* scanner} %lex-param {void* scanner} { PARSE_ERROR_LIST } -%define api.location.type "spot::location" +%define api.location.type {spot::location} %code requires { diff --git a/spot/parsetl/parsetl.yy b/spot/parsetl/parsetl.yy index 84e745f1a..d32535342 100644 --- a/spot/parsetl/parsetl.yy +++ b/spot/parsetl/parsetl.yy @@ -21,6 +21,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ +%require "3.0" %language "C++" %locations %defines @@ -29,7 +30,7 @@ %error-verbose %expect 0 %lex-param { spot::parse_error_list& error_list } -%define api.location.type "spot::location" +%define api.location.type {spot::location} %code requires {