Migrate includes from base/kind.h to common/kind.h

PiperOrigin-RevId: 720208119

Author: jnthntatum

eval/compiler/BUILD

@@ -317,9 +317,9 @@ cc_library(
         ":resolver",
         "//base:builtins",
         "//base:data",
-        "//base:kind",
         "//base/ast_internal:ast_impl",
         "//base/ast_internal:expr",
+        "//common:kind",
         "//common:memory",
         "//common:value",
         "//eval/eval:const_value_step",
@@ -388,10 +388,10 @@ cc_library(
         ":resolver",
         "//base:ast",
         "//base:builtins",
-        "//base:kind",
         "//base/ast_internal:ast_impl",
         "//base/ast_internal:expr",
         "//common:ast_rewrite",
+        "//common:kind",
         "//runtime:runtime_issue",
         "//runtime/internal:issue_collector",
         "@com_google_absl//absl/container:flat_hash_map",
@@ -408,7 +408,7 @@ cc_library(
     srcs = ["resolver.cc"],
     hdrs = ["resolver.h"],
     deps = [
-        "//base:kind",
+        "//common:kind",
         "//common:type",
         "//common:value",
         "//internal:status_macros",

eval/compiler/constant_folding.cc

@@ -27,8 +27,8 @@
 #include "base/ast_internal/ast_impl.h"
 #include "base/ast_internal/expr.h"
 #include "base/builtins.h"
-#include "base/kind.h"
 #include "base/type_provider.h"
+#include "common/kind.h"
 #include "common/memory.h"
 #include "common/value.h"
 #include "common/value_manager.h"

eval/compiler/qualified_reference_resolver.cc

@@ -31,8 +31,8 @@
 #include "base/ast_internal/ast_impl.h"
 #include "base/ast_internal/expr.h"
 #include "base/builtins.h"
-#include "base/kind.h"
 #include "common/ast_rewrite.h"
+#include "common/kind.h"
 #include "eval/compiler/flat_expr_builder_extensions.h"
 #include "eval/compiler/resolver.h"
 #include "runtime/internal/issue_collector.h"

eval/compiler/resolver.cc

@@ -27,7 +27,7 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-#include "base/kind.h"
+#include "common/kind.h"
 #include "common/type.h"
 #include "common/type_reflector.h"
 #include "common/value.h"

eval/compiler/resolver.h

@@ -24,7 +24,7 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "base/kind.h"
+#include "common/kind.h"
 #include "common/type_reflector.h"
 #include "common/value.h"
 #include "common/value_manager.h"

eval/eval/BUILD

@@ -207,9 +207,9 @@ cc_library(
         ":evaluator_core",
         ":expression_step_base",
         "//base:attributes",
-        "//base:kind",
         "//base/ast_internal:expr",
         "//common:casting",
+        "//common:kind",
         "//common:native_type",
         "//common:value",
         "//common:value_kind",
@@ -286,9 +286,9 @@ cc_library(
         ":expression_step_base",
         "//base:function",
         "//base:function_descriptor",
-        "//base:kind",
         "//base/ast_internal:expr",
         "//common:casting",
+        "//common:kind",
         "//common:value",
         "//eval/internal:errors",
         "//internal:status_macros",
@@ -318,11 +318,11 @@ cc_library(
         ":direct_expression_step",
         ":evaluator_core",
         ":expression_step_base",
-        "//base:kind",
         "//base/ast_internal:expr",
         "//common:casting",
         "//common:native_type",
         "//common:value",
+        "//common:value_kind",
         "//eval/internal:errors",
         "//internal:casts",
         "//internal:status_macros",
@@ -523,8 +523,8 @@ cc_library(
         ":evaluator_core",
         ":expression_step_base",
         "//base:attributes",
-        "//base:kind",
         "//common:casting",
+        "//common:kind",
         "//common:value",
         "//common:value_kind",
         "//eval/internal:errors",

eval/eval/comprehension_step.cc

@@ -13,8 +13,8 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "base/attribute.h"
-#include "base/kind.h"
 #include "common/casting.h"
+#include "common/kind.h"
 #include "common/value.h"
 #include "common/value_kind.h"
 #include "eval/eval/attribute_trail.h"

eval/eval/container_access_step.cc

@@ -11,8 +11,8 @@
 #include "absl/types/span.h"
 #include "base/ast_internal/expr.h"
 #include "base/attribute.h"
-#include "base/kind.h"
 #include "common/casting.h"
+#include "common/kind.h"
 #include "common/native_type.h"
 #include "common/value.h"
 #include "common/value_kind.h"

eval/eval/function_step.cc

@@ -18,8 +18,8 @@
 #include "base/ast_internal/expr.h"
 #include "base/function.h"
 #include "base/function_descriptor.h"
-#include "base/kind.h"
 #include "common/casting.h"
+#include "common/kind.h"
 #include "common/value.h"
 #include "eval/eval/attribute_trail.h"
 #include "eval/eval/direct_expression_step.h"

eval/eval/select_step.cc

@@ -10,10 +10,10 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "base/kind.h"
 #include "common/casting.h"
 #include "common/native_type.h"
 #include "common/value.h"
+#include "common/value_kind.h"
 #include "common/value_manager.h"
 #include "eval/eval/attribute_trail.h"
 #include "eval/eval/direct_expression_step.h"

eval/internal/BUILD

@@ -27,7 +27,7 @@ cc_library(
     srcs = ["cel_value_equal.cc"],
     hdrs = ["cel_value_equal.h"],
     deps = [
-        "//base:kind",
+        "//common:kind",
         "//eval/public:cel_number",
         "//eval/public:cel_value",
         "//eval/public:message_wrapper",

eval/internal/cel_value_equal.cc

@@ -18,7 +18,7 @@
 
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-#include "base/kind.h"
+#include "common/kind.h"
 #include "eval/public/cel_number.h"
 #include "eval/public/cel_value.h"
 #include "eval/public/message_wrapper.h"

eval/public/BUILD

@@ -81,7 +81,7 @@ cc_library(
         ":cel_value_internal",
         ":message_wrapper",
         ":unknown_set",
-        "//base:kind",
+        "//common:kind",
         "//common:memory",
         "//common:native_type",
         "//eval/internal:errors",
@@ -573,7 +573,7 @@ cc_library(
         ":cel_expression",
         ":cel_function",
         ":cel_options",
-        "//base:kind",
+        "//common:kind",
         "//common:memory",
         "//eval/compiler:cel_expression_builder_flat_impl",
         "//eval/compiler:comprehension_vulnerability_check",
@@ -621,7 +621,7 @@ cc_library(
         "//base:data",
         "//base:function",
         "//base:function_descriptor",
-        "//base:kind",
+        "//common:kind",
         "//common:type",
         "//common:value",
         "//eval/internal:interop",
@@ -775,7 +775,7 @@ cc_test(
         ":activation",
         ":cel_function",
         ":cel_function_registry",
-        "//base:kind",
+        "//common:kind",
         "//eval/internal:adapter_activation_impl",
         "//internal:testing",
         "//runtime:function_overload_reference",

eval/public/cel_expr_builder_factory.cc

@@ -22,7 +22,7 @@
 #include "absl/base/nullability.h"
 #include "absl/log/absl_log.h"
 #include "absl/status/status.h"
-#include "base/kind.h"
+#include "common/kind.h"
 #include "common/memory.h"
 #include "eval/compiler/cel_expression_builder_flat_impl.h"
 #include "eval/compiler/comprehension_vulnerability_check.h"

eval/public/cel_function_registry.h

@@ -15,7 +15,7 @@
 #include "absl/synchronization/mutex.h"
 #include "base/function.h"
 #include "base/function_descriptor.h"
-#include "base/kind.h"
+#include "common/kind.h"
 #include "eval/public/cel_function.h"
 #include "eval/public/cel_options.h"
 #include "eval/public/cel_value.h"

eval/public/cel_function_registry_test.cc

@@ -6,7 +6,7 @@
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-#include "base/kind.h"
+#include "common/kind.h"
 #include "eval/internal/adapter_activation_impl.h"
 #include "eval/public/activation.h"
 #include "eval/public/cel_function.h"

eval/public/cel_value.h

@@ -33,7 +33,7 @@
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-#include "base/kind.h"
+#include "common/kind.h"
 #include "common/memory.h"
 #include "common/native_type.h"
 #include "eval/public/cel_value_internal.h"

runtime/BUILD

@@ -117,7 +117,7 @@ cc_library(
             ":function_provider",
             "//base:function",
             "//base:function_descriptor",
-            "//base:kind",
+            "//common:kind",
             "@com_google_absl//absl/container:flat_hash_map",
             "@com_google_absl//absl/container:node_hash_map",
             "@com_google_absl//absl/status",
@@ -139,7 +139,7 @@ cc_test(
         "//base:function",
         "//base:function_adapter",
         "//base:function_descriptor",
-        "//base:kind",
+        "//common:kind",
         "//common:value",
         "//internal:testing",
         "@com_google_absl//absl/status",

runtime/function_registry.cc

@@ -28,7 +28,7 @@
 #include "absl/types/span.h"
 #include "base/function.h"
 #include "base/function_descriptor.h"
-#include "base/kind.h"
+#include "common/kind.h"
 #include "runtime/activation_interface.h"
 #include "runtime/function_overload_reference.h"
 #include "runtime/function_provider.h"

runtime/function_registry.h

@@ -27,7 +27,7 @@
 #include "absl/types/span.h"
 #include "base/function.h"
 #include "base/function_descriptor.h"
-#include "base/kind.h"
+#include "common/kind.h"
 #include "runtime/function_overload_reference.h"
 #include "runtime/function_provider.h"
 

runtime/function_registry_test.cc

@@ -23,7 +23,7 @@
 #include "base/function.h"
 #include "base/function_adapter.h"
 #include "base/function_descriptor.h"
-#include "base/kind.h"
+#include "common/kind.h"
 #include "common/value_manager.h"
 #include "internal/testing.h"
 #include "runtime/activation.h"

runtime/standard/BUILD

@@ -50,7 +50,7 @@ cc_test(
     deps = [
         ":comparison_functions",
         "//base:builtins",
-        "//base:kind",
+        "//common:kind",
         "//internal:testing",
         "@com_google_absl//absl/strings",
     ],
@@ -91,7 +91,7 @@ cc_test(
         ":container_membership_functions",
         "//base:builtins",
         "//base:function_descriptor",
-        "//base:kind",
+        "//common:kind",
         "//internal:testing",
         "//runtime:function_registry",
         "//runtime:runtime_options",
@@ -106,9 +106,9 @@ cc_library(
     deps = [
         "//base:builtins",
         "//base:function_adapter",
-        "//base:kind",
         "//common:casting",
         "//common:value",
+        "//common:value_kind",
         "//internal:number",
         "//internal:status_macros",
         "//runtime:function_registry",
@@ -134,7 +134,7 @@ cc_test(
         ":equality_functions",
         "//base:builtins",
         "//base:function_descriptor",
-        "//base:kind",
+        "//common:kind",
         "//internal:testing",
         "//runtime:function_registry",
         "//runtime:runtime_options",
@@ -177,7 +177,7 @@ cc_test(
         "//base:data",
         "//base:function",
         "//base:function_descriptor",
-        "//base:kind",
+        "//common:kind",
         "//common:type",
         "//common:value",
         "//internal:testing",

runtime/standard/comparison_functions_test.cc

@@ -18,7 +18,7 @@
 
 #include "absl/strings/str_cat.h"
 #include "base/builtins.h"
-#include "base/kind.h"
+#include "common/kind.h"
 #include "internal/testing.h"
 
 namespace cel {

runtime/standard/container_membership_functions_test.cc

@@ -20,7 +20,7 @@
 #include "absl/strings/string_view.h"
 #include "base/builtins.h"
 #include "base/function_descriptor.h"
-#include "base/kind.h"
+#include "common/kind.h"
 #include "internal/testing.h"
 #include "runtime/function_registry.h"
 #include "runtime/runtime_options.h"

runtime/standard/equality_functions.cc

@@ -28,9 +28,9 @@
 #include "absl/types/optional.h"
 #include "base/builtins.h"
 #include "base/function_adapter.h"
-#include "base/kind.h"
 #include "common/casting.h"
 #include "common/value.h"
+#include "common/value_kind.h"
 #include "common/value_manager.h"
 #include "internal/number.h"
 #include "internal/status_macros.h"

runtime/standard/equality_functions_test.cc

@@ -19,7 +19,7 @@
 #include "absl/status/status_matchers.h"
 #include "base/builtins.h"
 #include "base/function_descriptor.h"
-#include "base/kind.h"
+#include "common/kind.h"
 #include "internal/testing.h"
 #include "runtime/function_registry.h"
 #include "runtime/runtime_options.h"

runtime/standard/logical_functions_test.cc

@@ -26,8 +26,8 @@
 #include "base/builtins.h"
 #include "base/function.h"
 #include "base/function_descriptor.h"
-#include "base/kind.h"
 #include "base/type_provider.h"
+#include "common/kind.h"
 #include "common/type_factory.h"
 #include "common/type_manager.h"
 #include "common/value.h"