stepan
/
preprocessor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

preprocessor: ramsey_model: remove unused symbol_list syntax. Closes #1392

issue#70
Houtan Bastani 2017-08-24 16:43:36 +02:00
parent 48d6155dbc
commit f0352541d5
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ComputingTasks.cc
View File

@ -363,9 +363,7 @@ ForecastStatement::writeJsonOutput(ostream &output) const
output << "}"; output << "}";
} }
RamseyModelStatement::RamseyModelStatement(const SymbolList &symbol_list_arg, RamseyModelStatement::RamseyModelStatement(const OptionsList &options_list_arg) :
const OptionsList &options_list_arg) :
symbol_list(symbol_list_arg),
options_list(options_list_arg) options_list(options_list_arg)
{ {
} }

4
ComputingTasks.hh
View File

@ -133,11 +133,9 @@ public:
class RamseyModelStatement : public Statement class RamseyModelStatement : public Statement
{ {
private: private:
const SymbolList symbol_list;
const OptionsList options_list; const OptionsList options_list;
public: public:
RamseyModelStatement(const SymbolList &symbol_list_arg, RamseyModelStatement(const OptionsList &options_list_arg);
const OptionsList &options_list_arg);
virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings); virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings);
virtual void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const; virtual void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const;
virtual void writeJsonOutput(ostream &output) const; virtual void writeJsonOutput(ostream &output) const;

4
DynareBison.yy
View File

@ -2034,10 +2034,6 @@ ramsey_model : RAMSEY_MODEL ';'
{ driver.ramsey_model(); } { driver.ramsey_model(); }
| RAMSEY_MODEL '(' ramsey_model_options_list ')' ';' | RAMSEY_MODEL '(' ramsey_model_options_list ')' ';'
{ driver.ramsey_model(); } { driver.ramsey_model(); }
| RAMSEY_MODEL symbol_list ';'
{ driver.ramsey_model(); }
| RAMSEY_MODEL '(' ramsey_model_options_list ')' symbol_list ';'
{ driver.ramsey_model(); }
; ;
ramsey_policy : RAMSEY_POLICY ';' ramsey_policy : RAMSEY_POLICY ';'

3
ParsingDriver.cc
View File

@ -1929,8 +1929,7 @@ ParsingDriver::ramsey_model()
{ {
if (!mod_file->symbol_table.exists("optimal_policy_discount_factor")) if (!mod_file->symbol_table.exists("optimal_policy_discount_factor"))
declare_optimal_policy_discount_factor_parameter(data_tree->One); declare_optimal_policy_discount_factor_parameter(data_tree->One);
mod_file->addStatement(new RamseyModelStatement(symbol_list, options_list)); mod_file->addStatement(new RamseyModelStatement(options_list));
symbol_list.clear();
options_list.clear(); options_list.clear();
} }