stepan
/
preprocessor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

preprocessor: fix bug in adl implementation that prevented the same parameter from being applied do different endogenosu variables

issue#70
houtanb 2017-06-23 18:33:08 +02:00
parent 2deb4b42fb
commit 843c4427b0
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SymbolTable.cc
View File

@ -657,10 +657,16 @@ SymbolTable::addAdlParameter(const string &basename, int lag) throw (FrozenExcep
try try
{ {
return addSymbol(varname.str(), eParameter); int symb_id = addSymbol(varname.str(), eParameter);
adl_params.push_back(symb_id);
return symb_id;
} }
catch (AlreadyDeclaredException &e) catch (AlreadyDeclaredException &e)
{ {
int symb_id = getID(varname.str());
if (find(adl_params.begin(), adl_params.end(), symb_id) != adl_params.end())
return symb_id;
cerr << "ERROR: you should rename your variable called " << varname.str() << ", this name is internally used by Dynare" << endl; cerr << "ERROR: you should rename your variable called " << varname.str() << ", this name is internally used by Dynare" << endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }

3
SymbolTable.hh
View File

@ -153,6 +153,9 @@ private:
//! Stores the list of observed exogenous variables //! Stores the list of observed exogenous variables
vector<int> varexobs; vector<int> varexobs;
//! Stores list of parameters declared in adl substitution
vector<int> adl_params;
public: public:
SymbolTable(); SymbolTable();
//! Thrown when trying to access an unknown symbol (by name) //! Thrown when trying to access an unknown symbol (by name)