Migrate Value::kind() to ValueKind

PiperOrigin-RevId: 534550418

Author: jcking

base/internal/BUILD

@@ -152,9 +152,9 @@ cc_library(
         "function_adapter.h",
     ],
     deps = [
+        "//base:data",
         "//base:handle",
         "//base:kind",
-        "//base:value",
         "//internal:status_macros",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",

base/internal/data.h

@@ -186,6 +186,8 @@ class HeapData /* : public Data */ {
 
   explicit HeapData(TypeKind kind) : HeapData(TypeKindToKind(kind)) {}
 
+  explicit HeapData(ValueKind kind) : HeapData(ValueKindToKind(kind)) {}
+
  private:
   // Called by Arena-based memory managers to determine whether we actually need
   // our destructor called. Subclasses should override this if they want their

base/internal/function_adapter.h

@@ -184,7 +184,7 @@ struct HandleToAdaptedVisitor {
   absl::Status operator()(const Handle<T>** out) {
     if (!input->Is<T>()) {
       return absl::InvalidArgumentError(
-          absl::StrCat("expected ", KindToString(T::kKind), " value"));
+          absl::StrCat("expected ", ValueKindToString(T::kKind), " value"));
     }
     *out = &(input.As<T>());
     return absl::OkStatus();
@@ -194,7 +194,7 @@ struct HandleToAdaptedVisitor {
   absl::Status operator()(const T** out) {
     if (!input->Is<T>()) {
       return absl::InvalidArgumentError(
-          absl::StrCat("expected ", KindToString(T::kKind), " value"));
+          absl::StrCat("expected ", ValueKindToString(T::kKind), " value"));
     }
     *out = &(*input.As<T>());
     return absl::OkStatus();

base/kind.h

@@ -225,6 +225,22 @@ constexpr ValueKind KindToValueKind(Kind kind) {
       static_cast<std::underlying_type_t<Kind>>(kind));
 }
 
+constexpr ValueKind TypeKindToValueKind(TypeKind kind) {
+  ABSL_ASSERT(KindIsValueKind(TypeKindToKind(kind)));
+  return static_cast<ValueKind>(
+      static_cast<std::underlying_type_t<TypeKind>>(kind));
+}
+
+constexpr TypeKind ValueKindToTypeKind(ValueKind kind) {
+  ABSL_ASSERT(KindIsTypeKind(ValueKindToKind(kind)));
+  return static_cast<TypeKind>(
+      static_cast<std::underlying_type_t<ValueKind>>(kind));
+}
+
+static_assert(std::is_same_v<std::underlying_type_t<TypeKind>,
+                             std::underlying_type_t<ValueKind>>,
+              "TypeKind and ValueKind must have the same underlying type");
+
 }  // namespace cel
 
 #endif  // THIRD_PARTY_CEL_CPP_BASE_KIND_H_