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

Merge pull request #544 from joakim-hove/parser-error-msg

Browse Source 
Add a better error message for parse errors
This commit is contained in:
Atgeirr Flø Rasmussen
2018-11-02 07:59:25 +01:00
committed by GitHub
parent ae9d5e97c7 60fb68d3fc
commit 2df9779a62
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -581,7 +581,21 @@ bool parseState( ParserState& parserState, const Parser& parser ) {
if( parser.isRecognizedKeyword( parserState.rawKeyword->getKeywordName() ) ) {
const auto& kwname = parserState.rawKeyword->getKeywordName();
const auto* parserKeyword = parser.getParserKeywordFromDeckName( kwname );
parserState.deck.addKeyword( parserKeyword->parse( parserState.parseContext, parserState.rawKeyword ) );
try {
parserState.deck.addKeyword( parserKeyword->parse( parserState.parseContext, parserState.rawKeyword ) );
} catch (const std::exception& exc) {
/*
This catch-all of parsing errors is to be able to write a good
error message; the parser is quite confused at this state and
we should not be tempted to continue the parsing.
*/
const auto& rawKeyword = *parserState.rawKeyword;
std::string msg = "\nFailed to parse keyword: " + rawKeyword.getKeywordName() + "\n" +
"Starting at location: " + rawKeyword.getFilename() + "(" + std::to_string(rawKeyword.getLineNR()) + ")\n\n" +
"Inner exception: " + exc.what() + "\n";
throw std::invalid_argument(msg);
}
} else {
DeckKeyword deckKeyword( parserState.rawKeyword->getKeywordName(), false );
const std::string msg = "The keyword " + parserState.rawKeyword->getKeywordName() + " is not recognized";