From 8be1138be4a70ce96015adcf80b880e166325d2b Mon Sep 17 00:00:00 2001 From: CEL Dev Team Date: Mon, 18 May 2026 23:53:15 -0700 Subject: [PATCH] No public description PiperOrigin-RevId: 917642842 --- extensions/bindings_ext.cc | 2 +- extensions/comprehensions_v2_macros.cc | 49 +++++++++++++------------- extensions/lists_functions.cc | 15 ++++---- extensions/math_ext_macros.cc | 14 ++++---- extensions/math_ext_test.cc | 2 +- extensions/proto_ext.cc | 14 ++++---- 6 files changed, 47 insertions(+), 49 deletions(-) diff --git a/extensions/bindings_ext.cc b/extensions/bindings_ext.cc index c59f724bd..926fb002b 100644 --- a/extensions/bindings_ext.cc +++ b/extensions/bindings_ext.cc @@ -71,7 +71,7 @@ std::vector bindings_macros() { absl::StatusOr cel_bind = Macro::Receiver( kBind, 3, [](MacroExprFactory& factory, Expr& target, - absl::Span args) -> absl::optional { + absl::Span args) -> std::optional { if (!IsTargetNamespace(target)) { return absl::nullopt; } diff --git a/extensions/comprehensions_v2_macros.cc b/extensions/comprehensions_v2_macros.cc index 134fb80ff..f77df8546 100644 --- a/extensions/comprehensions_v2_macros.cc +++ b/extensions/comprehensions_v2_macros.cc @@ -38,8 +38,8 @@ namespace { using ::google::api::expr::common::CelOperator; -absl::optional ExpandAllMacro2(MacroExprFactory& factory, Expr& target, - absl::Span args) { +std::optional ExpandAllMacro2(MacroExprFactory& factory, Expr& target, + absl::Span args) { if (args.size() != 3) { return factory.ReportError("all() requires 3 arguments"); } @@ -84,8 +84,8 @@ Macro MakeAllMacro2() { return std::move(*status_or_macro); } -absl::optional ExpandExistsMacro2(MacroExprFactory& factory, Expr& target, - absl::Span args) { +std::optional ExpandExistsMacro2(MacroExprFactory& factory, Expr& target, + absl::Span args) { if (args.size() != 3) { return factory.ReportError("exists() requires 3 arguments"); } @@ -132,9 +132,8 @@ Macro MakeExistsMacro2() { return std::move(*status_or_macro); } -absl::optional ExpandExistsOneMacro2(MacroExprFactory& factory, - Expr& target, - absl::Span args) { +std::optional ExpandExistsOneMacro2(MacroExprFactory& factory, + Expr& target, absl::Span args) { if (args.size() != 3) { return factory.ReportError("existsOne() requires 3 arguments"); } @@ -184,9 +183,9 @@ Macro MakeExistsOneMacro2() { return std::move(*status_or_macro); } -absl::optional ExpandTransformList3Macro(MacroExprFactory& factory, - Expr& target, - absl::Span args) { +std::optional ExpandTransformList3Macro(MacroExprFactory& factory, + Expr& target, + absl::Span args) { if (args.size() != 3) { return factory.ReportError("transformList() requires 3 arguments"); } @@ -233,9 +232,9 @@ Macro MakeTransformList3Macro() { return std::move(*status_or_macro); } -absl::optional ExpandTransformList4Macro(MacroExprFactory& factory, - Expr& target, - absl::Span args) { +std::optional ExpandTransformList4Macro(MacroExprFactory& factory, + Expr& target, + absl::Span args) { if (args.size() != 4) { return factory.ReportError("transformList() requires 4 arguments"); } @@ -284,9 +283,9 @@ Macro MakeTransformList4Macro() { return std::move(*status_or_macro); } -absl::optional ExpandTransformMap3Macro(MacroExprFactory& factory, - Expr& target, - absl::Span args) { +std::optional ExpandTransformMap3Macro(MacroExprFactory& factory, + Expr& target, + absl::Span args) { if (args.size() != 3) { return factory.ReportError("transformMap() requires 3 arguments"); } @@ -332,9 +331,9 @@ Macro MakeTransformMap3Macro() { return std::move(*status_or_macro); } -absl::optional ExpandTransformMap4Macro(MacroExprFactory& factory, - Expr& target, - absl::Span args) { +std::optional ExpandTransformMap4Macro(MacroExprFactory& factory, + Expr& target, + absl::Span args) { if (args.size() != 4) { return factory.ReportError("transformMap() requires 4 arguments"); } @@ -382,9 +381,9 @@ Macro MakeTransformMap4Macro() { return std::move(*status_or_macro); } -absl::optional ExpandTransformMapEntry3Macro(MacroExprFactory& factory, - Expr& target, - absl::Span args) { +std::optional ExpandTransformMapEntry3Macro(MacroExprFactory& factory, + Expr& target, + absl::Span args) { if (args.size() != 3) { return factory.ReportError("transformMapEntry() requires 3 arguments"); } @@ -432,9 +431,9 @@ Macro MakeTransformMap3EntryMacro() { return std::move(*status_or_macro); } -absl::optional ExpandTransformMapEntry4Macro(MacroExprFactory& factory, - Expr& target, - absl::Span args) { +std::optional ExpandTransformMapEntry4Macro(MacroExprFactory& factory, + Expr& target, + absl::Span args) { if (args.size() != 4) { return factory.ReportError("transformMapEntry() requires 4 arguments"); } diff --git a/extensions/lists_functions.cc b/extensions/lists_functions.cc index 10bc717ed..bb9565d79 100644 --- a/extensions/lists_functions.cc +++ b/extensions/lists_functions.cc @@ -196,7 +196,7 @@ absl::Status ListFlattenImpl( for (int64_t i = 0; i < size; ++i) { CEL_ASSIGN_OR_RETURN(Value value, list.Get(i, descriptor_pool, message_factory, arena)); - if (absl::optional list_value = value.AsList(); + if (std::optional list_value = value.AsList(); list_value.has_value() && remaining_depth > 0) { CEL_RETURN_IF_ERROR(ListFlattenImpl(*list_value, remaining_depth - 1, descriptor_pool, message_factory, @@ -392,9 +392,8 @@ absl::StatusOr ListSortByAssociatedKeys( // Create an expression equivalent to: // target.map(varIdent, mapExpr) -absl::optional MakeMapComprehension(MacroExprFactory& factory, - Expr target, Expr var_ident, - Expr map_expr) { +std::optional MakeMapComprehension(MacroExprFactory& factory, Expr target, + Expr var_ident, Expr map_expr) { auto step = factory.NewCall( google::api::expr::common::CelOperator::ADD, factory.NewAccuIdent(), factory.NewList(factory.NewListElement(std::move(map_expr)))); @@ -407,9 +406,9 @@ absl::optional MakeMapComprehension(MacroExprFactory& factory, // Create an expression equivalent to: // cel.bind(varIdent, varExpr, call_expr) -absl::optional MakeBindComprehension(MacroExprFactory& factory, - Expr var_ident, Expr var_expr, - Expr call_expr) { +std::optional MakeBindComprehension(MacroExprFactory& factory, + Expr var_ident, Expr var_expr, + Expr call_expr) { auto var_name = var_ident.ident_expr().name(); return factory.NewComprehension( "#unused", factory.NewList(), std::move(var_name), std::move(var_expr), @@ -433,7 +432,7 @@ Macro ListSortByMacro() { absl::StatusOr sortby_macro = Macro::Receiver( "sortBy", 2, [](MacroExprFactory& factory, Expr& target, - absl::Span args) -> absl::optional { + absl::Span args) -> std::optional { if (!target.has_ident_expr() && !target.has_select_expr() && !target.has_list_expr() && !target.has_comprehension_expr() && !target.has_call_expr()) { diff --git a/extensions/math_ext_macros.cc b/extensions/math_ext_macros.cc index a66720a60..ba75367a2 100644 --- a/extensions/math_ext_macros.cc +++ b/extensions/math_ext_macros.cc @@ -61,9 +61,9 @@ bool IsValidArgType(const Expr &arg) { arg.kind()); } -absl::optional CheckInvalidArgs(MacroExprFactory &factory, - absl::string_view macro, - absl::Span arguments) { +std::optional CheckInvalidArgs(MacroExprFactory& factory, + absl::string_view macro, + absl::Span arguments) { for (const auto &argument : arguments) { if (!IsValidArgType(argument)) { return factory.ReportErrorAt( @@ -96,8 +96,8 @@ bool IsListLiteralWithValidArgs(const Expr &arg) { std::vector math_macros() { absl::StatusOr least = Macro::ReceiverVarArg( kLeast, - [](MacroExprFactory &factory, Expr &target, - absl::Span arguments) -> absl::optional { + [](MacroExprFactory& factory, Expr& target, + absl::Span arguments) -> std::optional { if (!IsTargetNamespace(target)) { return absl::nullopt; } @@ -140,8 +140,8 @@ std::vector math_macros() { }); absl::StatusOr greatest = Macro::ReceiverVarArg( kGreatest, - [](MacroExprFactory &factory, Expr &target, - absl::Span arguments) -> absl::optional { + [](MacroExprFactory& factory, Expr& target, + absl::Span arguments) -> std::optional { if (!IsTargetNamespace(target)) { return absl::nullopt; } diff --git a/extensions/math_ext_test.cc b/extensions/math_ext_test.cc index 72605648f..aa5f2fd4d 100644 --- a/extensions/math_ext_test.cc +++ b/extensions/math_ext_test.cc @@ -84,7 +84,7 @@ constexpr absl::string_view kMathMax = "math.@max"; struct TestCase { absl::string_view operation; CelValue arg1; - absl::optional arg2; + std::optional arg2; CelValue result; }; diff --git a/extensions/proto_ext.cc b/extensions/proto_ext.cc index f38039002..6a97cfcc1 100644 --- a/extensions/proto_ext.cc +++ b/extensions/proto_ext.cc @@ -40,10 +40,10 @@ static constexpr char kProtoNamespace[] = "proto"; static constexpr char kGetExt[] = "getExt"; static constexpr char kHasExt[] = "hasExt"; -absl::optional ValidateExtensionIdentifier(const Expr& expr) { +std::optional ValidateExtensionIdentifier(const Expr& expr) { return absl::visit( absl::Overload( - [](const SelectExpr& select_expr) -> absl::optional { + [](const SelectExpr& select_expr) -> std::optional { if (select_expr.test_only()) { return absl::nullopt; } @@ -53,16 +53,16 @@ absl::optional ValidateExtensionIdentifier(const Expr& expr) { } return absl::StrCat(*op_name, ".", select_expr.field()); }, - [](const IdentExpr& ident_expr) -> absl::optional { + [](const IdentExpr& ident_expr) -> std::optional { return ident_expr.name(); }, - [](const auto&) -> absl::optional { + [](const auto&) -> std::optional { return absl::nullopt; }), expr.kind()); } -absl::optional GetExtensionFieldName(const Expr& expr) { +std::optional GetExtensionFieldName(const Expr& expr) { if (const auto* select_expr = expr.has_select_expr() ? &expr.select_expr() : nullptr; select_expr) { @@ -93,7 +93,7 @@ std::vector proto_macros() { absl::StatusOr getExt = Macro::Receiver( kGetExt, 2, [](MacroExprFactory& factory, Expr& target, - absl::Span arguments) -> absl::optional { + absl::Span arguments) -> std::optional { if (!IsExtensionCall(target)) { return absl::nullopt; } @@ -107,7 +107,7 @@ std::vector proto_macros() { absl::StatusOr hasExt = Macro::Receiver( kHasExt, 2, [](MacroExprFactory& factory, Expr& target, - absl::Span arguments) -> absl::optional { + absl::Span arguments) -> std::optional { if (!IsExtensionCall(target)) { return absl::nullopt; }