From 84e680adefbed7c013487609b1ba33340788e6c8 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Wed, 1 Apr 2015 15:17:08 +0200 Subject: [PATCH] preprocessor: remove unnecessary options_list argument to rplot --- ComputingTasks.cc | 7 ++----- ComputingTasks.hh | 4 +--- ParsingDriver.cc | 3 +-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ComputingTasks.cc b/ComputingTasks.cc index e16d1135..31545e5e 100644 --- a/ComputingTasks.cc +++ b/ComputingTasks.cc @@ -518,17 +518,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_);" << endl; } diff --git a/ComputingTasks.hh b/ComputingTasks.hh index d19f3e4c..037ce9b6 100644 --- a/ComputingTasks.hh +++ b/ComputingTasks.hh @@ -150,10 +150,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/ParsingDriver.cc b/ParsingDriver.cc index cd9b0101..67c4be45 100644 --- a/ParsingDriver.cc +++ b/ParsingDriver.cc @@ -1186,8 +1186,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(); }