Skip to content

Make CompilerBuilder::Build() non-destructive. #1423

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

Merged
merged 1 commit into from
Apr 14, 2025
Merged

Make CompilerBuilder::Build() non-destructive. #1423

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
50 changes: 50 additions & 0 deletions checker/type_checker_builder_factory_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,56 @@ TEST(TypeCheckerBuilderTest, AddComplexType) {
EXPECT_TRUE(result.IsValid());
}

TEST(TypeCheckerBuilderTest, TypeCheckersIndependent) {
ASSERT_OK_AND_ASSIGN(
std::unique_ptr<TypeCheckerBuilder> builder,
CreateTypeCheckerBuilder(GetSharedTestingDescriptorPool()));

MapType map_type(builder->arena(), StringType(), IntType());

ASSERT_THAT(builder->AddVariable(MakeVariableDecl("m", map_type)), IsOk());
ASSERT_OK_AND_ASSIGN(
FunctionDecl fn,
MakeFunctionDecl(
"foo", MakeOverloadDecl("foo", IntType(), IntType(), IntType())));
ASSERT_THAT(builder->AddFunction(std::move(fn)), IsOk());

ASSERT_OK_AND_ASSIGN(auto checker1, builder->Build());

ASSERT_THAT(builder->AddVariable(MakeVariableDecl("ns.m2", map_type)),
IsOk());
builder->set_container("ns");
ASSERT_OK_AND_ASSIGN(auto checker2, builder->Build());
// Test for lifetime issues between separate type checker instances from the
// same builder.
builder.reset();

{
ASSERT_OK_AND_ASSIGN(auto ast1, MakeTestParsedAst("foo(m.bar, m.bar)"));
ASSERT_OK_AND_ASSIGN(auto ast2, MakeTestParsedAst("foo(m.bar, m2.bar)"));

ASSERT_OK_AND_ASSIGN(ValidationResult result,
checker1->Check(std::move(ast1)));
EXPECT_TRUE(result.IsValid());
ASSERT_OK_AND_ASSIGN(ValidationResult result2,
checker1->Check(std::move(ast2)));
EXPECT_FALSE(result2.IsValid());
}
checker1.reset();

{
ASSERT_OK_AND_ASSIGN(auto ast1, MakeTestParsedAst("foo(m.bar, m.bar)"));
ASSERT_OK_AND_ASSIGN(auto ast2, MakeTestParsedAst("foo(m.bar, m2.bar)"));

ASSERT_OK_AND_ASSIGN(ValidationResult result,
checker2->Check(std::move(ast1)));
EXPECT_TRUE(result.IsValid());
ASSERT_OK_AND_ASSIGN(ValidationResult result2,
checker2->Check(std::move(ast2)));
EXPECT_TRUE(result2.IsValid());
}
}

