preprocessor: take care of extra exos in osr

issue#70
Houtan Bastani 2015-04-03 16:46:44 +02:00
parent 6a634ba104
commit 9dda8c4058
2 changed files with 24 additions and 0 deletions

View File

@ -1295,6 +1295,29 @@ OsrStatement::checkPass(ModFileStructure &mod_file_struct, WarningConsolidation
mod_file_struct.k_order_solver = true;
}
Statement *
OsrStatement::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 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 OsrStatement(new_symbol_list, options_list);
}
void
OsrStatement::writeOutput(ostream &output, const string &basename) const
{

View File

@ -246,6 +246,7 @@ public:
const OptionsList &options_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 DynaTypeStatement : public Statement