Skip to content

Commit 8be1138

Browse files
CEL Dev Teamcopybara-github
CEL Dev Team
authored and
copybara-github
committed
No public description
PiperOrigin-RevId: 917642842
1 parent da45d34 commit 8be1138

6 files changed

Lines changed: 47 additions & 49 deletions

File tree

‎extensions/bindings_ext.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ std::vector<Macro> bindings_macros() {
7171
absl::StatusOr<Macro> cel_bind = Macro::Receiver(
7272
kBind, 3,
7373
[](MacroExprFactory& factory, Expr& target,
74-
absl::Span<Expr> args) -> absl::optional<Expr> {
74+
absl::Span<Expr> args) -> std::optional<Expr> {
7575
if (!IsTargetNamespace(target)) {
7676
return absl::nullopt;
7777
}

‎extensions/comprehensions_v2_macros.cc‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ namespace {
3838

3939
using ::google::api::expr::common::CelOperator;
4040

41-
absl::optional<Expr> ExpandAllMacro2(MacroExprFactory& factory, Expr& target,
42-
absl::Span<Expr> args) {
41+
std::optional<Expr> ExpandAllMacro2(MacroExprFactory& factory, Expr& target,
42+
absl::Span<Expr> args) {
4343
if (args.size() != 3) {
4444
return factory.ReportError("all() requires 3 arguments");
4545
}
@@ -84,8 +84,8 @@ Macro MakeAllMacro2() {
8484
return std::move(*status_or_macro);
8585
}
8686

87-
absl::optional<Expr> ExpandExistsMacro2(MacroExprFactory& factory, Expr& target,
88-
absl::Span<Expr> args) {
87+
std::optional<Expr> ExpandExistsMacro2(MacroExprFactory& factory, Expr& target,
88+
absl::Span<Expr> args) {
8989
if (args.size() != 3) {
9090
return factory.ReportError("exists() requires 3 arguments");
9191
}
@@ -132,9 +132,8 @@ Macro MakeExistsMacro2() {
132132
return std::move(*status_or_macro);
133133
}
134134

135-
absl::optional<Expr> ExpandExistsOneMacro2(MacroExprFactory& factory,
136-
Expr& target,
137-
absl::Span<Expr> args) {
135+
std::optional<Expr> ExpandExistsOneMacro2(MacroExprFactory& factory,
136+
Expr& target, absl::Span<Expr> args) {
138137
if (args.size() != 3) {
139138
return factory.ReportError("existsOne() requires 3 arguments");
140139
}
@@ -184,9 +183,9 @@ Macro MakeExistsOneMacro2() {
184183
return std::move(*status_or_macro);
185184
}
186185

187-
absl::optional<Expr> ExpandTransformList3Macro(MacroExprFactory& factory,
188-
Expr& target,
189-
absl::Span<Expr> args) {
186+
std::optional<Expr> ExpandTransformList3Macro(MacroExprFactory& factory,
187+
Expr& target,
188+
absl::Span<Expr> args) {
190189
if (args.size() != 3) {
191190
return factory.ReportError("transformList() requires 3 arguments");
192191
}
@@ -233,9 +232,9 @@ Macro MakeTransformList3Macro() {
233232
return std::move(*status_or_macro);
234233
}
235234

236-
absl::optional<Expr> ExpandTransformList4Macro(MacroExprFactory& factory,
237-
Expr& target,
238-
absl::Span<Expr> args) {
235+
std::optional<Expr> ExpandTransformList4Macro(MacroExprFactory& factory,
236+
Expr& target,
237+
absl::Span<Expr> args) {
239238
if (args.size() != 4) {
240239
return factory.ReportError("transformList() requires 4 arguments");
241240
}
@@ -284,9 +283,9 @@ Macro MakeTransformList4Macro() {
284283
return std::move(*status_or_macro);
285284
}
286285

287-
absl::optional<Expr> ExpandTransformMap3Macro(MacroExprFactory& factory,
288-
Expr& target,
289-
absl::Span<Expr> args) {
286+
std::optional<Expr> ExpandTransformMap3Macro(MacroExprFactory& factory,
287+
Expr& target,
288+
absl::Span<Expr> args) {
290289
if (args.size() != 3) {
291290
return factory.ReportError("transformMap() requires 3 arguments");
292291
}
@@ -332,9 +331,9 @@ Macro MakeTransformMap3Macro() {
332331
return std::move(*status_or_macro);
333332
}
334333

335-
absl::optional<Expr> ExpandTransformMap4Macro(MacroExprFactory& factory,
336-
Expr& target,
337-
absl::Span<Expr> args) {
334+
std::optional<Expr> ExpandTransformMap4Macro(MacroExprFactory& factory,
335+
Expr& target,
336+
absl::Span<Expr> args) {
338337
if (args.size() != 4) {
339338
return factory.ReportError("transformMap() requires 4 arguments");
340339
}
@@ -382,9 +381,9 @@ Macro MakeTransformMap4Macro() {
382381
return std::move(*status_or_macro);
383382
}
384383

385-
absl::optional<Expr> ExpandTransformMapEntry3Macro(MacroExprFactory& factory,
386-
Expr& target,
387-
absl::Span<Expr> args) {
384+
std::optional<Expr> ExpandTransformMapEntry3Macro(MacroExprFactory& factory,
385+
Expr& target,
386+
absl::Span<Expr> args) {
388387
if (args.size() != 3) {
389388
return factory.ReportError("transformMapEntry() requires 3 arguments");
390389
}
@@ -432,9 +431,9 @@ Macro MakeTransformMap3EntryMacro() {
432431
return std::move(*status_or_macro);
433432
}
434433

435-
absl::optional<Expr> ExpandTransformMapEntry4Macro(MacroExprFactory& factory,
436-
Expr& target,
437-
absl::Span<Expr> args) {
434+
std::optional<Expr> ExpandTransformMapEntry4Macro(MacroExprFactory& factory,
435+
Expr& target,
436+
absl::Span<Expr> args) {
438437
if (args.size() != 4) {
439438
return factory.ReportError("transformMapEntry() requires 4 arguments");
440439
}

‎extensions/lists_functions.cc‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ absl::Status ListFlattenImpl(
196196
for (int64_t i = 0; i < size; ++i) {
197197
CEL_ASSIGN_OR_RETURN(Value value,
198198
list.Get(i, descriptor_pool, message_factory, arena));
199-
if (absl::optional<ListValue> list_value = value.AsList();
199+
if (std::optional<ListValue> list_value = value.AsList();
200200
list_value.has_value() && remaining_depth > 0) {
201201
CEL_RETURN_IF_ERROR(ListFlattenImpl(*list_value, remaining_depth - 1,
202202
descriptor_pool, message_factory,
@@ -392,9 +392,8 @@ absl::StatusOr<Value> ListSortByAssociatedKeys(
392392

393393
// Create an expression equivalent to:
394394
// target.map(varIdent, mapExpr)
395-
absl::optional<Expr> MakeMapComprehension(MacroExprFactory& factory,
396-
Expr target, Expr var_ident,
397-
Expr map_expr) {
395+
std::optional<Expr> MakeMapComprehension(MacroExprFactory& factory, Expr target,
396+
Expr var_ident, Expr map_expr) {
398397
auto step = factory.NewCall(
399398
google::api::expr::common::CelOperator::ADD, factory.NewAccuIdent(),
400399
factory.NewList(factory.NewListElement(std::move(map_expr))));
@@ -407,9 +406,9 @@ absl::optional<Expr> MakeMapComprehension(MacroExprFactory& factory,
407406

408407
// Create an expression equivalent to:
409408
// cel.bind(varIdent, varExpr, call_expr)
410-
absl::optional<Expr> MakeBindComprehension(MacroExprFactory& factory,
411-
Expr var_ident, Expr var_expr,
412-
Expr call_expr) {
409+
std::optional<Expr> MakeBindComprehension(MacroExprFactory& factory,
410+
Expr var_ident, Expr var_expr,
411+
Expr call_expr) {
413412
auto var_name = var_ident.ident_expr().name();
414413
return factory.NewComprehension(
415414
"#unused", factory.NewList(), std::move(var_name), std::move(var_expr),
@@ -433,7 +432,7 @@ Macro ListSortByMacro() {
433432
absl::StatusOr<Macro> sortby_macro = Macro::Receiver(
434433
"sortBy", 2,
435434
[](MacroExprFactory& factory, Expr& target,
436-
absl::Span<Expr> args) -> absl::optional<Expr> {
435+
absl::Span<Expr> args) -> std::optional<Expr> {
437436
if (!target.has_ident_expr() && !target.has_select_expr() &&
438437
!target.has_list_expr() && !target.has_comprehension_expr() &&
439438
!target.has_call_expr()) {

‎extensions/math_ext_macros.cc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ bool IsValidArgType(const Expr &arg) {
6161
arg.kind());
6262
}
6363

64-
absl::optional<Expr> CheckInvalidArgs(MacroExprFactory &factory,
65-
absl::string_view macro,
66-
absl::Span<const Expr> arguments) {
64+
std::optional<Expr> CheckInvalidArgs(MacroExprFactory& factory,
65+
absl::string_view macro,
66+
absl::Span<const Expr> arguments) {
6767
for (const auto &argument : arguments) {
6868
if (!IsValidArgType(argument)) {
6969
return factory.ReportErrorAt(
@@ -96,8 +96,8 @@ bool IsListLiteralWithValidArgs(const Expr &arg) {
9696
std::vector<Macro> math_macros() {
9797
absl::StatusOr<Macro> least = Macro::ReceiverVarArg(
9898
kLeast,
99-
[](MacroExprFactory &factory, Expr &target,
100-
absl::Span<Expr> arguments) -> absl::optional<Expr> {
99+
[](MacroExprFactory& factory, Expr& target,
100+
absl::Span<Expr> arguments) -> std::optional<Expr> {
101101
if (!IsTargetNamespace(target)) {
102102
return absl::nullopt;
103103
}
@@ -140,8 +140,8 @@ std::vector<Macro> math_macros() {
140140
});
141141
absl::StatusOr<Macro> greatest = Macro::ReceiverVarArg(
142142
kGreatest,
143-
[](MacroExprFactory &factory, Expr &target,
144-
absl::Span<Expr> arguments) -> absl::optional<Expr> {
143+
[](MacroExprFactory& factory, Expr& target,
144+
absl::Span<Expr> arguments) -> std::optional<Expr> {
145145
if (!IsTargetNamespace(target)) {
146146
return absl::nullopt;
147147
}

‎extensions/math_ext_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ constexpr absl::string_view kMathMax = "math.@max";
8484
struct TestCase {
8585
absl::string_view operation;
8686
CelValue arg1;
87-
absl::optional<CelValue> arg2;
87+
std::optional<CelValue> arg2;
8888
CelValue result;
8989
};
9090

‎extensions/proto_ext.cc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ static constexpr char kProtoNamespace[] = "proto";
4040
static constexpr char kGetExt[] = "getExt";
4141
static constexpr char kHasExt[] = "hasExt";
4242

43-
absl::optional<std::string> ValidateExtensionIdentifier(const Expr& expr) {
43+
std::optional<std::string> ValidateExtensionIdentifier(const Expr& expr) {
4444
return absl::visit(
4545
absl::Overload(
46-
[](const SelectExpr& select_expr) -> absl::optional<std::string> {
46+
[](const SelectExpr& select_expr) -> std::optional<std::string> {
4747
if (select_expr.test_only()) {
4848
return absl::nullopt;
4949
}
@@ -53,16 +53,16 @@ absl::optional<std::string> ValidateExtensionIdentifier(const Expr& expr) {
5353
}
5454
return absl::StrCat(*op_name, ".", select_expr.field());
5555
},
56-
[](const IdentExpr& ident_expr) -> absl::optional<std::string> {
56+
[](const IdentExpr& ident_expr) -> std::optional<std::string> {
5757
return ident_expr.name();
5858
},
59-
[](const auto&) -> absl::optional<std::string> {
59+
[](const auto&) -> std::optional<std::string> {
6060
return absl::nullopt;
6161
}),
6262
expr.kind());
6363
}
6464

65-
absl::optional<std::string> GetExtensionFieldName(const Expr& expr) {
65+
std::optional<std::string> GetExtensionFieldName(const Expr& expr) {
6666
if (const auto* select_expr =
6767
expr.has_select_expr() ? &expr.select_expr() : nullptr;
6868
select_expr) {
@@ -93,7 +93,7 @@ std::vector<Macro> proto_macros() {
9393
absl::StatusOr<Macro> getExt = Macro::Receiver(
9494
kGetExt, 2,
9595
[](MacroExprFactory& factory, Expr& target,
96-
absl::Span<Expr> arguments) -> absl::optional<Expr> {
96+
absl::Span<Expr> arguments) -> std::optional<Expr> {
9797
if (!IsExtensionCall(target)) {
9898
return absl::nullopt;
9999
}
@@ -107,7 +107,7 @@ std::vector<Macro> proto_macros() {
107107
absl::StatusOr<Macro> hasExt = Macro::Receiver(
108108
kHasExt, 2,
109109
[](MacroExprFactory& factory, Expr& target,
110-
absl::Span<Expr> arguments) -> absl::optional<Expr> {
110+
absl::Span<Expr> arguments) -> std::optional<Expr> {
111111
if (!IsExtensionCall(target)) {
112112
return absl::nullopt;
113113
}

0 commit comments

Comments
 (0)