From 6a634ba1043e15b3d76dc03992d8406712762563 Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Fri, 3 Apr 2015 16:30:55 +0200
Subject: [PATCH] preprocessor: take care of extra exos in osr_params
---
ComputingTasks.cc | 23 +++++++++++++++++++++++
ComputingTasks.hh | 1 +
2 files changed, 24 insertions(+)
diff --git a/ComputingTasks.cc b/ComputingTasks.cc
index 9acdc06a..1274858b 100644
--- a/ComputingTasks.cc
+++ b/ComputingTasks.cc
@@ -1237,6 +1237,29 @@ OsrParamsStatement::checkPass(ModFileStructure &mod_file_struct, WarningConsolid
mod_file_struct.osr_params_present = true;
}
+Statement *
+OsrParamsStatement::cloneAndReindexSymbIds(DataTree &dynamic_datatree, SymbolTable &orig_symbol_table)
+{
+ SymbolList new_symbol_list;
+ try
+ {
+ SymbolTable *new_symbol_table = dynamic_datatree.getSymbolTable();
+ vector<string> symbols = symbol_list.get_symbols();
+ for (vector<string>::const_iterator it = symbols.begin(); it != symbols.end(); it++)
+ {
+ new_symbol_table->getID(*it);
+ new_symbol_list.addSymbol(*it);
+ }
+ }
+ catch (SymbolTable::UnknownSymbolNameException &e)
+ {
+ cerr << "ERROR: A variable in the osr_params statement was not found in the symbol table" << endl
+ << " This likely means that you have declared a varexo that is not used in the model" << endl;
+ exit(EXIT_FAILURE);
+ }
+ return new OsrParamsStatement(new_symbol_list);
+}
+
void
OsrParamsStatement::writeOutput(ostream &output, const string &basename) const
{
diff --git a/ComputingTasks.hh b/ComputingTasks.hh
index 3a4df94b..88d51c2c 100644
--- a/ComputingTasks.hh
+++ b/ComputingTasks.hh
@@ -233,6 +233,7 @@ public:
OsrParamsStatement(const SymbolList &symbol_list_arg);
virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings);
virtual void writeOutput(ostream &output, const string &basename) const;
+ virtual Statement *cloneAndReindexSymbIds(DataTree &dynamic_datatree, SymbolTable &orig_symbol_table);
};
class OsrStatement : public Statement
--
GitLab