From a72016b5729398d61fd7ca4c24b505ca88e48b1d Mon Sep 17 00:00:00 2001
From: sebastien <sebastien@ac1d8469-bf42-47a9-8791-bf33cf982152>
Date: Thu, 9 Apr 2009 14:49:12 +0000
Subject: [PATCH] 4.0 preprocessor: merged r2580 changeset from trunk (use
different tokens for inv_gamma_pdf and inv_gamma1_pdf (for more explicit
error messages and for consistency with ln and log))
git-svn-id: https://www.dynare.org/svn/dynare/branches/4.0@2581 ac1d8469-bf42-47a9-8791-bf33cf982152
---
preprocessor/DynareBison.yy | 4 +++-
preprocessor/DynareFlex.ll | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/preprocessor/DynareBison.yy b/preprocessor/DynareBison.yy
index b9c68306d3..b775d1466b 100644
--- a/preprocessor/DynareBison.yy
+++ b/preprocessor/DynareBison.yy
@@ -100,7 +100,7 @@ class ParsingDriver;
%token HISTVAL HP_FILTER HP_NGRID
%token INITVAL INITVAL_FILE
%token <string_val> INT_NUMBER
-%token INV_GAMMA1_PDF INV_GAMMA2_PDF IRF
+%token INV_GAMMA_PDF INV_GAMMA1_PDF INV_GAMMA2_PDF IRF
%token KALMAN_ALGO KALMAN_TOL
%token LAPLACE LCC_COMPILER LIK_ALGO LIK_INIT LINEAR LOAD_MH_FILE LOGLINEAR LU MARKOWITZ MAX
%token METHOD MH_DROP MH_INIT_SCALE MH_JSCALE MH_MODE MH_NBLOCKS MH_REPLIC MH_RECOVER MIN
@@ -921,6 +921,8 @@ prior : BETA_PDF
{ $$ = new string("2"); }
| NORMAL_PDF
{ $$ = new string("3"); }
+ | INV_GAMMA_PDF
+ { $$ = new string("4"); }
| INV_GAMMA1_PDF
{ $$ = new string("4"); }
| UNIFORM_PDF
diff --git a/preprocessor/DynareFlex.ll b/preprocessor/DynareFlex.ll
index 39cdf3b7af..1ba08c1abd 100644
--- a/preprocessor/DynareFlex.ll
+++ b/preprocessor/DynareFlex.ll
@@ -239,7 +239,7 @@ int sigma_e = 0;
<DYNARE_BLOCK>gamma_pdf {return token::GAMMA_PDF;}
<DYNARE_BLOCK>beta_pdf {return token::BETA_PDF;}
<DYNARE_BLOCK>normal_pdf {return token::NORMAL_PDF;}
-<DYNARE_BLOCK>inv_gamma_pdf {return token::INV_GAMMA1_PDF;}
+<DYNARE_BLOCK>inv_gamma_pdf {return token::INV_GAMMA_PDF;}
<DYNARE_BLOCK>inv_gamma1_pdf {return token::INV_GAMMA1_PDF;}
<DYNARE_BLOCK>inv_gamma2_pdf {return token::INV_GAMMA2_PDF;}
<DYNARE_BLOCK>uniform_pdf {return token::UNIFORM_PDF;}
--
GitLab