Skip to content
Open
Changes from all commits
Commits
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
22 changes: 10 additions & 12 deletions testutil/test_macros.cc
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ bool IsCelNamespace(const Expr& target) {
return target.has_ident_expr() && target.ident_expr().name() == "cel";
}

absl::optional<Expr> CelBlockMacroExpander(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
std::optional<Expr> CelBlockMacroExpander(MacroExprFactory& factory,
Expr& target, absl::Span<Expr> args) {
if (!IsCelNamespace(target)) {
return absl::nullopt;
}
Expand All @@ -51,9 +50,8 @@ absl::optional<Expr> CelBlockMacroExpander(MacroExprFactory& factory,
return factory.NewCall("cel.@block", args);
}

absl::optional<Expr> CelIndexMacroExpander(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
std::optional<Expr> CelIndexMacroExpander(MacroExprFactory& factory,
Expr& target, absl::Span<Expr> args) {
if (!IsCelNamespace(target)) {
return absl::nullopt;
}
Expand All @@ -70,9 +68,9 @@ absl::optional<Expr> CelIndexMacroExpander(MacroExprFactory& factory,
return factory.NewIdent(absl::StrCat("@index", index));
}

absl::optional<Expr> CelIterVarMacroExpander(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
std::optional<Expr> CelIterVarMacroExpander(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
if (!IsCelNamespace(target)) {
return absl::nullopt;
}
Expand All @@ -94,9 +92,9 @@ absl::optional<Expr> CelIterVarMacroExpander(MacroExprFactory& factory,
unique_arg.const_expr().int_value()));
}

absl::optional<Expr> CelAccuVarMacroExpander(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
std::optional<Expr> CelAccuVarMacroExpander(MacroExprFactory& factory,
Expr& target,
absl::Span<Expr> args) {
if (!IsCelNamespace(target)) {
return absl::nullopt;
}
Expand Down