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

PiperOrigin-RevId: 736136737

Author: jnthntatum

base/ast_internal/BUILD

@@ -64,8 +64,8 @@ cc_test(
     deps = [
         ":type_check_issue",
         ":validation_result",
-        "//base/ast_internal:ast_impl",
         "//common:source",
+        "//common/ast:ast_impl",
         "//internal:testing",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:status_matchers",
@@ -161,13 +161,13 @@ cc_test(
         ":type_checker_builder",
         ":type_checker_builder_factory",
         ":validation_result",
-        "//base/ast_internal:ast_impl",
-        "//base/ast_internal:expr",
         "//checker/internal:test_ast_helpers",
         "//common:ast",
         "//common:constant",
         "//common:decl",
         "//common:type",
+        "//common/ast:ast_impl",
+        "//common/ast:expr",
         "//internal:testing",
         "//internal:testing_descriptor_pool",
         "@com_google_absl//absl/status",
@@ -203,9 +203,9 @@ cc_test(
         ":type_checker",
         ":type_checker_builder",
         ":type_checker_builder_factory",
-        "//base/ast_internal:ast_impl",
-        "//base/ast_internal:expr",
         "//checker/internal:test_ast_helpers",
+        "//common/ast:ast_impl",
+        "//common/ast:expr",
         "//internal:testing",
         "//internal:testing_descriptor_pool",
         "@com_google_absl//absl/status:status_matchers",

checker/BUILD

@@ -38,8 +38,8 @@ cc_test(
     srcs = ["test_ast_helpers_test.cc"],
     deps = [
         ":test_ast_helpers",
-        "//base/ast_internal:ast_impl",
         "//common:ast",
+        "//common/ast:ast_impl",
         "//internal:testing",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:status_matchers",
@@ -119,8 +119,6 @@ cc_library(
         ":namespace_generator",
         ":type_check_env",
         ":type_inference_context",
-        "//base/ast_internal:ast_impl",
-        "//base/ast_internal:expr",
         "//checker:checker_options",
         "//checker:type_check_issue",
         "//checker:type_checker",
@@ -137,6 +135,8 @@ cc_library(
         "//common:source",
         "//common:type",
         "//common:type_kind",
+        "//common/ast:ast_impl",
+        "//common/ast:expr",
         "//internal:status_macros",
         "//parser:macro",
         "@com_google_absl//absl/algorithm:container",
@@ -162,8 +162,6 @@ cc_test(
         ":test_ast_helpers",
         ":type_check_env",
         ":type_checker_impl",
-        "//base/ast_internal:ast_impl",
-        "//base/ast_internal:expr",
         "//checker:checker_options",
         "//checker:type_check_issue",
         "//checker:validation_result",
@@ -172,6 +170,8 @@ cc_test(
         "//common:expr",
         "//common:source",
         "//common:type",
+        "//common/ast:ast_impl",
+        "//common/ast:expr",
         "//internal:status_macros",
         "//internal:testing",
         "//internal:testing_descriptor_pool",
@@ -195,12 +195,12 @@ cc_test(
     deps = [
         ":test_ast_helpers",
         ":type_checker_impl",
-        "//base/ast_internal:ast_impl",
-        "//base/ast_internal:expr",
         "//checker:type_checker",
         "//checker:validation_result",
         "//common:decl",
         "//common:type",
+        "//common/ast:ast_impl",
+        "//common/ast:expr",
         "//internal:testing",
         "//internal:testing_descriptor_pool",
         "@com_google_absl//absl/status",

checker/internal/BUILD

@@ -18,8 +18,8 @@
 
 #include "absl/status/status.h"
 #include "absl/status/status_matchers.h"
-#include "base/ast_internal/ast_impl.h"
 #include "common/ast.h"
+#include "common/ast/ast_impl.h"
 #include "internal/testing.h"
 
 namespace cel::checker_internal {

checker/internal/test_ast_helpers_test.cc

@@ -23,11 +23,11 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "base/ast_internal/ast_impl.h"
-#include "base/ast_internal/expr.h"
 #include "checker/internal/test_ast_helpers.h"
 #include "checker/type_checker.h"
 #include "checker/validation_result.h"
+#include "common/ast/ast_impl.h"
+#include "common/ast/expr.h"
 #include "common/decl.h"
 #include "common/type.h"
 #include "common/type_introspector.h"

checker/internal/type_checker_builder_impl_test.cc

@@ -32,15 +32,15 @@
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
-#include "base/ast_internal/ast_impl.h"
-#include "base/ast_internal/expr.h"
 #include "checker/checker_options.h"
 #include "checker/internal/namespace_generator.h"
 #include "checker/internal/type_check_env.h"
 #include "checker/internal/type_inference_context.h"
 #include "checker/type_check_issue.h"
 #include "checker/validation_result.h"
 #include "common/ast.h"
+#include "common/ast/ast_impl.h"
+#include "common/ast/expr.h"
 #include "common/ast_rewrite.h"
 #include "common/ast_traverse.h"
 #include "common/ast_visitor.h"
@@ -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.cc

@@ -29,14 +29,14 @@
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-#include "base/ast_internal/ast_impl.h"
-#include "base/ast_internal/expr.h"
 #include "checker/checker_options.h"
 #include "checker/internal/test_ast_helpers.h"
 #include "checker/internal/type_check_env.h"
 #include "checker/type_check_issue.h"
 #include "checker/validation_result.h"
 #include "common/ast.h"
+#include "common/ast/ast_impl.h"
+#include "common/ast/expr.h"
 #include "common/decl.h"
 #include "common/expr.h"
 #include "common/source.h"
@@ -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(),

checker/internal/type_checker_impl_test.cc

@@ -21,15 +21,15 @@
 
 #include "absl/status/status_matchers.h"
 #include "absl/strings/str_join.h"
-#include "base/ast_internal/ast_impl.h"
-#include "base/ast_internal/expr.h"
 #include "checker/checker_options.h"
 #include "checker/internal/test_ast_helpers.h"
 #include "checker/standard_library.h"
 #include "checker/type_check_issue.h"
 #include "checker/type_checker.h"
 #include "checker/type_checker_builder.h"
 #include "checker/type_checker_builder_factory.h"
+#include "common/ast/ast_impl.h"
+#include "common/ast/expr.h"
 #include "internal/testing.h"
 #include "internal/testing_descriptor_pool.h"
 

checker/optional_test.cc

@@ -20,15 +20,15 @@
 
 #include "absl/status/status.h"
 #include "absl/status/status_matchers.h"
-#include "base/ast_internal/ast_impl.h"
-#include "base/ast_internal/expr.h"
 #include "checker/checker_options.h"
 #include "checker/internal/test_ast_helpers.h"
 #include "checker/type_checker.h"
 #include "checker/type_checker_builder.h"
 #include "checker/type_checker_builder_factory.h"
 #include "checker/validation_result.h"
 #include "common/ast.h"
+#include "common/ast/ast_impl.h"
+#include "common/ast/expr.h"
 #include "common/constant.h"
 #include "common/decl.h"
 #include "common/type.h"

checker/standard_library_test.cc

@@ -19,8 +19,8 @@
 
 #include "absl/status/status.h"
 #include "absl/status/status_matchers.h"
-#include "base/ast_internal/ast_impl.h"
 #include "checker/type_check_issue.h"
+#include "common/ast/ast_impl.h"
 #include "common/source.h"
 #include "internal/testing.h"