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

preprocessor: allow shock group names to contain spaces. closes #1280

issue#70
Houtan Bastani 2016-09-14 14:03:03 +02:00
parent 2b835a5006
commit d9d60d4f21
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DynareBison.yy
View File

@ -2685,9 +2685,10 @@ shock_group_list : shock_group_list shock_group_element
| shock_group_element
;
shock_group_element : symbol EQUAL shock_name_list ';' {driver.add_shock_group($1);}
shock_group_element : symbol EQUAL shock_name_list ';' { driver.add_shock_group($1); }
| QUOTED_STRING EQUAL shock_name_list ';' { driver.add_shock_group($1); }
;
shock_name_list : shock_name_list COMMA symbol {driver.add_shock_group_element($3);}
| shock_name_list symbol {driver.add_shock_group_element($2);}
| symbol {driver.add_shock_group_element($1);}

30
Shocks.cc
View File

@ -463,13 +463,29 @@ ShockGroupsStatement::ShockGroupsStatement(const group_t &shock_groups_arg, cons
void
ShockGroupsStatement::writeOutput(ostream &output, const string &basename, bool minimal_workspace) const
{
for (vector<Group>::const_iterator it = shock_groups.begin(); it != shock_groups.end(); it++)
int i = 1;
bool unique_label = true;
for (vector<Group>::const_iterator it = shock_groups.begin(); it != shock_groups.end(); it++, unique_label=true)
{
output << "M_.shock_groups." << name
<< "." << it->name << " = {";
for ( vector<string>::const_iterator it1 = it->list.begin(); it1 != it->list.end(); it1++)
output << " '" << *it1 << "'";
output << "};" << endl;
for (vector<Group>::const_iterator it1 = it+1; it1 != shock_groups.end(); it1++)
if (it->name == it1->name)
{
unique_label = false;
cerr << "Warning: shock group label '" << it->name << "' has been reused. "
<< "Only using the last definition." << endl;
break;
}
if (unique_label)
{
output << "M_.shock_groups." << name
<< ".group" << i << ".label = '" << it->name << "';" << endl
<< "M_.shock_groups." << name
<< ".group" << i << ".shocks = {";
for ( vector<string>::const_iterator it1 = it->list.begin(); it1 != it->list.end(); it1++)
output << " '" << *it1 << "'";
output << "};" << endl;
i++;
}
}
}