Skip to content

Commit c821e9d

Browse files
jckingcopybara-github
jcking
authored and
copybara-github
committed
Rename Parsed{List,Map,Struct}Value to Custom{List,Map,Struct}Value
PiperOrigin-RevId: 715914712
1 parent 88bfbbf commit c821e9d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+721
-853
lines changed

‎common/BUILD‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@ cc_library(
610610
"type_reflector.cc",
611611
"value.cc",
612612
"value_factory.cc",
613-
"value_interface.cc",
614613
"value_manager.cc",
615614
],
616615
hdrs = glob(
@@ -625,7 +624,6 @@ cc_library(
625624
"type_reflector.h",
626625
"value.h",
627626
"value_factory.h",
628-
"value_interface.h",
629627
"value_manager.h",
630628
],
631629
deps = [

‎common/legacy_value.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,9 @@ CelValue LegacyTrivialListValue(absl::Nonnull<google::protobuf::Arena*> arena,
389389
.GetValuesDescriptor(),
390390
arena));
391391
}
392-
if (auto parsed_list_value = value.AsParsedList(); parsed_list_value) {
392+
if (auto custom_list_value = value.AsCustomList(); custom_list_value) {
393393
auto status_or_compat_list =
394-
common_internal::MakeCompatListValue(arena, *parsed_list_value);
394+
common_internal::MakeCompatListValue(arena, *custom_list_value);
395395
if (!status_or_compat_list.ok()) {
396396
return CelValue::CreateError(google::protobuf::Arena::Create<absl::Status>(
397397
arena, std::move(status_or_compat_list).status()));
@@ -426,9 +426,9 @@ CelValue LegacyTrivialMapValue(absl::Nonnull<google::protobuf::Arena*> arena,
426426
.GetFieldsDescriptor(),
427427
arena));
428428
}
429-
if (auto parsed_map_value = value.AsParsedMap(); parsed_map_value) {
429+
if (auto custom_map_value = value.AsCustomMap(); custom_map_value) {
430430
auto status_or_compat_map =
431-
common_internal::MakeCompatMapValue(arena, *parsed_map_value);
431+
common_internal::MakeCompatMapValue(arena, *custom_map_value);
432432
if (!status_or_compat_map.ok()) {
433433
return CelValue::CreateError(google::protobuf::Arena::Create<absl::Status>(
434434
arena, std::move(status_or_compat_map).status()));

‎common/value.cc‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ absl::Status Value::ConvertToJsonArray(
235235
message_factory, json);
236236
},
237237
[descriptor_pool, message_factory,
238-
json](const ParsedListValue& alternative) -> absl::Status {
238+
json](const CustomListValue& alternative) -> absl::Status {
239239
return alternative.ConvertToJsonArray(descriptor_pool,
240240
message_factory, json);
241241
},
@@ -280,7 +280,7 @@ absl::Status Value::ConvertToJsonObject(
280280
message_factory, json);
281281
},
282282
[descriptor_pool, message_factory,
283-
json](const ParsedMapValue& alternative) -> absl::Status {
283+
json](const CustomMapValue& alternative) -> absl::Status {
284284
return alternative.ConvertToJsonObject(descriptor_pool,
285285
message_factory, json);
286286
},
@@ -301,7 +301,7 @@ absl::Status Value::ConvertToJsonObject(
301301
message_factory, json);
302302
},
303303
[descriptor_pool, message_factory,
304-
json](const ParsedStructValue& alternative) -> absl::Status {
304+
json](const CustomStructValue& alternative) -> absl::Status {
305305
return alternative.ConvertToJsonObject(descriptor_pool,
306306
message_factory, json);
307307
},
@@ -1952,7 +1952,7 @@ absl::optional<ListValue> Value::AsList() const& {
19521952
alternative != nullptr) {
19531953
return *alternative;
19541954
}
1955-
if (const auto* alternative = absl::get_if<ParsedListValue>(&variant_);
1955+
if (const auto* alternative = absl::get_if<CustomListValue>(&variant_);
19561956
alternative != nullptr) {
19571957
return *alternative;
19581958
}
@@ -1974,7 +1974,7 @@ absl::optional<ListValue> Value::AsList() && {
19741974
alternative != nullptr) {
19751975
return std::move(*alternative);
19761976
}
1977-
if (auto* alternative = absl::get_if<ParsedListValue>(&variant_);
1977+
if (auto* alternative = absl::get_if<CustomListValue>(&variant_);
19781978
alternative != nullptr) {
19791979
return std::move(*alternative);
19801980
}
@@ -1995,7 +1995,7 @@ absl::optional<MapValue> Value::AsMap() const& {
19951995
alternative != nullptr) {
19961996
return *alternative;
19971997
}
1998-
if (const auto* alternative = absl::get_if<ParsedMapValue>(&variant_);
1998+
if (const auto* alternative = absl::get_if<CustomMapValue>(&variant_);
19991999
alternative != nullptr) {
20002000
return *alternative;
20012001
}
@@ -2016,7 +2016,7 @@ absl::optional<MapValue> Value::AsMap() && {
20162016
alternative != nullptr) {
20172017
return std::move(*alternative);
20182018
}
2019-
if (auto* alternative = absl::get_if<ParsedMapValue>(&variant_);
2019+
if (auto* alternative = absl::get_if<CustomMapValue>(&variant_);
20202020
alternative != nullptr) {
20212021
return std::move(*alternative);
20222022
}
@@ -2119,32 +2119,32 @@ absl::optional<ParsedJsonMapValue> Value::AsParsedJsonMap() && {
21192119
return absl::nullopt;
21202120
}
21212121

2122-
optional_ref<const ParsedListValue> Value::AsParsedList() const& {
2123-
if (const auto* alternative = absl::get_if<ParsedListValue>(&variant_);
2122+
optional_ref<const CustomListValue> Value::AsCustomList() const& {
2123+
if (const auto* alternative = absl::get_if<CustomListValue>(&variant_);
21242124
alternative != nullptr) {
21252125
return *alternative;
21262126
}
21272127
return absl::nullopt;
21282128
}
21292129

2130-
absl::optional<ParsedListValue> Value::AsParsedList() && {
2131-
if (auto* alternative = absl::get_if<ParsedListValue>(&variant_);
2130+
absl::optional<CustomListValue> Value::AsCustomList() && {
2131+
if (auto* alternative = absl::get_if<CustomListValue>(&variant_);
21322132
alternative != nullptr) {
21332133
return std::move(*alternative);
21342134
}
21352135
return absl::nullopt;
21362136
}
21372137

2138-
optional_ref<const ParsedMapValue> Value::AsParsedMap() const& {
2139-
if (const auto* alternative = absl::get_if<ParsedMapValue>(&variant_);
2138+
optional_ref<const CustomMapValue> Value::AsCustomMap() const& {
2139+
if (const auto* alternative = absl::get_if<CustomMapValue>(&variant_);
21402140
alternative != nullptr) {
21412141
return *alternative;
21422142
}
21432143
return absl::nullopt;
21442144
}
21452145

2146-
absl::optional<ParsedMapValue> Value::AsParsedMap() && {
2147-
if (auto* alternative = absl::get_if<ParsedMapValue>(&variant_);
2146+
absl::optional<CustomMapValue> Value::AsCustomMap() && {
2147+
if (auto* alternative = absl::get_if<CustomMapValue>(&variant_);
21482148
alternative != nullptr) {
21492149
return std::move(*alternative);
21502150
}
@@ -2201,16 +2201,16 @@ absl::optional<ParsedRepeatedFieldValue> Value::AsParsedRepeatedField() && {
22012201
return absl::nullopt;
22022202
}
22032203

2204-
optional_ref<const ParsedStructValue> Value::AsParsedStruct() const& {
2205-
if (const auto* alternative = absl::get_if<ParsedStructValue>(&variant_);
2204+
optional_ref<const CustomStructValue> Value::AsCustomStruct() const& {
2205+
if (const auto* alternative = absl::get_if<CustomStructValue>(&variant_);
22062206
alternative != nullptr) {
22072207
return *alternative;
22082208
}
22092209
return absl::nullopt;
22102210
}
22112211

2212-
absl::optional<ParsedStructValue> Value::AsParsedStruct() && {
2213-
if (auto* alternative = absl::get_if<ParsedStructValue>(&variant_);
2212+
absl::optional<CustomStructValue> Value::AsCustomStruct() && {
2213+
if (auto* alternative = absl::get_if<CustomStructValue>(&variant_);
22142214
alternative != nullptr) {
22152215
return std::move(*alternative);
22162216
}
@@ -2239,7 +2239,7 @@ absl::optional<StructValue> Value::AsStruct() const& {
22392239
alternative != nullptr) {
22402240
return *alternative;
22412241
}
2242-
if (const auto* alternative = absl::get_if<ParsedStructValue>(&variant_);
2242+
if (const auto* alternative = absl::get_if<CustomStructValue>(&variant_);
22432243
alternative != nullptr) {
22442244
return *alternative;
22452245
}
@@ -2256,7 +2256,7 @@ absl::optional<StructValue> Value::AsStruct() && {
22562256
alternative != nullptr) {
22572257
return std::move(*alternative);
22582258
}
2259-
if (auto* alternative = absl::get_if<ParsedStructValue>(&variant_);
2259+
if (auto* alternative = absl::get_if<CustomStructValue>(&variant_);
22602260
alternative != nullptr) {
22612261
return std::move(*alternative);
22622262
}
@@ -2369,7 +2369,7 @@ ListValue Value::GetList() const& {
23692369
alternative != nullptr) {
23702370
return *alternative;
23712371
}
2372-
if (const auto* alternative = absl::get_if<ParsedListValue>(&variant_);
2372+
if (const auto* alternative = absl::get_if<CustomListValue>(&variant_);
23732373
alternative != nullptr) {
23742374
return *alternative;
23752375
}
@@ -2392,7 +2392,7 @@ ListValue Value::GetList() && {
23922392
alternative != nullptr) {
23932393
return std::move(*alternative);
23942394
}
2395-
if (auto* alternative = absl::get_if<ParsedListValue>(&variant_);
2395+
if (auto* alternative = absl::get_if<CustomListValue>(&variant_);
23962396
alternative != nullptr) {
23972397
return std::move(*alternative);
23982398
}
@@ -2414,7 +2414,7 @@ MapValue Value::GetMap() const& {
24142414
alternative != nullptr) {
24152415
return *alternative;
24162416
}
2417-
if (const auto* alternative = absl::get_if<ParsedMapValue>(&variant_);
2417+
if (const auto* alternative = absl::get_if<CustomMapValue>(&variant_);
24182418
alternative != nullptr) {
24192419
return *alternative;
24202420
}
@@ -2436,7 +2436,7 @@ MapValue Value::GetMap() && {
24362436
alternative != nullptr) {
24372437
return std::move(*alternative);
24382438
}
2439-
if (auto* alternative = absl::get_if<ParsedMapValue>(&variant_);
2439+
if (auto* alternative = absl::get_if<CustomMapValue>(&variant_);
24402440
alternative != nullptr) {
24412441
return std::move(*alternative);
24422442
}
@@ -2507,24 +2507,24 @@ ParsedJsonMapValue Value::GetParsedJsonMap() && {
25072507
return absl::get<ParsedJsonMapValue>(std::move(variant_));
25082508
}
25092509

2510-
const ParsedListValue& Value::GetParsedList() const& {
2511-
ABSL_DCHECK(IsParsedList()) << *this;
2512-
return absl::get<ParsedListValue>(variant_);
2510+
const CustomListValue& Value::GetCustomList() const& {
2511+
ABSL_DCHECK(IsCustomList()) << *this;
2512+
return absl::get<CustomListValue>(variant_);
25132513
}
25142514

2515-
ParsedListValue Value::GetParsedList() && {
2516-
ABSL_DCHECK(IsParsedList()) << *this;
2517-
return absl::get<ParsedListValue>(std::move(variant_));
2515+
CustomListValue Value::GetCustomList() && {
2516+
ABSL_DCHECK(IsCustomList()) << *this;
2517+
return absl::get<CustomListValue>(std::move(variant_));
25182518
}
25192519

2520-
const ParsedMapValue& Value::GetParsedMap() const& {
2521-
ABSL_DCHECK(IsParsedMap()) << *this;
2522-
return absl::get<ParsedMapValue>(variant_);
2520+
const CustomMapValue& Value::GetCustomMap() const& {
2521+
ABSL_DCHECK(IsCustomMap()) << *this;
2522+
return absl::get<CustomMapValue>(variant_);
25232523
}
25242524

2525-
ParsedMapValue Value::GetParsedMap() && {
2526-
ABSL_DCHECK(IsParsedMap()) << *this;
2527-
return absl::get<ParsedMapValue>(std::move(variant_));
2525+
CustomMapValue Value::GetCustomMap() && {
2526+
ABSL_DCHECK(IsCustomMap()) << *this;
2527+
return absl::get<CustomMapValue>(std::move(variant_));
25282528
}
25292529

25302530
const ParsedMapFieldValue& Value::GetParsedMapField() const& {
@@ -2557,14 +2557,14 @@ ParsedRepeatedFieldValue Value::GetParsedRepeatedField() && {
25572557
return absl::get<ParsedRepeatedFieldValue>(std::move(variant_));
25582558
}
25592559

2560-
const ParsedStructValue& Value::GetParsedStruct() const& {
2561-
ABSL_DCHECK(IsParsedMap()) << *this;
2562-
return absl::get<ParsedStructValue>(variant_);
2560+
const CustomStructValue& Value::GetCustomStruct() const& {
2561+
ABSL_DCHECK(IsCustomStruct()) << *this;
2562+
return absl::get<CustomStructValue>(variant_);
25632563
}
25642564

2565-
ParsedStructValue Value::GetParsedStruct() && {
2566-
ABSL_DCHECK(IsParsedMap()) << *this;
2567-
return absl::get<ParsedStructValue>(std::move(variant_));
2565+
CustomStructValue Value::GetCustomStruct() && {
2566+
ABSL_DCHECK(IsCustomStruct()) << *this;
2567+
return absl::get<CustomStructValue>(std::move(variant_));
25682568
}
25692569

25702570
const StringValue& Value::GetString() const& {
@@ -2584,7 +2584,7 @@ StructValue Value::GetStruct() const& {
25842584
alternative != nullptr) {
25852585
return *alternative;
25862586
}
2587-
if (const auto* alternative = absl::get_if<ParsedStructValue>(&variant_);
2587+
if (const auto* alternative = absl::get_if<CustomStructValue>(&variant_);
25882588
alternative != nullptr) {
25892589
return *alternative;
25902590
}
@@ -2602,7 +2602,7 @@ StructValue Value::GetStruct() && {
26022602
alternative != nullptr) {
26032603
return std::move(*alternative);
26042604
}
2605-
if (auto* alternative = absl::get_if<ParsedStructValue>(&variant_);
2605+
if (auto* alternative = absl::get_if<CustomStructValue>(&variant_);
26062606
alternative != nullptr) {
26072607
return std::move(*alternative);
26082608
}

0 commit comments

Comments
 (0)