From df01e52859c917b31f2e82418560eb6a8e49ab15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Tue, 31 Jul 2018 12:00:26 +0200
Subject: [PATCH] Use new syntax for various Bison options
---
src/DynareBison.yy | 8 +++-----
src/macro/MacroBison.yy | 8 +++-----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/DynareBison.yy b/src/DynareBison.yy
index ad7ed5ec..380d0bd4 100644
--- a/src/DynareBison.yy
+++ b/src/DynareBison.yy
@@ -22,7 +22,10 @@
%require "3.0"
%defines
%define api.value.type variant
+%define api.namespace {Dynare}
%define parse.assert
+%define parse.error verbose
+%define parse.trace
%code top {
class ParsingDriver;
@@ -33,8 +36,6 @@ class ParsingDriver;
#include "CodeInterpreter.hh"
}
-%name-prefix "Dynare"
-
%parse-param { ParsingDriver &driver }
%lex-param { ParsingDriver &driver }
@@ -45,9 +46,6 @@ class ParsingDriver;
@$.begin.filename = @$.end.filename = &(driver.lexer->filename);
}
-%debug
-%error-verbose
-
%code {
/* Little hack: we redefine the macro which computes the locations, because
we need to access the location from within the parsing driver for error
diff --git a/src/macro/MacroBison.yy b/src/macro/MacroBison.yy
index 4453fa7f..50484d55 100644
--- a/src/macro/MacroBison.yy
+++ b/src/macro/MacroBison.yy
@@ -22,14 +22,15 @@
%require "3.0"
%defines
%define api.value.type variant
+%define api.namespace {Macro}
%define parse.assert
+%define parse.error verbose
+%define parse.trace
%code top {
class MacroDriver;
}
-%name-prefix "Macro"
-
%parse-param { MacroDriver &driver }
%parse-param { ostream &out }
%lex-param { MacroDriver &driver }
@@ -41,9 +42,6 @@ class MacroDriver;
@$.begin.filename = @$.end.filename = &driver.file;
};
-%debug
-%error-verbose
-
%code requires {
#include "MacroValue.hh"
}
--
GitLab