Update includes to refer to new locations /common/function_descriptor.h and /runtime/function.h.

PiperOrigin-RevId: 720310099

Author: jnthntatum

eval/compiler/BUILD

@@ -162,8 +162,7 @@ cc_test(
         ":flat_expr_builder",
         ":qualified_reference_resolver",
         "//base:builtins",
-        "//base:function",
-        "//base:function_descriptor",
+        "//common:function_descriptor",
         "//common:value",
         "//eval/public:activation",
         "//eval/public:builtin_func_registrar",
@@ -187,6 +186,7 @@ cc_test(
         "//internal:status_macros",
         "//internal:testing",
         "//parser",
+        "//runtime:function",
         "//runtime:function_adapter",
         "//runtime:runtime_options",
         "//runtime/internal:runtime_env_testing",

eval/compiler/flat_expr_builder_test.cc

@@ -34,8 +34,7 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
 #include "base/builtins.h"
-#include "base/function.h"
-#include "base/function_descriptor.h"
+#include "common/function_descriptor.h"
 #include "common/value.h"
 #include "eval/compiler/cel_expression_builder_flat_impl.h"
 #include "eval/compiler/constant_folding.h"
@@ -62,6 +61,7 @@
 #include "internal/status_macros.h"
 #include "internal/testing.h"
 #include "parser/parser.h"
+#include "runtime/function.h"
 #include "runtime/function_adapter.h"
 #include "runtime/internal/runtime_env_testing.h"
 #include "runtime/runtime_options.h"

eval/eval/BUILD

@@ -284,15 +284,15 @@ cc_library(
         ":direct_expression_step",
         ":evaluator_core",
         ":expression_step_base",
-        "//base:function",
-        "//base:function_descriptor",
         "//base/ast_internal:expr",
         "//common:casting",
+        "//common:function_descriptor",
         "//common:kind",
         "//common:value",
         "//eval/internal:errors",
         "//internal:status_macros",
         "//runtime:activation_interface",
+        "//runtime:function",
         "//runtime:function_overload_reference",
         "//runtime:function_provider",
         "//runtime:function_registry",
@@ -998,11 +998,11 @@ cc_library(
     deps = [
         ":attribute_trail",
         "//base:attributes",
-        "//base:function_descriptor",
         "//base:function_result",
         "//base:function_result_set",
         "//base/internal:unknown_set",
         "//common:casting",
+        "//common:function_descriptor",
         "//common:value",
         "//eval/internal:errors",
         "//internal:status_macros",

eval/eval/attribute_utility.cc

@@ -9,11 +9,11 @@
 #include "absl/types/span.h"
 #include "base/attribute.h"
 #include "base/attribute_set.h"
-#include "base/function_descriptor.h"
 #include "base/function_result.h"
 #include "base/function_result_set.h"
 #include "base/internal/unknown_set.h"
 #include "common/casting.h"
+#include "common/function_descriptor.h"
 #include "common/value.h"
 #include "eval/eval/attribute_trail.h"
 #include "eval/internal/errors.h"

eval/eval/attribute_utility.h

@@ -5,8 +5,8 @@
 #include "absl/types/span.h"
 #include "base/attribute.h"
 #include "base/attribute_set.h"
-#include "base/function_descriptor.h"
 #include "base/function_result_set.h"
+#include "common/function_descriptor.h"
 #include "common/value.h"
 #include "common/value_manager.h"
 #include "eval/eval/attribute_trail.h"

eval/eval/function_step.cc

@@ -16,9 +16,8 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "base/ast_internal/expr.h"
-#include "base/function.h"
-#include "base/function_descriptor.h"
 #include "common/casting.h"
+#include "common/function_descriptor.h"
 #include "common/kind.h"
 #include "common/value.h"
 #include "eval/eval/attribute_trail.h"
@@ -28,6 +27,7 @@
 #include "eval/internal/errors.h"
 #include "internal/status_macros.h"
 #include "runtime/activation_interface.h"
+#include "runtime/function.h"
 #include "runtime/function_overload_reference.h"
 #include "runtime/function_provider.h"
 #include "runtime/function_registry.h"

eval/public/BUILD

@@ -188,12 +188,12 @@ cc_library(
     ],
     deps = [
         ":cel_value",
-        "//base:function",
-        "//base:function_descriptor",
+        "//common:function_descriptor",
         "//common:value",
         "//eval/internal:interop",
         "//extensions/protobuf:memory_manager",
         "//internal:status_macros",
+        "//runtime:function",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
@@ -618,15 +618,14 @@ cc_library(
         ":cel_function",
         ":cel_options",
         ":cel_value",
-        "//base:data",
-        "//base:function",
-        "//base:function_descriptor",
+        "//common:function_descriptor",
         "//common:kind",
         "//common:type",
         "//common:value",
         "//eval/internal:interop",
         "//extensions/protobuf:memory_manager",
         "//internal:status_macros",
+        "//runtime:function",
         "//runtime:function_overload_reference",
         "//runtime:function_registry",
         "@com_google_absl//absl/base:core_headers",

eval/public/cel_function.cc

@@ -5,12 +5,12 @@
 
 #include "absl/status/statusor.h"
 #include "absl/types/span.h"
-#include "base/function.h"
 #include "common/value.h"
 #include "eval/internal/interop.h"
 #include "eval/public/cel_value.h"
 #include "extensions/protobuf/memory_manager.h"
 #include "internal/status_macros.h"
+#include "runtime/function.h"
 #include "google/protobuf/arena.h"
 
 namespace google::api::expr::runtime {

eval/public/cel_function.h

@@ -9,10 +9,10 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
-#include "base/function.h"
-#include "base/function_descriptor.h"
+#include "common/function_descriptor.h"
 #include "common/value.h"
 #include "eval/public/cel_value.h"
+#include "runtime/function.h"
 
 namespace google::api::expr::runtime {
 

eval/public/cel_function_registry.cc

@@ -11,10 +11,9 @@
 #include "absl/strings/string_view.h"
 #include "absl/synchronization/mutex.h"
 #include "absl/types/span.h"
-#include "base/function.h"
-#include "base/function_descriptor.h"
-#include "base/type_provider.h"
+#include "common/function_descriptor.h"
 #include "common/type_manager.h"
+#include "common/type_reflector.h"
 #include "common/value.h"
 #include "common/value_manager.h"
 #include "common/values/legacy_value_manager.h"
@@ -24,6 +23,7 @@
 #include "eval/public/cel_value.h"
 #include "extensions/protobuf/memory_manager.h"
 #include "internal/status_macros.h"
+#include "runtime/function.h"
 #include "runtime/function_overload_reference.h"
 #include "google/protobuf/arena.h"
 
@@ -52,7 +52,7 @@ class ProxyToModernCelFunction : public CelFunction {
     // implementation.
     auto memory_manager = ProtoMemoryManagerRef(arena);
     cel::common_internal::LegacyValueManager manager(
-        memory_manager, cel::TypeProvider::Builtin());
+        memory_manager, cel::TypeReflector::Builtin());
     cel::FunctionEvaluationContext context(manager);
 
     std::vector<cel::Value> modern_args =