From f0352541d5daf87f223fc9f6342257b78b3f492c Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Thu, 24 Aug 2017 16:43:36 +0200
Subject: [PATCH] preprocessor: ramsey_model: remove unused symbol_list syntax.
Closes #1392
---
ComputingTasks.cc | 4 +---
ComputingTasks.hh | 4 +---
DynareBison.yy | 4 ----
ParsingDriver.cc | 3 +--
4 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/ComputingTasks.cc b/ComputingTasks.cc
index a579ebb6..a9320ed1 100644
--- a/ComputingTasks.cc
+++ b/ComputingTasks.cc
@@ -363,9 +363,7 @@ ForecastStatement::writeJsonOutput(ostream &output) const
output << "}";
}
-RamseyModelStatement::RamseyModelStatement(const SymbolList &symbol_list_arg,
- const OptionsList &options_list_arg) :
- symbol_list(symbol_list_arg),
+RamseyModelStatement::RamseyModelStatement(const OptionsList &options_list_arg) :
options_list(options_list_arg)
{
}
diff --git a/ComputingTasks.hh b/ComputingTasks.hh
index d49d9ea9..2e5a6970 100644
--- a/ComputingTasks.hh
+++ b/ComputingTasks.hh
@@ -133,11 +133,9 @@ public:
class RamseyModelStatement : public Statement
{
private:
- const SymbolList symbol_list;
const OptionsList options_list;
public:
- RamseyModelStatement(const SymbolList &symbol_list_arg,
- const OptionsList &options_list_arg);
+ RamseyModelStatement(const OptionsList &options_list_arg);
virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings);
virtual void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const;
virtual void writeJsonOutput(ostream &output) const;
diff --git a/DynareBison.yy b/DynareBison.yy
index 0d05478e..b8a6107c 100644
--- a/DynareBison.yy
+++ b/DynareBison.yy
@@ -2034,10 +2034,6 @@ ramsey_model : RAMSEY_MODEL ';'
{ driver.ramsey_model(); }
| RAMSEY_MODEL '(' ramsey_model_options_list ')' ';'
{ 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 ';'
diff --git a/ParsingDriver.cc b/ParsingDriver.cc
index 679ae319..b606365d 100644
--- a/ParsingDriver.cc
+++ b/ParsingDriver.cc
@@ -1929,8 +1929,7 @@ ParsingDriver::ramsey_model()
{
if (!mod_file->symbol_table.exists("optimal_policy_discount_factor"))
declare_optimal_policy_discount_factor_parameter(data_tree->One);
- mod_file->addStatement(new RamseyModelStatement(symbol_list, options_list));
- symbol_list.clear();
+ mod_file->addStatement(new RamseyModelStatement(options_list));
options_list.clear();
}
--
GitLab