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

remove accessors in UDQASTNode added for external serialization

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-03-13 08:20:12 +01:00
parent 7f1d0c40f9
commit d59fd93563
2 changed files with 6 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp
View File

@@ -62,13 +62,6 @@ public:
bool operator==(const UDQASTNode& data) const;
const std::string& stringValue() const;
UDQTokenType getType() const;
double scalarValue() const;
const std::vector<std::string>& getSelectors() const;
const std::shared_ptr<UDQASTNode>& getLeft() const;
const std::shared_ptr<UDQASTNode>& getRight() const;
template<class Serializer>
void serializeOp(Serializer& serializer)
{

36
src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp
View File

@@ -294,18 +294,18 @@ void UDQASTNode::set_right(const UDQASTNode& arg) {
}
bool UDQASTNode::operator==(const UDQASTNode& data) const {
if ((this->getLeft() && !data.getLeft()) ||
(!this->getLeft() && data.getLeft()))
if ((this->left && !data.left) ||
(!this->left && data.left))
return false;
if (this->getLeft() && !(*this->getLeft() == *data.getLeft()))
if (this->left && !(*this->left == *data.left))
return false;
if ((this->getRight() && !data.getRight()) ||
(!this->getRight() && data.getRight()))
if ((this->right && !data.right) ||
(!this->right && data.right))
return false;
if (this->getRight() && !(*this->getRight() == *data.getRight()))
if (this->right && !(*this->right == *data.right))
return false;
return type == data.type &&
@@ -315,28 +315,4 @@ bool UDQASTNode::operator==(const UDQASTNode& data) const {
selector == data.selector;
}
const std::string& UDQASTNode::stringValue() const {
return string_value;
}
double UDQASTNode::scalarValue() const {
return scalar_value;
}
const std::vector<std::string>& UDQASTNode::getSelectors() const {
return selector;
}
const std::shared_ptr<UDQASTNode>& UDQASTNode::getLeft() const {
return left;
}
const std::shared_ptr<UDQASTNode>& UDQASTNode::getRight() const {
return right;
}
UDQTokenType UDQASTNode::getType() const {
return type;
}
}