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

Merge pull request #2051 from joakim-hove/improve-udq-error-message

Browse Source 
Improve error message for failed udq
This commit is contained in:
Joakim Hove 2020-10-27 18:28:28 +01:00 committed by GitHub
commit 0f28d7c199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParser.cpp
View File

@ -313,9 +313,9 @@ UDQASTNode UDQParser::parse(const UDQParams& udq_params, UDQVarType target_type,
if (!parser.empty()) {
auto current = parser.current();
std::string msg_fmt = fmt::format("Problem parsing UDQ expression \n"
std::string msg_fmt = fmt::format("Problem parsing UDQ {}\n"
"In {{file}} line {{line}}.\n"
"Extra unhandled data starting with item {}.", current.string());
"Extra unhandled data starting with item {}.", target_var, current.string());
parseContext.handleError(ParseContext::UDQ_PARSE_ERROR, msg_fmt, location, errors);
return UDQASTNode( udq_params.undefinedValue() );
}
@ -325,18 +325,18 @@ UDQASTNode UDQParser::parse(const UDQParams& udq_params, UDQVarType target_type,
for (const auto& token : tokens)
token_string += token.str() + " ";
std::string msg_fmt = fmt::format("Failed to parse UDQ expression\n"
std::string msg_fmt = fmt::format("Failed to parse UDQ {}\n"
"In {{file}} line {{line}}.\n"
"This can be a bug in flow or a bug in the UDQ input string.\n"
"UDQ input: '{}'", token_string);
"UDQ input: '{}'", target_var, token_string);
parseContext.handleError(ParseContext::UDQ_PARSE_ERROR, msg_fmt, location, errors);
return UDQASTNode( udq_params.undefinedValue() );
}
if (!static_type_check(target_type, tree.var_type)) {
std::string msg_fmt = fmt::format("Failed to parse UDQ expression\n"
std::string msg_fmt = fmt::format("Failed to parse UDQ {}\n"
"In {{file}} line {{line}}.\n"
"Invalid type conversion detected in UDQ expression expected: {} got: {}", UDQ::typeName(target_type), UDQ::typeName(tree.var_type));
"Invalid type conversion detected in UDQ expression expected: {} got: {}", target_var, UDQ::typeName(target_type), UDQ::typeName(tree.var_type));
parseContext.handleError(ParseContext::UDQ_TYPE_ERROR, msg_fmt, location, errors);
if (parseContext.get(ParseContext::UDQ_TYPE_ERROR) != InputError::IGNORE)
@ -346,9 +346,9 @@ UDQASTNode UDQParser::parse(const UDQParams& udq_params, UDQVarType target_type,
}
if (tree.var_type == UDQVarType::NONE) {
std::string msg_fmt = fmt::format("Failed to parse UDQ expression\n"
std::string msg_fmt = fmt::format("Failed to parse UDQ {}\n"
"In {{file}} line {{line}}.\n"
"Could not determine expression type.");
"Could not determine expression type.", target_var);
parseContext.handleError(ParseContext::UDQ_TYPE_ERROR, msg_fmt, location, errors);
if (parseContext.get(ParseContext::UDQ_TYPE_ERROR) != InputError::IGNORE)
dump_tokens(target_var, tokens);