OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make ParserKeyword::matches only return true if the deck keyword name is valid

Browse Source
This commit is contained in:
Andreas Lauser 2014-06-27 16:31:59 +02:00
parent fe638c2fc8
commit f6689d838e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/Parser/ParserKeyword.cpp
View File

@ -521,7 +521,9 @@ namespace Opm {
}
bool ParserKeyword::matches(const std::string& deckKeywordName) const {
if (m_deckNames.count(deckKeywordName) > 0)
if (!validDeckName(deckKeywordName))
return false;
else if (m_deckNames.count(deckKeywordName) > 0)
return true;
else if (hasMatchRegex())
return boost::regex_match(deckKeywordName, m_matchRegex);