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

Skip to content

Intergate ParsedMessageValue and MessageValue into the Value hierarchy #905

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.

Sign up for GitHub

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
merged 1 commit into from
Sep 6, 2024
Merged

Intergate ParsedMessageValue and MessageValue into the Value hierarchy #905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
153 changes: 144 additions & 9 deletions common/value.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@
namespace cel {
namespace {

static constexpr std::array<ValueKind, 20> kValueToKindArray = {
ValueKind::kError, ValueKind::kBool, ValueKind::kBytes,
ValueKind::kDouble, ValueKind::kDuration, ValueKind::kError,
ValueKind::kInt, ValueKind::kList, ValueKind::kList,
ValueKind::kMap, ValueKind::kMap, ValueKind::kNull,
ValueKind::kOpaque, ValueKind::kString, ValueKind::kStruct,
ValueKind::kStruct, ValueKind::kTimestamp, ValueKind::kType,
ValueKind::kUint, ValueKind::kUnknown};
static constexpr std::array<ValueKind, 21> kValueToKindArray = {
ValueKind::kError, ValueKind::kBool, ValueKind::kBytes,
ValueKind::kDouble, ValueKind::kDuration, ValueKind::kError,
ValueKind::kInt, ValueKind::kList, ValueKind::kList,
ValueKind::kMap, ValueKind::kMap, ValueKind::kNull,
ValueKind::kOpaque, ValueKind::kString, ValueKind::kStruct,
ValueKind::kStruct, ValueKind::kStruct, ValueKind::kTimestamp,
ValueKind::kType, ValueKind::kUint, ValueKind::kUnknown};

static_assert(kValueToKindArray.size() ==
absl::variant_size<common_internal::ValueVariant>(),
Expand All @@ -81,7 +81,7 @@ Type Value::GetRuntimeType() const {
case ValueKind::kBytes:
return BytesType();
case ValueKind::kStruct:
return Cast<StructValue>(*this).GetRuntimeType();
return static_cast<StructValue>(*this).GetRuntimeType();
case ValueKind::kDuration:
return DurationType();
case ValueKind::kTimestamp:
Expand Down Expand Up @@ -807,6 +807,38 @@ absl::optional<MapValue> Value::AsMap() const&& {
return absl::nullopt;
}

absl::optional<MessageValue> Value::AsMessage() & {
if (const auto* alternative = absl::get_if<ParsedMessageValue>(&variant_);
alternative != nullptr) {
return *alternative;
}
return absl::nullopt;
}

absl::optional<MessageValue> Value::AsMessage() const& {
if (const auto* alternative = absl::get_if<ParsedMessageValue>(&variant_);
alternative != nullptr) {
return *alternative;
}
return absl::nullopt;
}

absl::optional<MessageValue> Value::AsMessage() && {
if (auto* alternative = absl::get_if<ParsedMessageValue>(&variant_);
alternative != nullptr) {
return std::move(*alternative);
}
return absl::nullopt;
}

absl::optional<MessageValue> Value::AsMessage() const&& {
if (auto* alternative = absl::get_if<ParsedMessageValue>(&variant_);
alternative != nullptr) {
return std::move(*alternative);
}
return absl::nullopt;
}

absl::optional<NullValue> Value::AsNull() const {
if (const auto* alternative = absl::get_if<NullValue>(&variant_);
alternative != nullptr) {
Expand Down Expand Up @@ -878,6 +910,37 @@ absl::optional<OptionalValue> Value::AsOptional() const&& {
}
return absl::nullopt;
}
optional_ref<const ParsedMessageValue> Value::AsParsedMessage() & {
if (const auto* alternative = absl::get_if<ParsedMessageValue>(&variant_);
alternative != nullptr) {
return *alternative;
}
return absl::nullopt;
}

optional_ref<const ParsedMessageValue> Value::AsParsedMessage() const& {
if (const auto* alternative = absl::get_if<ParsedMessageValue>(&variant_);
alternative != nullptr) {
return *alternative;
}
return absl::nullopt;
}

absl::optional<ParsedMessageValue> Value::AsParsedMessage() && {
if (auto* alternative = absl::get_if<ParsedMessageValue>(&variant_);
alternative != nullptr) {
return std::move(*alternative);
}
return absl::nullopt;
}

absl::optional<ParsedMessageValue> Value::AsParsedMessage() const&& {
if (auto* alternative = absl::get_if<ParsedMessageValue>(&variant_);
alternative != nullptr) {
return std::move(*alternative);
}
return absl::nullopt;
}

optional_ref<const StringValue> Value::AsString() & {
if (const auto* alternative = absl::get_if<StringValue>(&variant_);
Expand Down Expand Up @@ -921,6 +984,10 @@ absl::optional<StructValue> Value::AsStruct() & {
alternative != nullptr) {
return *alternative;
}
if (const auto* alternative = absl::get_if<ParsedMessageValue>(&variant_);
alternative != nullptr) {
return *alternative;
}
return absl::nullopt;
}

Expand All @@ -934,6 +1001,10 @@ absl::optional<StructValue> Value::AsStruct() const& {
alternative != nullptr) {
return *alternative;
}
if (const auto* alternative = absl::get_if<ParsedMessageValue>(&variant_);
alternative != nullptr) {
return *alternative;
}
return absl::nullopt;
}

Expand All @@ -947,6 +1018,10 @@ absl::optional<StructValue> Value::AsStruct() && {
alternative != nullptr) {
return std::move(*alternative);
}
if (auto* alternative = absl::get_if<ParsedMessageValue>(&variant_);
alternative != nullptr) {
return std::move(*alternative);
}
return absl::nullopt;
}

Expand All @@ -960,6 +1035,10 @@ absl::optional<StructValue> Value::AsStruct() const&& {
alternative != nullptr) {
return std::move(*alternative);
}
if (auto* alternative = absl::get_if<ParsedMessageValue>(&variant_);
alternative != nullptr) {
return std::move(*alternative);
}
return absl::nullopt;
}

Expand Down Expand Up @@ -1222,6 +1301,26 @@ Value::operator MapValue() const&& {
CEL_VALUE_THROW_BAD_VARIANT_ACCESS();
}

Value::operator MessageValue() & {
ABSL_DCHECK(IsMessage()) << *this;
return absl::get<ParsedMessageValue>(variant_);
}

Value::operator MessageValue() const& {
ABSL_DCHECK(IsMessage()) << *this;
return absl::get<ParsedMessageValue>(variant_);
}

Value::operator MessageValue() && {
ABSL_DCHECK(IsMessage()) << *this;
return absl::get<ParsedMessageValue>(std::move(variant_));
}

Value::operator MessageValue() const&& {
ABSL_DCHECK(IsMessage()) << *this;
return absl::get<ParsedMessageValue>(std::move(variant_));
}

Value::operator NullValue() const {
ABSL_DCHECK(IsNull()) << *this;
return absl::get<NullValue>(variant_);
Expand Down Expand Up @@ -1269,6 +1368,26 @@ Value::operator OptionalValue() const&& {
absl::get<OpaqueValue>(std::move(variant_)));
}

Value::operator const ParsedMessageValue&() & {
ABSL_DCHECK(IsMessage()) << *this;
return absl::get<ParsedMessageValue>(variant_);
}

Value::operator const ParsedMessageValue&() const& {
ABSL_DCHECK(IsMessage()) << *this;
return absl::get<ParsedMessageValue>(variant_);
}

Value::operator ParsedMessageValue() && {
ABSL_DCHECK(IsMessage()) << *this;
return absl::get<ParsedMessageValue>(std::move(variant_));
}

Value::operator ParsedMessageValue() const&& {
ABSL_DCHECK(IsMessage()) << *this;
return absl::get<ParsedMessageValue>(std::move(variant_));
}

Value::operator const StringValue&() & {
ABSL_DCHECK(IsString()) << *this;
return absl::get<StringValue>(variant_);
Expand Down Expand Up @@ -1300,6 +1419,10 @@ Value::operator StructValue() & {
alternative != nullptr) {
return *alternative;
}
if (const auto* alternative = absl::get_if<ParsedMessageValue>(&variant_);
alternative != nullptr) {
return *alternative;
}
CEL_VALUE_THROW_BAD_VARIANT_ACCESS();
}

Expand All @@ -1314,6 +1437,10 @@ Value::operator StructValue() const& {
alternative != nullptr) {
return *alternative;
}
if (const auto* alternative = absl::get_if<ParsedMessageValue>(&variant_);
alternative != nullptr) {
return *alternative;
}
CEL_VALUE_THROW_BAD_VARIANT_ACCESS();
}

Expand All @@ -1328,6 +1455,10 @@ Value::operator StructValue() && {
alternative != nullptr) {
return std::move(*alternative);
}
if (auto* alternative = absl::get_if<ParsedMessageValue>(&variant_);
alternative != nullptr) {
return std::move(*alternative);
}
CEL_VALUE_THROW_BAD_VARIANT_ACCESS();
}

Expand All @@ -1342,6 +1473,10 @@ Value::operator StructValue() const&& {
alternative != nullptr) {
return std::move(*alternative);
}
if (auto* alternative = absl::get_if<ParsedMessageValue>(&variant_);
alternative != nullptr) {
return std::move(*alternative);
}
CEL_VALUE_THROW_BAD_VARIANT_ACCESS();
}

Expand Down
Loading