Skip to content

Clean up references to old aliases for AST metadata types. #1683

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
Sep 4, 2025
+522 −633
Merged

Clean up references to old aliases for AST metadata types. #1683

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
3 changes: 1 addition & 2 deletions checker/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ cc_test(
"//common:constant",
"//common:decl",
"//common:type",
"//common/ast:expr",
"//internal:testing",
"//internal:testing_descriptor_pool",
"@com_google_absl//absl/status",
Expand Down Expand Up @@ -208,7 +207,7 @@ cc_test(
":type_checker_builder",
":type_checker_builder_factory",
"//checker/internal:test_ast_helpers",
"//common/ast:expr",
"//common:ast",
"//internal:testing",
"//internal:testing_descriptor_pool",
"@com_google_absl//absl/status:status_matchers",
Expand Down
2 changes: 0 additions & 2 deletions checker/internal/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ cc_library(
"//common:source",
"//common:type",
"//common:type_kind",
"//common/ast:expr",
"//internal:lexis",
"//internal:status_macros",
"//parser:macro",
Expand Down Expand Up @@ -174,7 +173,6 @@ cc_test(
"//common:expr",
"//common:source",
"//common:type",
"//common/ast:expr",
"//internal:status_macros",
"//internal:testing",
"//internal:testing_descriptor_pool",
Expand Down
63 changes: 27 additions & 36 deletions checker/internal/type_checker_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
#include "checker/type_check_issue.h"
#include "checker/validation_result.h"
#include "common/ast.h"
#include "common/ast/expr.h"
#include "common/ast_rewrite.h"
#include "common/ast_traverse.h"
#include "common/ast_visitor.h"
Expand All @@ -57,7 +56,7 @@
namespace cel::checker_internal {
namespace {

using AstType = cel::ast_internal::Type;
using AstType = cel::TypeSpec;
using Severity = TypeCheckIssue::Severity;

constexpr const char kOptionalSelect[] = "_?._";
Expand Down Expand Up @@ -134,28 +133,26 @@ absl::StatusOr<AstType> FlattenAbstractType(const OpaqueType& type) {
parameter_types.push_back(std::move(param_type));
}

return AstType(ast_internal::AbstractType(std::string(type.name()),
std::move(parameter_types)));
return AstType(
AbstractType(std::string(type.name()), std::move(parameter_types)));
}

absl::StatusOr<AstType> FlattenMapType(const MapType& type) {
CEL_ASSIGN_OR_RETURN(auto key, FlattenType(type.key()));
CEL_ASSIGN_OR_RETURN(auto value, FlattenType(type.value()));

return AstType(
ast_internal::MapType(std::make_unique<AstType>(std::move(key)),
std::make_unique<AstType>(std::move(value))));
return AstType(MapTypeSpec(std::make_unique<AstType>(std::move(key)),
std::make_unique<AstType>(std::move(value))));
}

absl::StatusOr<AstType> FlattenListType(const ListType& type) {
CEL_ASSIGN_OR_RETURN(auto elem, FlattenType(type.element()));

return AstType(
ast_internal::ListType(std::make_unique<AstType>(std::move(elem))));
return AstType(ListTypeSpec(std::make_unique<AstType>(std::move(elem))));
}

absl::StatusOr<AstType> FlattenMessageType(const StructType& type) {
return AstType(ast_internal::MessageType(std::string(type.name())));
return AstType(MessageTypeSpec(std::string(type.name())));
}

absl::StatusOr<AstType> FlattenTypeType(const TypeType& type) {
Expand All @@ -173,29 +170,29 @@ absl::StatusOr<AstType> FlattenTypeType(const TypeType& type) {
absl::StatusOr<AstType> FlattenType(const Type& type) {
switch (type.kind()) {
case TypeKind::kDyn:
return AstType(ast_internal::DynamicType());
return AstType(DynTypeSpec());
case TypeKind::kError:
return AstType(ast_internal::ErrorType());
return AstType(ErrorTypeSpec());
case TypeKind::kNull:
return AstType(ast_internal::NullType());
return AstType(NullTypeSpec());
case TypeKind::kBool:
return AstType(ast_internal::PrimitiveType::kBool);
return AstType(PrimitiveType::kBool);
case TypeKind::kInt:
return AstType(ast_internal::PrimitiveType::kInt64);
return AstType(PrimitiveType::kInt64);
case TypeKind::kEnum:
return AstType(ast_internal::PrimitiveType::kInt64);
return AstType(PrimitiveType::kInt64);
case TypeKind::kUint:
return AstType(ast_internal::PrimitiveType::kUint64);
return AstType(PrimitiveType::kUint64);
case TypeKind::kDouble:
return AstType(ast_internal::PrimitiveType::kDouble);
return AstType(PrimitiveType::kDouble);
case TypeKind::kString:
return AstType(ast_internal::PrimitiveType::kString);
return AstType(PrimitiveType::kString);
case TypeKind::kBytes:
return AstType(ast_internal::PrimitiveType::kBytes);
return AstType(PrimitiveType::kBytes);
case TypeKind::kDuration:
return AstType(ast_internal::WellKnownType::kDuration);
return AstType(WellKnownTypeSpec::kDuration);
case TypeKind::kTimestamp:
return AstType(ast_internal::WellKnownType::kTimestamp);
return AstType(WellKnownTypeSpec::kTimestamp);
case TypeKind::kStruct:
return FlattenMessageType(type.GetStruct());
case TypeKind::kList:
Expand All @@ -205,30 +202,24 @@ absl::StatusOr<AstType> FlattenType(const Type& type) {
case TypeKind::kOpaque:
return FlattenAbstractType(type.GetOpaque());
case TypeKind::kBoolWrapper:
return AstType(ast_internal::PrimitiveTypeWrapper(
ast_internal::PrimitiveType::kBool));
return AstType(PrimitiveTypeWrapper(PrimitiveType::kBool));
case TypeKind::kIntWrapper:
return AstType(ast_internal::PrimitiveTypeWrapper(
ast_internal::PrimitiveType::kInt64));
return AstType(PrimitiveTypeWrapper(PrimitiveType::kInt64));
case TypeKind::kUintWrapper:
return AstType(ast_internal::PrimitiveTypeWrapper(
ast_internal::PrimitiveType::kUint64));
return AstType(PrimitiveTypeWrapper(PrimitiveType::kUint64));
case TypeKind::kDoubleWrapper:
return AstType(ast_internal::PrimitiveTypeWrapper(
ast_internal::PrimitiveType::kDouble));
return AstType(PrimitiveTypeWrapper(PrimitiveType::kDouble));
case TypeKind::kStringWrapper:
return AstType(ast_internal::PrimitiveTypeWrapper(
ast_internal::PrimitiveType::kString));
return AstType(PrimitiveTypeWrapper(PrimitiveType::kString));
case TypeKind::kBytesWrapper:
return AstType(ast_internal::PrimitiveTypeWrapper(
ast_internal::PrimitiveType::kBytes));
return AstType(PrimitiveTypeWrapper(PrimitiveType::kBytes));
case TypeKind::kTypeParam:
// Convert any remaining free type params to dyn.
return AstType(ast_internal::DynamicType());
return AstType(DynTypeSpec());
case TypeKind::kType:
return FlattenTypeType(type.GetType());
case TypeKind::kAny:
return AstType(ast_internal::WellKnownType::kAny);
return AstType(WellKnownTypeSpec::kAny);
default:
return absl::InternalError(
absl::StrCat("unsupported type encountered making AST serializable: ",
Expand Down
Loading