TEST(TypeCheckerBuilderTest, AddVariableRedeclaredError) {
ASSERT_OK_AND_ASSIGN(
std::unique_ptr<TypeCheckerBuilder> builder,
Expand Down
2 changes: 1 addition & 1 deletion compiler/compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class CompilerBuilder {
virtual TypeCheckerBuilder& GetCheckerBuilder() = 0;
virtual ParserBuilder& GetParserBuilder() = 0;

virtual absl::StatusOr<std::unique_ptr<Compiler>> Build() && = 0;
virtual absl::StatusOr<std::unique_ptr<Compiler>> Build() = 0;
};

// Interface for CEL Compiler objects.
Expand Down
7 changes: 3 additions & 4 deletions compiler/compiler_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,12 @@ class CompilerBuilderImpl : public CompilerBuilder {
return *type_checker_builder_;
}

absl::StatusOr<std::unique_ptr<Compiler>> Build() && override {
absl::StatusOr<std::unique_ptr<Compiler>> Build() override {
for (const auto& library : parser_libraries_) {
CEL_RETURN_IF_ERROR(library(*parser_builder_));
}
CEL_ASSIGN_OR_RETURN(auto parser, std::move(*parser_builder_).Build());
CEL_ASSIGN_OR_RETURN(auto type_checker,
std::move(*type_checker_builder_).Build());
CEL_ASSIGN_OR_RETURN(auto parser, parser_builder_->Build());
CEL_ASSIGN_OR_RETURN(auto type_checker, type_checker_builder_->Build());
return std::make_unique<CompilerImpl>(std::move(type_checker),
std::move(parser));
}
Expand Down
12 changes: 6 additions & 6 deletions compiler/compiler_factory_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ TEST(CompilerFactoryTest, Works) {
NewCompilerBuilder(cel::internal::GetSharedTestingDescriptorPool()));

ASSERT_THAT(builder->AddLibrary(StandardCheckerLibrary()), IsOk());
ASSERT_OK_AND_ASSIGN(auto compiler, std::move(*builder).Build());
ASSERT_OK_AND_ASSIGN(auto compiler, builder->Build());

ASSERT_OK_AND_ASSIGN(
ValidationResult result,
Expand Down Expand Up @@ -134,7 +134,7 @@ TEST(CompilerFactoryTest, ParserLibrary) {
MakeVariableDecl("a", MapType())),
IsOk());

ASSERT_OK_AND_ASSIGN(auto compiler, std::move(*builder).Build());
ASSERT_OK_AND_ASSIGN(auto compiler, builder->Build());

ASSERT_THAT(compiler->Compile("has(a.b)"), IsOk());

Expand All @@ -160,7 +160,7 @@ TEST(CompilerFactoryTest, ParserOptions) {
MakeVariableDecl("a", MapType())),
IsOk());

ASSERT_OK_AND_ASSIGN(auto compiler, std::move(*builder).Build());
ASSERT_OK_AND_ASSIGN(auto compiler, builder->Build());

ASSERT_THAT(compiler->Compile("a.?b.orValue('foo')"), IsOk());
}
Expand All @@ -170,7 +170,7 @@ TEST(CompilerFactoryTest, GetParser) {
auto builder,
NewCompilerBuilder(cel::internal::GetSharedTestingDescriptorPool()));

ASSERT_OK_AND_ASSIGN(auto compiler, std::move(*builder).Build());
ASSERT_OK_AND_ASSIGN(auto compiler, builder->Build());

const cel::Parser& parser = compiler->GetParser();

Expand All @@ -197,7 +197,7 @@ TEST(CompilerFactoryTest, GetTypeChecker) {
s.Update(builder->GetCheckerBuilder().AddFunction(std::move(or_decl)));

ASSERT_THAT(s, IsOk());
ASSERT_OK_AND_ASSIGN(auto compiler, std::move(*builder).Build());
ASSERT_OK_AND_ASSIGN(auto compiler, builder->Build());

const cel::Parser& parser = compiler->GetParser();

Expand Down Expand Up @@ -227,7 +227,7 @@ TEST(CompilerFactoryTest, DisableStandardMacros) {
MakeVariableDecl("a", MapType())),
IsOk());

ASSERT_OK_AND_ASSIGN(auto compiler, std::move(*builder).Build());
ASSERT_OK_AND_ASSIGN(auto compiler, builder->Build());

ASSERT_OK_AND_ASSIGN(ValidationResult result, compiler->Compile("a.b"));

Expand Down
2 changes: 1 addition & 1 deletion parser/parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1738,7 +1738,7 @@ class ParserBuilderImpl : public cel::ParserBuilder {
return absl::OkStatus();
}

absl::StatusOr<std::unique_ptr<cel::Parser>> Build() && override {
absl::StatusOr<std::unique_ptr<cel::Parser>> Build() override {
cel::MacroRegistry macro_registry;

if (!options_.disable_standard_macros) {
Expand Down
2 changes: 1 addition & 1 deletion parser/parser_interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class ParserBuilder {
virtual absl::Status AddMacro(const cel::Macro& macro) = 0;

// Builds a new parser instance, may error if incompatible macros are added.
virtual absl::StatusOr<std::unique_ptr<Parser>> Build() && = 0;
virtual absl::StatusOr<std::unique_ptr<Parser>> Build() = 0;
};

// Interface for stateful CEL parser objects for use with a `Compiler`
Expand Down