From 1bfafa0fba9c7f45464504c31be5af59e75dc3cf Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Wed, 29 Apr 2015 11:52:07 +0200
Subject: [PATCH] preprocessor: allow syntax for estimated_params in accordance
with #849
---
preprocessor/DynareBison.yy | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/preprocessor/DynareBison.yy b/preprocessor/DynareBison.yy
index b7288da93a..a6b17d10b2 100644
--- a/preprocessor/DynareBison.yy
+++ b/preprocessor/DynareBison.yy
@@ -1155,7 +1155,14 @@ estimated_list : estimated_list estimated_elem
{ driver.add_estimated_params_element(); }
;
-estimated_elem : estimated_elem1 COMMA estimated_elem2 ';';
+estimated_elem : estimated_elem1 COMMA estimated_elem2 ';'
+ | symbol ';'
+ {
+ driver.estim_params.type = 2;
+ driver.estim_params.name = *$1;
+ delete $1;
+ }
+ ;
estimated_elem1 : STDERR symbol
{
@@ -1204,6 +1211,11 @@ estimated_elem2 : prior_pdf COMMA estimated_elem3
{
driver.estim_params.init_val = $1;
}
+ | COMMA expression_or_empty COMMA expression_or_empty
+ {
+ driver.estim_params.low_bound = $2;
+ driver.estim_params.up_bound = $4;
+ }
| expression_or_empty COMMA expression_or_empty COMMA expression_or_empty
{
driver.estim_params.init_val = $1;
--
GitLab