mirror of
https://github.com/OPM/ResInsight.git
synced 2026-09-03 20:53:13 -05:00
Magne Sjaastad
ab1cd9bb22
evaluate() and expandIfStatementsAndEvaluate() now return std::expected<void, QString>: the error message is always part of the return value rather than an optional out-parameter, making it impossible for callers to silently discard errors. Update RimGridCalculation and RimSummaryCalculation to use evaluateResult.error() instead of a separate errorText variable.
75 lines
3.1 KiB
C++
75 lines
3.1 KiB
C++
/////////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Copyright (C) 2017- Statoil ASA
|
|
//
|
|
// ResInsight is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
// FITNESS FOR A PARTICULAR PURPOSE.
|
|
//
|
|
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
|
// for more details.
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#include "ExpressionParser.h"
|
|
|
|
#include "ExpressionParserImpl.h"
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
ExpressionParser::ExpressionParser()
|
|
{
|
|
m_expressionParserImpl = std::unique_ptr<ExpressionParserImpl>( new ExpressionParserImpl );
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
ExpressionParser::~ExpressionParser()
|
|
{
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
std::vector<QString> ExpressionParser::detectReferencedVariables( const QString& expression )
|
|
{
|
|
return ExpressionParserImpl::detectReferencedVariables( expression );
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
void ExpressionParser::assignVector( const QString& variableName, std::vector<double>& vector )
|
|
{
|
|
m_expressionParserImpl->assignVector( variableName, vector );
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
std::expected<void, QString> ExpressionParser::evaluate( const QString& expressionText )
|
|
{
|
|
return m_expressionParserImpl->evaluate( expressionText );
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
std::expected<void, QString> ExpressionParser::expandIfStatementsAndEvaluate( const QString& expressionText )
|
|
{
|
|
if ( expressionText.contains( "if", Qt::CaseInsensitive ) )
|
|
{
|
|
QString expanded = ExpressionParserImpl::expandIfStatements( expressionText );
|
|
return m_expressionParserImpl->evaluate( expanded );
|
|
}
|
|
|
|
return m_expressionParserImpl->evaluate( expressionText );
|
|
}
|