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

Merge pull request #1857 from joakim-hove/accept-long-keywords

Browse Source 
Fix handling of too long 8 characters keywords like GUIDERATE
This commit is contained in:
Bård Skaflestad
2020-07-05 19:58:44 +02:00
committed by GitHub
parent 1c92fb3fea 4e223eae4a
commit 643ff6e777
3 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -637,12 +637,6 @@ RawKeyword * newRawKeyword(const ParserKeyword& parserKeyword, const std::string
RawKeyword * newRawKeyword( const std::string& deck_name, ParserState& parserState, const Parser& parser, const string_view& line ) {
if (parser.isRecognizedKeyword(deck_name)) {
parserState.unknown_keyword = false;
const auto& parserKeyword = parser.getParserKeywordFromDeckName(deck_name);
return newRawKeyword(parserKeyword, deck_name, parserState, parser);
}
if (deck_name.size() > RawConsts::maxKeywordLength) {
const std::string keyword8 = deck_name.substr(0, RawConsts::maxKeywordLength);
if (parser.isRecognizedKeyword(keyword8)) {
@@ -652,9 +646,19 @@ RawKeyword * newRawKeyword( const std::string& deck_name, ParserState& parserSta
parserState.unknown_keyword = false;
const auto& parserKeyword = parser.getParserKeywordFromDeckName( keyword8 );
return newRawKeyword(parserKeyword, keyword8, parserState, parser);
} else {
parserState.parseContext.handleUnknownKeyword( deck_name, parserState.errors );
parserState.unknown_keyword = true;
return nullptr;
}
}
if (parser.isRecognizedKeyword(deck_name)) {
parserState.unknown_keyword = false;
const auto& parserKeyword = parser.getParserKeywordFromDeckName(deck_name);
return newRawKeyword(parserKeyword, deck_name, parserState, parser);
}
if( ParserKeyword::validDeckName(deck_name) ) {
parserState.parseContext.handleUnknownKeyword( deck_name, parserState.errors );
parserState.unknown_keyword = true;

3
src/opm/parser/eclipse/Parser/raw/RawKeyword.cpp
View File

@@ -34,9 +34,6 @@ namespace {
if (!ParserKeyword::validDeckName(name))
throw std::invalid_argument("Not a valid keyword:" + name);
if (name.size() > Opm::RawConsts::maxKeywordLength)
throw std::invalid_argument("Too long keyword:" + name);
if (name[0] == ' ')
throw std::invalid_argument("Illegal whitespace start of keyword:" + name);

20
tests/parser/ParserTests.cpp
View File

@@ -2318,3 +2318,23 @@ auto record = kw.getRecord(1);
BOOST_CHECK_EQUAL( record.getItem(5).get<double>(0), 0.9 );
BOOST_CHECK( !deck.hasKeyword("LANGMUIR") );
}
BOOST_AUTO_TEST_CASE(ParseLONGKeywords) {
Parser parser;
ParseContext parseContext;
ErrorGuard errors;
const auto deck_string = R"(
GUIDERATE
/
)";
parseContext.update(ParseContext::PARSE_LONG_KEYWORD, Opm::InputError::THROW_EXCEPTION);
BOOST_CHECK_THROW(parser.parseString(deck_string, parseContext, errors), std::invalid_argument);
parseContext.update(ParseContext::PARSE_LONG_KEYWORD, Opm::InputError::IGNORE);
auto deck = parser.parseString(deck_string, parseContext, errors);
BOOST_CHECK( deck.hasKeyword("GUIDERAT") );
}