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

Add comments and simplify code in function that parses the --+ options: … +-- line

issue#70
Sébastien Villemot 2020-01-23 18:45:02 +01:00
parent 8496e8287d
commit 0f3f6a2332
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/DynareMain.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2003-2019 Dynare Team * Copyright © 2003-2020 Dynare Team
* *
* This file is part of Dynare. * This file is part of Dynare.
* *
@ -68,8 +68,9 @@ usage()
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
/* Looks for an options list in the first line of the mod file (but rewind /* Looks for an options list in the first non-empty line of the .mod file (but rewind
the input stream afterwards */ the input stream afterwards).
This function should be kept in sync with the one with the same name in matlab/dynare.m */
vector<string> vector<string>
parse_options_line(istream &modfile) parse_options_line(istream &modfile)
{ {
@ -79,16 +80,16 @@ parse_options_line(istream &modfile)
smatch matches; smatch matches;
while (getline(modfile, first_nonempty_line)) while (getline(modfile, first_nonempty_line))
if (first_nonempty_line != "") if (!first_nonempty_line.empty())
{ {
if (regex_search(first_nonempty_line, matches, pat) if (regex_search(first_nonempty_line, matches, pat)
&& matches.size() > 1 && matches[1].matched) && matches.size() > 1 && matches[1].matched)
{ {
regex pat2{R"(([^,\s]+))"}; regex pat2{R"([^,\s]+)"};
string s{matches[1]}; string s{matches[1]};
for (sregex_iterator p(s.begin(), s.end(), pat2); for (sregex_iterator p(s.begin(), s.end(), pat2);
p != sregex_iterator{}; ++p) p != sregex_iterator{}; ++p)
options.push_back((*p)[1]); options.push_back(p->str());
} }
break; break;
} }