Cleanup references to ast_internal:: aliases to cel::Expr and related types.

PiperOrigin-RevId: 736136737

Author: jnthntatum

checker/internal/type_checker_impl.cc

@@ -179,7 +179,7 @@ absl::StatusOr<AstType> FlattenType(const Type& type) {
     case TypeKind::kError:
       return AstType(ast_internal::ErrorType());
     case TypeKind::kNull:
-      return AstType(ast_internal::NullValue());
+      return AstType(nullptr);
     case TypeKind::kBool:
       return AstType(ast_internal::PrimitiveType::kBool);
     case TypeKind::kInt:

checker/internal/type_checker_impl_test.cc

@@ -926,7 +926,7 @@ INSTANTIATE_TEST_SUITE_P(
     ::testing::Values(
         AstTypeConversionTestCase{
             .decl_type = NullType(),
-            .expected_type = AstType(ast_internal::NullValue()),
+            .expected_type = AstType(nullptr),
         },
         AstTypeConversionTestCase{
             .decl_type = DynType(),

eval/compiler/BUILD

@@ -27,10 +27,10 @@ cc_library(
         ":resolver",
         "//base:ast",
         "//base:data",
+        "//common:expr",
         "//common:native_type",
         "//common:value",
         "//common/ast:ast_impl",
-        "//common/ast:expr",
         "//eval/eval:direct_expression_step",
         "//eval/eval:evaluator_core",
         "//eval/eval:trace_step",
@@ -59,9 +59,9 @@ cc_test(
     deps = [
         ":flat_expr_builder_extensions",
         ":resolver",
+        "//common:expr",
         "//common:native_type",
         "//common:value",
-        "//common/ast:expr",
         "//eval/eval:const_value_step",
         "//eval/eval:direct_expression_step",
         "//eval/eval:evaluator_core",
@@ -101,6 +101,7 @@ cc_library(
         "//common:ast",
         "//common:ast_traverse",
         "//common:ast_visitor",
+        "//common:constant",
         "//common:expr",
         "//common:kind",
         "//common:type",
@@ -320,10 +321,11 @@ cc_library(
         ":resolver",
         "//base:builtins",
         "//base:data",
+        "//common:constant",
+        "//common:expr",
         "//common:kind",
         "//common:value",
         "//common/ast:ast_impl",
-        "//common/ast:expr",
         "//eval/eval:const_value_step",
         "//eval/eval:evaluator_core",
         "//internal:status_macros",
@@ -508,6 +510,7 @@ cc_library(
         ":flat_expr_builder_extensions",
         "//base:builtins",
         "//common:casting",
+        "//common:expr",
         "//common:native_type",
         "//common:value",
         "//common/ast:ast_impl",

eval/compiler/comprehension_vulnerability_check.cc

@@ -259,7 +259,7 @@ class ComprehensionVulnerabilityCheck : public ProgramOptimizer {
   }
 
   absl::Status OnPostVisit(PlannerContext& context,
-                           const cel::ast_internal::Expr& node) override {
+                           const cel::Expr& node) override {
     return absl::OkStatus();
   }
 };

eval/compiler/constant_folding.cc

@@ -27,7 +27,8 @@
 #include "base/builtins.h"
 #include "base/type_provider.h"
 #include "common/ast/ast_impl.h"
-#include "common/ast/expr.h"
+#include "common/constant.h"
+#include "common/expr.h"
 #include "common/kind.h"
 #include "common/value.h"
 #include "eval/compiler/flat_expr_builder_extensions.h"
@@ -45,15 +46,15 @@ namespace cel::runtime_internal {
 
 namespace {
 
+using ::cel::CallExpr;
+using ::cel::ComprehensionExpr;
+using ::cel::Constant;
+using ::cel::Expr;
+using ::cel::IdentExpr;
+using ::cel::ListExpr;
+using ::cel::SelectExpr;
+using ::cel::StructExpr;
 using ::cel::ast_internal::AstImpl;
-using ::cel::ast_internal::Call;
-using ::cel::ast_internal::Comprehension;
-using ::cel::ast_internal::Constant;
-using ::cel::ast_internal::CreateList;
-using ::cel::ast_internal::CreateStruct;
-using ::cel::ast_internal::Expr;
-using ::cel::ast_internal::Ident;
-using ::cel::ast_internal::Select;
 using ::cel::builtin::kAnd;
 using ::cel::builtin::kOr;
 using ::cel::builtin::kTernary;
@@ -117,13 +118,13 @@ absl::Status ConstantFoldingExtension::OnPreVisit(PlannerContext& context,
                                                   const Expr& node) {
   struct IsConstVisitor {
     IsConst operator()(const Constant&) { return IsConst::kConditional; }
-    IsConst operator()(const Ident&) { return IsConst::kNonConst; }
-    IsConst operator()(const Comprehension&) {
+    IsConst operator()(const IdentExpr&) { return IsConst::kNonConst; }
+    IsConst operator()(const ComprehensionExpr&) {
       // Not yet supported, need to identify whether range and
       // iter vars are compatible with const folding.
       return IsConst::kNonConst;
     }
-    IsConst operator()(const CreateStruct& create_struct) {
+    IsConst operator()(const StructExpr& create_struct) {
       return IsConst::kNonConst;
     }
     IsConst operator()(const cel::MapExpr& map_expr) {
@@ -136,7 +137,7 @@ absl::Status ConstantFoldingExtension::OnPreVisit(PlannerContext& context,
       }
       return IsConst::kConditional;
     }
-    IsConst operator()(const CreateList& create_list) {
+    IsConst operator()(const ListExpr& create_list) {
       if (create_list.elements().empty()) {
         // TODO: Don't fold for empty list to allow comprehension
         // list append optimization.
@@ -145,13 +146,13 @@ absl::Status ConstantFoldingExtension::OnPreVisit(PlannerContext& context,
       return IsConst::kConditional;
     }
 
-    IsConst operator()(const Select&) { return IsConst::kConditional; }
+    IsConst operator()(const SelectExpr&) { return IsConst::kConditional; }
 
     IsConst operator()(const cel::UnspecifiedExpr&) {
       return IsConst::kNonConst;
     }
 
-    IsConst operator()(const Call& call) {
+    IsConst operator()(const CallExpr& call) {
       // Short Circuiting operators not yet supported.
       if (call.function() == kAnd || call.function() == kOr ||
           call.function() == kTernary) {