Skip to content

No public description #2000

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

Closed
copybara-service wants to merge 1 commit into from
Closed

No public description #2000

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: 1 addition & 1 deletion extensions/bindings_ext.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ std::vector<Macro> bindings_macros() {
absl::StatusOr<Macro> cel_bind = Macro::Receiver(
kBind, 3,
[](MacroExprFactory& factory, Expr& target,
absl::Span<Expr> args) -> absl::optional<Expr> {
absl::Span<Expr> args) -> std::optional<Expr> {
if (!IsTargetNamespace(target)) {
return absl::nullopt;
}
Expand Down
49 changes: 24 additions & 25 deletions extensions/comprehensions_v2_macros.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ namespace {

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

absl::optional<Expr> ExpandAllMacro2(MacroExprFactory& factory, Expr& target,
absl::Span<Expr> args) {
std::optional<Expr> ExpandAllMacro2(MacroExprFactory& factory, Expr& target,
absl::Span<Expr> args) {
if (args.size() != 3) {
return factory.ReportError("all() requires 3 arguments");
}
Expand Down Expand Up @@ -84,8 +84,8 @@ Macro MakeAllMacro2() {
return std::move(*status_or_macro);
}

absl::optional<Expr> ExpandExistsMacro2(MacroExprFactory& factory, Expr& target,
absl::Span<Expr> args) {
std::optional<Expr> ExpandExistsMacro2(MacroExprFactory& factory, Expr& target,
absl::Span<Expr> args) {
if (args.size() != 3) {
return factory.ReportError("exists() requires 3 arguments");
}
Expand Down Expand Up @@ -132,9 +132,8 @@ Macro MakeExistsMacro2() {
return std::move(*status_or_macro);
}

absl::optional<Expr> ExpandExistsOneMacro2(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
std::optional<Expr> ExpandExistsOneMacro2(MacroExprFactory& factory,
Expr& target, absl::Span<Expr> args) {
if (args.size() != 3) {
return factory.ReportError("existsOne() requires 3 arguments");
}
Expand Down Expand Up @@ -184,9 +183,9 @@ Macro MakeExistsOneMacro2() {
return std::move(*status_or_macro);
}

absl::optional<Expr> ExpandTransformList3Macro(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
std::optional<Expr> ExpandTransformList3Macro(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
if (args.size() != 3) {
return factory.ReportError("transformList() requires 3 arguments");
}
Expand Down Expand Up @@ -233,9 +232,9 @@ Macro MakeTransformList3Macro() {
return std::move(*status_or_macro);
}

absl::optional<Expr> ExpandTransformList4Macro(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
std::optional<Expr> ExpandTransformList4Macro(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
if (args.size() != 4) {
return factory.ReportError("transformList() requires 4 arguments");
}
Expand Down Expand Up @@ -284,9 +283,9 @@ Macro MakeTransformList4Macro() {
return std::move(*status_or_macro);
}

absl::optional<Expr> ExpandTransformMap3Macro(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
std::optional<Expr> ExpandTransformMap3Macro(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
if (args.size() != 3) {
return factory.ReportError("transformMap() requires 3 arguments");
}
Expand Down Expand Up @@ -332,9 +331,9 @@ Macro MakeTransformMap3Macro() {
return std::move(*status_or_macro);
}

absl::optional<Expr> ExpandTransformMap4Macro(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
std::optional<Expr> ExpandTransformMap4Macro(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
if (args.size() != 4) {
return factory.ReportError("transformMap() requires 4 arguments");
}
Expand Down Expand Up @@ -382,9 +381,9 @@ Macro MakeTransformMap4Macro() {
return std::move(*status_or_macro);
}

absl::optional<Expr> ExpandTransformMapEntry3Macro(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
std::optional<Expr> ExpandTransformMapEntry3Macro(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
if (args.size() != 3) {
return factory.ReportError("transformMapEntry() requires 3 arguments");
}
Expand Down Expand Up @@ -432,9 +431,9 @@ Macro MakeTransformMap3EntryMacro() {
return std::move(*status_or_macro);
}

absl::optional<Expr> ExpandTransformMapEntry4Macro(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
std::optional<Expr> ExpandTransformMapEntry4Macro(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
if (args.size() != 4) {
return factory.ReportError("transformMapEntry() requires 4 arguments");
}
Expand Down
15 changes: 7 additions & 8 deletions extensions/lists_functions.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<ListValue> list_value = value.AsList();
if (std::optional<ListValue> 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,
Expand Down Expand Up @@ -392,9 +392,8 @@ absl::StatusOr<Value> ListSortByAssociatedKeys(

// Create an expression equivalent to:
// target.map(varIdent, mapExpr)
absl::optional<Expr> MakeMapComprehension(MacroExprFactory& factory,
Expr target, Expr var_ident,
Expr map_expr) {
std::optional<Expr> 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))));
Expand All @@ -407,9 +406,9 @@ absl::optional<Expr> MakeMapComprehension(MacroExprFactory& factory,

// Create an expression equivalent to:
// cel.bind(varIdent, varExpr, call_expr)
absl::optional<Expr> MakeBindComprehension(MacroExprFactory& factory,
Expr var_ident, Expr var_expr,
Expr call_expr) {
std::optional<Expr> 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),
Expand All @@ -433,7 +432,7 @@ Macro ListSortByMacro() {
absl::StatusOr<Macro> sortby_macro = Macro::Receiver(
"sortBy", 2,
[](MacroExprFactory& factory, Expr& target,
absl::Span<Expr> args) -> absl::optional<Expr> {
absl::Span<Expr> args) -> std::optional<Expr> {
if (!target.has_ident_expr() && !target.has_select_expr() &&
!target.has_list_expr() && !target.has_comprehension_expr() &&
!target.has_call_expr()) {
Expand Down
14 changes: 7 additions & 7 deletions extensions/math_ext_macros.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ bool IsValidArgType(const Expr &arg) {
arg.kind());
}

absl::optional<Expr> CheckInvalidArgs(MacroExprFactory &factory,
absl::string_view macro,
absl::Span<const Expr> arguments) {
std::optional<Expr> CheckInvalidArgs(MacroExprFactory& factory,
absl::string_view macro,
absl::Span<const Expr> arguments) {
for (const auto &argument : arguments) {
if (!IsValidArgType(argument)) {
return factory.ReportErrorAt(
Expand Down Expand Up @@ -96,8 +96,8 @@ bool IsListLiteralWithValidArgs(const Expr &arg) {
std::vector<Macro> math_macros() {
absl::StatusOr<Macro> least = Macro::ReceiverVarArg(
kLeast,
[](MacroExprFactory &factory, Expr &target,
absl::Span<Expr> arguments) -> absl::optional<Expr> {
[](MacroExprFactory& factory, Expr& target,
absl::Span<Expr> arguments) -> std::optional<Expr> {
if (!IsTargetNamespace(target)) {
return absl::nullopt;
}
Expand Down Expand Up @@ -140,8 +140,8 @@ std::vector<Macro> math_macros() {
});
absl::StatusOr<Macro> greatest = Macro::ReceiverVarArg(
kGreatest,
[](MacroExprFactory &factory, Expr &target,
absl::Span<Expr> arguments) -> absl::optional<Expr> {
[](MacroExprFactory& factory, Expr& target,
absl::Span<Expr> arguments) -> std::optional<Expr> {
if (!IsTargetNamespace(target)) {
return absl::nullopt;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/math_ext_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ constexpr absl::string_view kMathMax = "math.@max";
struct TestCase {
absl::string_view operation;
CelValue arg1;
absl::optional<CelValue> arg2;
std::optional<CelValue> arg2;
CelValue result;
};

Expand Down
14 changes: 7 additions & 7 deletions extensions/proto_ext.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ static constexpr char kProtoNamespace[] = "proto";
static constexpr char kGetExt[] = "getExt";
static constexpr char kHasExt[] = "hasExt";

absl::optional<std::string> ValidateExtensionIdentifier(const Expr& expr) {
std::optional<std::string> ValidateExtensionIdentifier(const Expr& expr) {
return absl::visit(
absl::Overload(
[](const SelectExpr& select_expr) -> absl::optional<std::string> {
[](const SelectExpr& select_expr) -> std::optional<std::string> {
if (select_expr.test_only()) {
return absl::nullopt;
}
Expand All @@ -53,16 +53,16 @@ absl::optional<std::string> ValidateExtensionIdentifier(const Expr& expr) {
}
return absl::StrCat(*op_name, ".", select_expr.field());
},
[](const IdentExpr& ident_expr) -> absl::optional<std::string> {
[](const IdentExpr& ident_expr) -> std::optional<std::string> {
return ident_expr.name();
},
[](const auto&) -> absl::optional<std::string> {
[](const auto&) -> std::optional<std::string> {
return absl::nullopt;
}),
expr.kind());
}

absl::optional<std::string> GetExtensionFieldName(const Expr& expr) {
std::optional<std::string> GetExtensionFieldName(const Expr& expr) {
if (const auto* select_expr =
expr.has_select_expr() ? &expr.select_expr() : nullptr;
select_expr) {
Expand Down Expand Up @@ -93,7 +93,7 @@ std::vector<Macro> proto_macros() {
absl::StatusOr<Macro> getExt = Macro::Receiver(
kGetExt, 2,
[](MacroExprFactory& factory, Expr& target,
absl::Span<Expr> arguments) -> absl::optional<Expr> {
absl::Span<Expr> arguments) -> std::optional<Expr> {
if (!IsExtensionCall(target)) {
return absl::nullopt;
}
Expand All @@ -107,7 +107,7 @@ std::vector<Macro> proto_macros() {
absl::StatusOr<Macro> hasExt = Macro::Receiver(
kHasExt, 2,
[](MacroExprFactory& factory, Expr& target,
absl::Span<Expr> arguments) -> absl::optional<Expr> {
absl::Span<Expr> arguments) -> std::optional<Expr> {
if (!IsExtensionCall(target)) {
return absl::nullopt;
}
Expand Down