From d8b91ab0d70a11801ef5870ae817635460358a7e Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Fri, 8 Apr 2011 13:36:23 +0200 Subject: [PATCH 1/2] manual: fix typos --- doc/dynare.texi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/dynare.texi b/doc/dynare.texi index 92232f7bf..96af3fa93 100644 --- a/doc/dynare.texi +++ b/doc/dynare.texi @@ -402,8 +402,8 @@ After installation, this directory will contain several sub-directories, among which are @file{matlab}, @file{mex} and @file{doc}. Note that you can have several versions of Dynare coexisting (for -example in @file{c:\dynare}), as long as you correctly adjust your path -settings (@pxref{Some words of warning}). +example in @file{/Applications/Dynare}), as long as you correctly +adjust your path settings (@pxref{Some words of warning}). @node For other systems @subsection For other systems @@ -455,7 +455,7 @@ location, and replacing @code{4.@var{x}.@var{y}} with the correct version number, type: @example -addpath /Applications/Dynare/4.@var{x}.@var{y}/matlab/ +addpath /Applications/Dynare/4.@var{x}.@var{y}/matlab @end example MATLAB will not remember this setting next time you run it, and you @@ -804,7 +804,7 @@ Declarations of variables and parameters are made with the following commands: This required command declares the endogenous variables in the model. @xref{Conventions}, for the syntax of @var{VARIABLE_NAME} and @var{MODEL_EXPRESSION}. Optionally it is possible to give a LaTeX name -to the variable or, if it nonstationary, provide information regarding +to the variable or, if it is nonstationary, provide information regarding its deflator. @code{var} commands can appear several times in the file and Dynare will From aff56297361d04a07abf5bb1a58202aafd772733 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Fri, 8 Apr 2011 13:21:19 +0200 Subject: [PATCH 2/2] bug fix: nonstationary vars and tex names --- preprocessor/ParsingDriver.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/preprocessor/ParsingDriver.cc b/preprocessor/ParsingDriver.cc index 088a636a7..ac99d3568 100644 --- a/preprocessor/ParsingDriver.cc +++ b/preprocessor/ParsingDriver.cc @@ -315,7 +315,10 @@ ParsingDriver::add_expression_variable(string *name) void ParsingDriver::declare_nonstationary_var(string *name, string *tex_name) { - declare_endogenous(new string(*name), tex_name); + if (tex_name != NULL) + declare_endogenous(new string(*name), new string(*tex_name)); + else + declare_endogenous(new string(*name), tex_name); declared_nonstationary_vars.push_back(mod_file->symbol_table.getID(*name)); mod_file->nonstationary_variables = true; delete name;