aboutsummaryrefslogtreecommitdiffstats
path: root/document
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-03-29 19:47:31 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2022-03-29 19:47:31 +0000
commit14f5d341b50f17009ea11331d08d48e7ef1545e5 (patch)
treee18cd4b061c9860e8e4bd4c2ccda05c69fd14646 /document
parent833d69d3fef7fe01b5aa15887c4d477a7aa1ba10 (diff)
rename get -> steal to hint on semantics
Diffstat (limited to 'document')
-rw-r--r--document/src/vespa/document/select/valuenodes.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/document/src/vespa/document/select/valuenodes.cpp b/document/src/vespa/document/select/valuenodes.cpp
index 121bd229b7a..cd66bac9635 100644
--- a/document/src/vespa/document/select/valuenodes.cpp
+++ b/document/src/vespa/document/select/valuenodes.cpp
@@ -225,8 +225,8 @@ public:
IteratorHandler();
~IteratorHandler();
bool hasSingleValue() const;
- std::unique_ptr<Value> getSingleValue() &&;
- std::vector<ArrayValue::VariableValue> getValues() &&;
+ std::unique_ptr<Value> stealSingleValue() &&;
+ std::vector<ArrayValue::VariableValue> stealValues() &&;
private:
std::unique_ptr<Value> _firstValue;
std::vector<ArrayValue::VariableValue> _values;
@@ -240,17 +240,17 @@ IteratorHandler::~IteratorHandler() = default;
bool
IteratorHandler::hasSingleValue() const {
- return _firstValue.get() && (_values.size() == 0);
+ return _firstValue && _values.empty();
}
std::unique_ptr<Value>
-IteratorHandler::getSingleValue() && {
+IteratorHandler::stealSingleValue() && {
return std::move(_firstValue);
}
std::vector<ArrayValue::VariableValue>
-IteratorHandler::getValues() && {
- if (_firstValue.get()) {
+IteratorHandler::stealValues() && {
+ if (_firstValue) {
_values.insert(_values.begin(), ArrayValue::VariableValue(fieldvalue::VariableMap(), Value::SP(_firstValue.release())));
}
@@ -419,9 +419,9 @@ FieldValueNode::getValue(const Context& context) const
doc.iterateNested(_fieldPath.getFullRange(), handler);
if (handler.hasSingleValue()) {
- return std::move(handler).getSingleValue();
+ return std::move(handler).stealSingleValue();
} else {
- std::vector<ArrayValue::VariableValue> values = std::move(handler).getValues();
+ std::vector<ArrayValue::VariableValue> values = std::move(handler).stealValues();
if (values.empty()) {
return std::make_unique<NullValue>();
@@ -480,9 +480,9 @@ FieldValueNode::traceValue(const Context &context, std::ostream& out) const
doc.iterateNested(_fieldPath.getFullRange(), handler);
if (handler.hasSingleValue()) {
- return std::move(handler).getSingleValue();
+ return std::move(handler).stealSingleValue();
} else {
- std::vector<ArrayValue::VariableValue> values = std::move(handler).getValues();
+ std::vector<ArrayValue::VariableValue> values = std::move(handler).stealValues();
if (values.size() == 0) {
return std::make_unique<NullValue>();