From 9dd64ef09200557ae22545be0615f54a6e7e753d Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Wed, 1 Apr 2015 15:17:08 +0200
Subject: [PATCH] preprocessor: remove unnecessary options_list argument to
rplot
(cherry picked from commit 86d6e2145036ee37d1a6a580bbd9446a181bc5a6)
---
preprocessor/ComputingTasks.cc | 7 ++-----
preprocessor/ComputingTasks.hh | 4 +---
preprocessor/ParsingDriver.cc | 3 +--
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/preprocessor/ComputingTasks.cc b/preprocessor/ComputingTasks.cc
index cbdcb137a9..de644ab506 100644
--- a/preprocessor/ComputingTasks.cc
+++ b/preprocessor/ComputingTasks.cc
@@ -408,17 +408,14 @@ DynareSensitivityStatement::writeOutput(ostream &output, const string &basename)
output << "dynare_sensitivity(options_gsa);" << endl;
}
-RplotStatement::RplotStatement(const SymbolList &symbol_list_arg,
- const OptionsList &options_list_arg) :
- symbol_list(symbol_list_arg),
- options_list(options_list_arg)
+RplotStatement::RplotStatement(const SymbolList &symbol_list_arg) :
+ symbol_list(symbol_list_arg)
{
}
void
RplotStatement::writeOutput(ostream &output, const string &basename) const
{
- options_list.writeOutput(output);
symbol_list.writeOutput("var_list_", output);
output << "rplot(var_list_);\n";
}
diff --git a/preprocessor/ComputingTasks.hh b/preprocessor/ComputingTasks.hh
index feddfbbc2e..6dd6b29054 100644
--- a/preprocessor/ComputingTasks.hh
+++ b/preprocessor/ComputingTasks.hh
@@ -119,10 +119,8 @@ class RplotStatement : public Statement
{
private:
const SymbolList symbol_list;
- const OptionsList options_list;
public:
- RplotStatement(const SymbolList &symbol_list_arg,
- const OptionsList &options_list_arg);
+ RplotStatement(const SymbolList &symbol_list_arg);
virtual void writeOutput(ostream &output, const string &basename) const;
};
diff --git a/preprocessor/ParsingDriver.cc b/preprocessor/ParsingDriver.cc
index e3739b601c..39873065e6 100644
--- a/preprocessor/ParsingDriver.cc
+++ b/preprocessor/ParsingDriver.cc
@@ -1177,8 +1177,7 @@ ParsingDriver::add_in_symbol_list(string *tmp_var)
void
ParsingDriver::rplot()
{
- mod_file->addStatement(new RplotStatement(symbol_list, options_list));
- options_list.clear();
+ mod_file->addStatement(new RplotStatement(symbol_list));
symbol_list.clear();
}
--
GitLab