Commit b37bfeb1 authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Merge remote-tracking branch 'houtanb/master'

parents f978ebef aff56297
...@@ -402,8 +402,8 @@ After installation, this directory will contain several sub-directories, ...@@ -402,8 +402,8 @@ After installation, this directory will contain several sub-directories,
among which are @file{matlab}, @file{mex} and @file{doc}. among which are @file{matlab}, @file{mex} and @file{doc}.
Note that you can have several versions of Dynare coexisting (for Note that you can have several versions of Dynare coexisting (for
example in @file{c:\dynare}), as long as you correctly adjust your path example in @file{/Applications/Dynare}), as long as you correctly
settings (@pxref{Some words of warning}). adjust your path settings (@pxref{Some words of warning}).
@node For other systems @node For other systems
@subsection For other systems @subsection For other systems
...@@ -455,7 +455,7 @@ location, and replacing @code{4.@var{x}.@var{y}} with the correct version ...@@ -455,7 +455,7 @@ location, and replacing @code{4.@var{x}.@var{y}} with the correct version
number, type: number, type:
@example @example
addpath /Applications/Dynare/4.@var{x}.@var{y}/matlab/ addpath /Applications/Dynare/4.@var{x}.@var{y}/matlab
@end example @end example
MATLAB will not remember this setting next time you run it, and you 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: ...@@ -804,7 +804,7 @@ Declarations of variables and parameters are made with the following commands:
This required command declares the endogenous variables in the This required command declares the endogenous variables in the
model. @xref{Conventions}, for the syntax of @var{VARIABLE_NAME} and model. @xref{Conventions}, for the syntax of @var{VARIABLE_NAME} and
@var{MODEL_EXPRESSION}. Optionally it is possible to give a LaTeX name @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. its deflator.
@code{var} commands can appear several times in the file and Dynare will @code{var} commands can appear several times in the file and Dynare will
......
...@@ -315,7 +315,10 @@ ParsingDriver::add_expression_variable(string *name) ...@@ -315,7 +315,10 @@ ParsingDriver::add_expression_variable(string *name)
void void
ParsingDriver::declare_nonstationary_var(string *name, string *tex_name) 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)); declared_nonstationary_vars.push_back(mod_file->symbol_table.getID(*name));
mod_file->nonstationary_variables = true; mod_file->nonstationary_variables = true;
delete name; delete name;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment