Use new syntax for various Bison options

issue#70
Sébastien Villemot 2018-07-31 12:00:26 +02:00
parent 4302307f7d
commit df01e52859
2 changed files with 6 additions and 10 deletions

View File

@ -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

View File

@ -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"
}