Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Use absl::Span for returns in attributes #426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Nov 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions base/attribute.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#ifndef THIRD_PARTY_CEL_CPP_BASE_ATTRIBUTE_H_
#define THIRD_PARTY_CEL_CPP_BASE_ATTRIBUTE_H_

#include <cstdint>
#include <memory>
#include <optional>
#include <string>
Expand All @@ -24,6 +25,7 @@
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
#include "absl/types/span.h"
#include "absl/types/variant.h"
#include "base/kind.h"

Expand Down Expand Up @@ -185,7 +187,7 @@ class Attribute final {

bool has_variable_name() const { return !impl_->variable_name.empty(); }

const std::vector<AttributeQualifier>& qualifier_path() const {
absl::Span<const AttributeQualifier> qualifier_path() const {
return impl_->qualifier_path;
}

Expand Down Expand Up @@ -230,7 +232,7 @@ class AttributePattern final {

absl::string_view variable() const { return variable_; }

const std::vector<AttributeQualifierPattern>& qualifier_path() const {
absl::Span<const AttributeQualifierPattern> qualifier_path() const {
return qualifier_path_;
}

Expand Down
3 changes: 2 additions & 1 deletion extensions/select_optimization.cc
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,8 @@ AttributeTrail OptimizedSelectStep::GetAttributeTrail(

auto attr = frame->value_stack().PeekAttribute();
std::vector<AttributeQualifier> qualifiers =
attr.attribute().qualifier_path();
std::vector<AttributeQualifier>(attr.attribute().qualifier_path().begin(),
attr.attribute().qualifier_path().end());
qualifiers.reserve(qualifiers_.size() + qualifiers.size());
absl::c_copy(qualifiers_, std::back_inserter(qualifiers));
AttributeTrail result(Attribute(std::string(attr.attribute().variable_name()),
Expand Down