Skip to content

Rename Parsed{List,Map,Struct}Value to Custom{List,Map,Struct}Value #1177

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
Jan 16, 2025
Merged

Rename Parsed{List,Map,Struct}Value to Custom{List,Map,Struct}Value #1177

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
2 changes: 0 additions & 2 deletions common/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,6 @@ cc_library(
"type_reflector.cc",
"value.cc",
"value_factory.cc",
"value_interface.cc",
"value_manager.cc",
],
hdrs = glob(
Expand All @@ -625,7 +624,6 @@ cc_library(
"type_reflector.h",
"value.h",
"value_factory.h",
"value_interface.h",
"value_manager.h",
],
deps = [
Expand Down
8 changes: 4 additions & 4 deletions common/legacy_value.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,9 @@ CelValue LegacyTrivialListValue(absl::Nonnull<google::protobuf::Arena*> arena,
.GetValuesDescriptor(),
arena));
}
if (auto parsed_list_value = value.AsParsedList(); parsed_list_value) {
if (auto custom_list_value = value.AsCustomList(); custom_list_value) {
auto status_or_compat_list =
common_internal::MakeCompatListValue(arena, *parsed_list_value);
common_internal::MakeCompatListValue(arena, *custom_list_value);
if (!status_or_compat_list.ok()) {
return CelValue::CreateError(google::protobuf::Arena::Create<absl::Status>(
arena, std::move(status_or_compat_list).status()));
Expand Down Expand Up @@ -426,9 +426,9 @@ CelValue LegacyTrivialMapValue(absl::Nonnull<google::protobuf::Arena*> arena,
.GetFieldsDescriptor(),
arena));
}
if (auto parsed_map_value = value.AsParsedMap(); parsed_map_value) {
if (auto custom_map_value = value.AsCustomMap(); custom_map_value) {
auto status_or_compat_map =
common_internal::MakeCompatMapValue(arena, *parsed_map_value);
common_internal::MakeCompatMapValue(arena, *custom_map_value);
if (!status_or_compat_map.ok()) {
return CelValue::CreateError(google::protobuf::Arena::Create<absl::Status>(
arena, std::move(status_or_compat_map).status()));
Expand Down
90 changes: 45 additions & 45 deletions common/value.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ absl::Status Value::ConvertToJsonArray(
message_factory, json);
},
[descriptor_pool, message_factory,
json](const ParsedListValue& alternative) -> absl::Status {
json](const CustomListValue& alternative) -> absl::Status {
return alternative.ConvertToJsonArray(descriptor_pool,
message_factory, json);
},
Expand Down Expand Up @@ -280,7 +280,7 @@ absl::Status Value::ConvertToJsonObject(
message_factory, json);
},
[descriptor_pool, message_factory,
json](const ParsedMapValue& alternative) -> absl::Status {
json](const CustomMapValue& alternative) -> absl::Status {
return alternative.ConvertToJsonObject(descriptor_pool,
message_factory, json);
},
Expand All @@ -301,7 +301,7 @@ absl::Status Value::ConvertToJsonObject(
message_factory, json);
},
[descriptor_pool, message_factory,
json](const ParsedStructValue& alternative) -> absl::Status {
json](const CustomStructValue& alternative) -> absl::Status {
return alternative.ConvertToJsonObject(descriptor_pool,
message_factory, json);
},
Expand Down Expand Up @@ -1952,7 +1952,7 @@ absl::optional<ListValue> Value::AsList() const& {
alternative != nullptr) {
return *alternative;
}
if (const auto* alternative = absl::get_if<ParsedListValue>(&variant_);
if (const auto* alternative = absl::get_if<CustomListValue>(&variant_);
alternative != nullptr) {
return *alternative;
}
Expand All @@ -1974,7 +1974,7 @@ absl::optional<ListValue> Value::AsList() && {
alternative != nullptr) {
return std::move(*alternative);
}
if (auto* alternative = absl::get_if<ParsedListValue>(&variant_);
if (auto* alternative = absl::get_if<CustomListValue>(&variant_);
alternative != nullptr) {
return std::move(*alternative);
}
Expand All @@ -1995,7 +1995,7 @@ absl::optional<MapValue> Value::AsMap() const& {
alternative != nullptr) {
return *alternative;
}
if (const auto* alternative = absl::get_if<ParsedMapValue>(&variant_);
if (const auto* alternative = absl::get_if<CustomMapValue>(&variant_);
alternative != nullptr) {
return *alternative;
}
Expand All @@ -2016,7 +2016,7 @@ absl::optional<MapValue> Value::AsMap() && {
alternative != nullptr) {
return std::move(*alternative);
}
if (auto* alternative = absl::get_if<ParsedMapValue>(&variant_);
if (auto* alternative = absl::get_if<CustomMapValue>(&variant_);
alternative != nullptr) {
return std::move(*alternative);
}
Expand Down Expand Up @@ -2119,32 +2119,32 @@ absl::optional<ParsedJsonMapValue> Value::AsParsedJsonMap() && {
return absl::nullopt;
}

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

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

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

absl::optional<ParsedMapValue> Value::AsParsedMap() && {
if (auto* alternative = absl::get_if<ParsedMapValue>(&variant_);
absl::optional<CustomMapValue> Value::AsCustomMap() && {
if (auto* alternative = absl::get_if<CustomMapValue>(&variant_);
alternative != nullptr) {
return std::move(*alternative);
}
Expand Down Expand Up @@ -2201,16 +2201,16 @@ absl::optional<ParsedRepeatedFieldValue> Value::AsParsedRepeatedField() && {
return absl::nullopt;
}

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

absl::optional<ParsedStructValue> Value::AsParsedStruct() && {
if (auto* alternative = absl::get_if<ParsedStructValue>(&variant_);
absl::optional<CustomStructValue> Value::AsCustomStruct() && {
if (auto* alternative = absl::get_if<CustomStructValue>(&variant_);
alternative != nullptr) {
return std::move(*alternative);
}
Expand Down Expand Up @@ -2239,7 +2239,7 @@ absl::optional<StructValue> Value::AsStruct() const& {
alternative != nullptr) {
return *alternative;
}
if (const auto* alternative = absl::get_if<ParsedStructValue>(&variant_);
if (const auto* alternative = absl::get_if<CustomStructValue>(&variant_);
alternative != nullptr) {
return *alternative;
}
Expand All @@ -2256,7 +2256,7 @@ absl::optional<StructValue> Value::AsStruct() && {
alternative != nullptr) {
return std::move(*alternative);
}
if (auto* alternative = absl::get_if<ParsedStructValue>(&variant_);
if (auto* alternative = absl::get_if<CustomStructValue>(&variant_);
alternative != nullptr) {
return std::move(*alternative);
}
Expand Down Expand Up @@ -2369,7 +2369,7 @@ ListValue Value::GetList() const& {
alternative != nullptr) {
return *alternative;
}
if (const auto* alternative = absl::get_if<ParsedListValue>(&variant_);
if (const auto* alternative = absl::get_if<CustomListValue>(&variant_);
alternative != nullptr) {
return *alternative;
}
Expand All @@ -2392,7 +2392,7 @@ ListValue Value::GetList() && {
alternative != nullptr) {
return std::move(*alternative);
}
if (auto* alternative = absl::get_if<ParsedListValue>(&variant_);
if (auto* alternative = absl::get_if<CustomListValue>(&variant_);
alternative != nullptr) {
return std::move(*alternative);
}
Expand All @@ -2414,7 +2414,7 @@ MapValue Value::GetMap() const& {
alternative != nullptr) {
return *alternative;
}
if (const auto* alternative = absl::get_if<ParsedMapValue>(&variant_);
if (const auto* alternative = absl::get_if<CustomMapValue>(&variant_);
alternative != nullptr) {
return *alternative;
}
Expand All @@ -2436,7 +2436,7 @@ MapValue Value::GetMap() && {
alternative != nullptr) {
return std::move(*alternative);
}
if (auto* alternative = absl::get_if<ParsedMapValue>(&variant_);
if (auto* alternative = absl::get_if<CustomMapValue>(&variant_);
alternative != nullptr) {
return std::move(*alternative);
}
Expand Down Expand Up @@ -2507,24 +2507,24 @@ ParsedJsonMapValue Value::GetParsedJsonMap() && {
return absl::get<ParsedJsonMapValue>(std::move(variant_));
}

const ParsedListValue& Value::GetParsedList() const& {
ABSL_DCHECK(IsParsedList()) << *this;
return absl::get<ParsedListValue>(variant_);
const CustomListValue& Value::GetCustomList() const& {
ABSL_DCHECK(IsCustomList()) << *this;
return absl::get<CustomListValue>(variant_);
}

ParsedListValue Value::GetParsedList() && {
ABSL_DCHECK(IsParsedList()) << *this;
return absl::get<ParsedListValue>(std::move(variant_));
CustomListValue Value::GetCustomList() && {
ABSL_DCHECK(IsCustomList()) << *this;
return absl::get<CustomListValue>(std::move(variant_));
}

const ParsedMapValue& Value::GetParsedMap() const& {
ABSL_DCHECK(IsParsedMap()) << *this;
return absl::get<ParsedMapValue>(variant_);
const CustomMapValue& Value::GetCustomMap() const& {
ABSL_DCHECK(IsCustomMap()) << *this;
return absl::get<CustomMapValue>(variant_);
}

ParsedMapValue Value::GetParsedMap() && {
ABSL_DCHECK(IsParsedMap()) << *this;
return absl::get<ParsedMapValue>(std::move(variant_));
CustomMapValue Value::GetCustomMap() && {
ABSL_DCHECK(IsCustomMap()) << *this;
return absl::get<CustomMapValue>(std::move(variant_));
}

const ParsedMapFieldValue& Value::GetParsedMapField() const& {
Expand Down Expand Up @@ -2557,14 +2557,14 @@ ParsedRepeatedFieldValue Value::GetParsedRepeatedField() && {
return absl::get<ParsedRepeatedFieldValue>(std::move(variant_));
}

const ParsedStructValue& Value::GetParsedStruct() const& {
ABSL_DCHECK(IsParsedMap()) << *this;
return absl::get<ParsedStructValue>(variant_);
const CustomStructValue& Value::GetCustomStruct() const& {
ABSL_DCHECK(IsCustomStruct()) << *this;
return absl::get<CustomStructValue>(variant_);
}

ParsedStructValue Value::GetParsedStruct() && {
ABSL_DCHECK(IsParsedMap()) << *this;
return absl::get<ParsedStructValue>(std::move(variant_));
CustomStructValue Value::GetCustomStruct() && {
ABSL_DCHECK(IsCustomStruct()) << *this;
return absl::get<CustomStructValue>(std::move(variant_));
}

const StringValue& Value::GetString() const& {
Expand All @@ -2584,7 +2584,7 @@ StructValue Value::GetStruct() const& {
alternative != nullptr) {
return *alternative;
}
if (const auto* alternative = absl::get_if<ParsedStructValue>(&variant_);
if (const auto* alternative = absl::get_if<CustomStructValue>(&variant_);
alternative != nullptr) {
return *alternative;
}
Expand All @@ -2602,7 +2602,7 @@ StructValue Value::GetStruct() && {
alternative != nullptr) {
return std::move(*alternative);
}
if (auto* alternative = absl::get_if<ParsedStructValue>(&variant_);
if (auto* alternative = absl::get_if<CustomStructValue>(&variant_);
alternative != nullptr) {
return std::move(*alternative);
}
Expand Down
Loading