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

Merge pull request #515 from joakim-hove/parsecontext-ignore-kw

Browse Source 
Ability to ignore named keywords in ParseContext
This commit is contained in:
Joakim Hove
2018-10-09 17:06:33 +02:00
committed by GitHub
parent 1c771a66fc c938765224
commit 72b39e513a
4 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/Parser/ParseContext.hpp
View File

@@ -23,6 +23,7 @@
#include <string>
#include <map>
#include <set>
#include <vector>
#include <opm/common/OpmLog/OpmLog.hpp>
@@ -84,12 +85,14 @@ namespace Opm {
explicit ParseContext(const std::vector<std::pair<std::string , InputError::Action>>& initial);
void handleError( const std::string& errorKey, const std::string& msg ) const;
void handleUnknownKeyword(const std::string& keyword) const;
bool hasKey(const std::string& key) const;
ParseContext withKey(const std::string& key, InputError::Action action = InputError::WARN) const;
ParseContext& withKey(const std::string& key, InputError::Action action = InputError::WARN);
void updateKey(const std::string& key , InputError::Action action);
void update(InputError::Action action);
void update(const std::string& keyString , InputError::Action action);
void ignoreKeyword(const std::string& keyword);
InputError::Action get(const std::string& key) const;
std::map<std::string,InputError::Action>::const_iterator begin() const;
std::map<std::string,InputError::Action>::const_iterator end() const;
@@ -256,6 +259,7 @@ namespace Opm {
void envUpdate( const std::string& envVariable , InputError::Action action );
void patternUpdate( const std::string& pattern , InputError::Action action);
std::map<std::string , InputError::Action> m_errorContexts;
std::set<std::string> ignore_keywords;
}; }

12
src/opm/parser/eclipse/Parser/ParseContext.cpp
View File

@@ -95,6 +95,11 @@ namespace Opm {
}
void ParseContext::ignoreKeyword(const std::string& keyword) {
this->ignore_keywords.insert(keyword);
}
void ParseContext::handleError(
const std::string& errorKey,
const std::string& msg ) const {
@@ -112,6 +117,13 @@ namespace Opm {
}
}
void ParseContext::handleUnknownKeyword(const std::string& keyword) const {
if (this->ignore_keywords.find(keyword) == this->ignore_keywords.end()) {
std::string msg = "Unknown keyword: " + keyword;
this->handleError(ParseContext::PARSE_UNKNOWN_KEYWORD, msg);
}
}
std::map<std::string,InputError::Action>::const_iterator ParseContext::begin() const {
return m_errorContexts.begin();
}

2
src/opm/parser/eclipse/Parser/Parser.cpp
View File

@@ -417,7 +417,7 @@ std::shared_ptr< RawKeyword > createRawKeyword( const string_view& kw, ParserSta
if( !parser.isRecognizedKeyword( keywordString ) ) {
if( ParserKeyword::validDeckName( keywordString ) ) {
std::string msg = "Keyword " + keywordString + " not recognized.";
parserState.parseContext.handleError( ParseContext::PARSE_UNKNOWN_KEYWORD, msg );
parserState.parseContext.handleUnknownKeyword( keywordString.string() );
parserState.unknown_keyword = true;
return {};
}

20
tests/parser/ParseContextTests.cpp
View File

@@ -86,6 +86,26 @@ BOOST_AUTO_TEST_CASE(TestUnkownKeyword) {
}
BOOST_AUTO_TEST_CASE(TestUnkownKeywordII) {
const char * deck1 =
"RUNSPEC\n"
"DIMENS\n"
" 10 10 10 /n"
"\n";
ParseContext parseContext;
Parser parser(false);
parser.addKeyword<ParserKeywords::DIMENS>();
parseContext.update(ParseContext::PARSE_UNKNOWN_KEYWORD , InputError::THROW_EXCEPTION );
BOOST_CHECK_THROW( parser.parseString( deck1 , parseContext ) , std::invalid_argument);
parseContext.ignoreKeyword("RUNSPEC");
BOOST_CHECK_NO_THROW( parser.parseString( deck1 , parseContext ) );
}
BOOST_AUTO_TEST_CASE(Handle_extra_records) {
const char * deck_string =
"EQLDIMS\n"