From 3c5ce6aab9cfef79334d5d6bdeb8bac30c725f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Tue, 26 Mar 2013 17:10:37 +0100
Subject: [PATCH] =?UTF-8?q?Use=20syntax=20log=5Ftrend=5Fvar(log=5Fgrowth?=
=?UTF-8?q?=5Ffactor=20=3D=20=E2=80=A6)=20for=20consistency?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
doc/dynare.texi | 2 +-
preprocessor/DynareBison.yy | 4 ++--
preprocessor/DynareFlex.ll | 1 +
tests/trend_var/fs2000_log_nonstationary.mod | 4 ++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/doc/dynare.texi b/doc/dynare.texi
index 5664c0803c..22267f0b4d 100644
--- a/doc/dynare.texi
+++ b/doc/dynare.texi
@@ -1129,7 +1129,7 @@ trend_var (growth_factor=gA) A;
@end deffn
-@deffn Command log_trend_var (growth_factor = @var{MODEL_EXPRESSION}) @var{VARIABLE_NAME} [$@var{LATEX_NAME}$]@dots{};
+@deffn Command log_trend_var (log_growth_factor = @var{MODEL_EXPRESSION}) @var{VARIABLE_NAME} [$@var{LATEX_NAME}$]@dots{};
@descriptionhead
diff --git a/preprocessor/DynareBison.yy b/preprocessor/DynareBison.yy
index 87f46eb526..0648cc4706 100644
--- a/preprocessor/DynareBison.yy
+++ b/preprocessor/DynareBison.yy
@@ -110,7 +110,7 @@ class ParsingDriver;
%token INV_GAMMA_PDF INV_GAMMA1_PDF INV_GAMMA2_PDF IRF IRF_SHOCKS
%token KALMAN_ALGO KALMAN_TOL SUBSAMPLES OPTIONS
%token LABELS LAPLACE LIK_ALGO LIK_INIT LINEAR LOAD_IDENT_FILES LOAD_MH_FILE LOAD_PARAMS_AND_STEADY_STATE LOGLINEAR LYAPUNOV
-%token LYAPUNOV_FIXED_POINT_TOL LYAPUNOV_DOUBLING_TOL LYAPUNOV_SQUARE_ROOT_SOLVER_TOL LOG_DEFLATOR LOG_TREND_VAR MARKOWITZ MARGINAL_DENSITY MAX MAXIT
+%token LYAPUNOV_FIXED_POINT_TOL LYAPUNOV_DOUBLING_TOL LYAPUNOV_SQUARE_ROOT_SOLVER_TOL LOG_DEFLATOR LOG_TREND_VAR LOG_GROWTH_FACTOR MARKOWITZ MARGINAL_DENSITY MAX MAXIT
%token MFS MH_DROP MH_INIT_SCALE MH_JSCALE MH_MODE MH_NBLOCKS MH_REPLIC MH_RECOVER MIN MINIMAL_SOLVING_PERIODS SOLVE_MAXIT
%token MODE_CHECK MODE_COMPUTE MODE_FILE MODEL MODEL_COMPARISON MODEL_INFO MSHOCKS ABS SIGN
%token MODEL_DIAGNOSTICS MODIFIEDHARMONICMEAN MOMENTS_VARENDO DIFFUSE_FILTER SUB_DRAWS
@@ -301,7 +301,7 @@ trend_var_list : trend_var_list symbol
{ driver.declare_trend_var(false, $1, $2); }
;
-log_trend_var : LOG_TREND_VAR '(' GROWTH_FACTOR EQUAL { driver.begin_trend(); } hand_side ')' log_trend_var_list ';'
+log_trend_var : LOG_TREND_VAR '(' LOG_GROWTH_FACTOR EQUAL { driver.begin_trend(); } hand_side ')' log_trend_var_list ';'
{ driver.end_trend_var($6); }
;
diff --git a/preprocessor/DynareFlex.ll b/preprocessor/DynareFlex.ll
index 85ad4018dc..755bdbe4ac 100644
--- a/preprocessor/DynareFlex.ll
+++ b/preprocessor/DynareFlex.ll
@@ -470,6 +470,7 @@ string eofbuff;
<DYNARE_STATEMENT>deflator {return token::DEFLATOR;}
<DYNARE_STATEMENT>log_deflator {return token::LOG_DEFLATOR;}
<DYNARE_STATEMENT>growth_factor {return token::GROWTH_FACTOR;}
+<DYNARE_STATEMENT>log_growth_factor {return token::LOG_GROWTH_FACTOR;}
<DYNARE_STATEMENT>cova_compute {return token::COVA_COMPUTE;}
<DYNARE_STATEMENT>discretionary_tol {return token::DISCRETIONARY_TOL;}
<DYNARE_STATEMENT>analytic_derivation {return token::ANALYTIC_DERIVATION;}
diff --git a/tests/trend_var/fs2000_log_nonstationary.mod b/tests/trend_var/fs2000_log_nonstationary.mod
index 5ae79e1631..51d9a7bdcb 100644
--- a/tests/trend_var/fs2000_log_nonstationary.mod
+++ b/tests/trend_var/fs2000_log_nonstationary.mod
@@ -27,8 +27,8 @@
*/
var gM gA;
-log_trend_var(growth_factor=gA) A;
-log_trend_var(growth_factor=gM) M;
+log_trend_var(log_growth_factor=gA) A;
+log_trend_var(log_growth_factor=gM) M;
var(log_deflator=A) k c y;
var(log_deflator=M(-1)-A) P;
var(log_deflator=M(-1)) W l d;
--
GitLab