diff --git a/src/DynareBison.yy b/src/DynareBison.yy index e76c4c8b35510cc5dd60ac9fb6027abcc400e46b..ffbf50062659f20e435dd106a328ae4a49ddebfa 100644 --- a/src/DynareBison.yy +++ b/src/DynareBison.yy @@ -34,14 +34,6 @@ class ParsingDriver; %code requires { #include "ExprNode.hh" #include "CodeInterpreter.hh" - -/* Bison 3.2 passes semantic types through a macro, and commas in parametric - types are interpreted as macro arguments, leading to a compilation error. - Use type aliases to workaround the problem. - This bug has been fixed in Bison 3.2.2, so we can remove the workaround - at some point. */ -using pair_2strings = pair<string,string>; -using tuple_4strings = tuple<string,string,string,string>; } %param { ParsingDriver &driver } @@ -189,10 +181,9 @@ using tuple_4strings = tuple<string,string,string,string>; %type <vector<string>> change_type_var_list %type <vector<int>> vec_int_elem vec_int_1 vec_int vec_int_number %type <PriorDistributions> prior_pdf prior_distribution -// The following types use aliases, see comment above in the file -%type <pair_2strings> named_var_elem subsamples_eq_opt calibration_range integer_range_w_inf -%type <vector<pair_2strings>> named_var named_var_1 -%type <tuple_4strings> prior_eq_opt options_eq_opt +%type <pair<string,string>> named_var_elem subsamples_eq_opt calibration_range integer_range_w_inf +%type <vector<pair<string,string>>> named_var named_var_1 +%type <tuple<string,string,string,string>> prior_eq_opt options_eq_opt %% %start statement_list;