Move Corpus metafunction to metaprogramming.

BUILD

@@ -35,8 +35,6 @@ cc_library(
         "//implementation:class",
         "//implementation:class_loader",
         "//implementation:constructor",
-        "//implementation:corpus",
-        "//implementation:corpus_tag",
         "//implementation:default_class_loader",
         "//implementation:field",
         "//implementation:find_class_fallback",
@@ -67,6 +65,8 @@ cc_library(
         "//implementation:static_ref",
         "//implementation:string_ref",
         "//implementation:supported_class_set",
+        "//metaprogramming:corpus",
+        "//metaprogramming:corpus_tag",
     ],
 )
 

implementation/BUILD

@@ -293,34 +293,6 @@ cc_test(
     ],
 )
 
-cc_library(
-    name = "corpus",
-    hdrs = ["corpus.h"],
-    deps = [
-        ":corpus_tag",
-        "//metaprogramming:concatenate",
-        "//metaprogramming:detect",
-    ],
-)
-
-cc_library(
-    name = "corpus_tag",
-    hdrs = ["corpus_tag.h"],
-    deps = [
-    ],
-)
-
-cc_test(
-    name = "corpus_test",
-    srcs = ["corpus_test.cc"],
-    deps = [
-        ":corpus",
-        ":corpus_tag",
-        "//metaprogramming:detect",
-        "@googletest//:gtest_main",
-    ],
-)
-
 cc_library(
     name = "default_class_loader",
     hdrs = ["default_class_loader.h"],
@@ -949,8 +921,7 @@ cc_library(
     deps = [
         ":class",
         ":class_loader",
-        ":corpus",
-        ":corpus_tag",
+        ":forward_declarations",
         ":object",
         ":proxy_convenience_aliases",
         ":ref_base",
@@ -959,6 +930,8 @@ cc_library(
         "//metaprogramming:cartesian_product",
         "//metaprogramming:combine",
         "//metaprogramming:concatenate",
+        "//metaprogramming:corpus",
+        "//metaprogramming:corpus_tag",
         "//metaprogramming:flatten",
         "//metaprogramming:invoke",
         "//metaprogramming:per_element",

implementation/forward_declarations.h

@@ -31,6 +31,9 @@ namespace jni {
 #define JNI_BIND_C_ENTRYPOINT(class_name, return_type, method_name, ...) \
   return_type class_name_##method_name(JNIEnv*, jclass, ##__VA_ARGS__)
 
+// Provide this base tag to UserDefined to enable custom types.
+struct JniUserDefinedCorpusTag {};
+
 // ArrayView Helper.
 template <typename T>
 struct ArrayViewHelper;

implementation/proxy.h

@@ -24,8 +24,7 @@
 
 #include "implementation/class.h"
 #include "implementation/class_loader.h"
-#include "implementation/corpus.h"
-#include "implementation/corpus_tag.h"
+#include "implementation/forward_declarations.h"
 #include "implementation/object.h"
 #include "implementation/proxy_convenience_aliases.h"
 #include "implementation/ref_base.h"
@@ -34,6 +33,7 @@
 #include "metaprogramming/cartesian_product.h"
 #include "metaprogramming/combine.h"
 #include "metaprogramming/concatenate.h"
+#include "metaprogramming/corpus.h"
 #include "metaprogramming/flatten.h"
 #include "metaprogramming/invoke.h"
 #include "metaprogramming/per_element.h"
@@ -50,11 +50,11 @@ template <typename t1, typename t2 = void>
 struct Proxy;
 
 // CDecls for all declarable types (these index into proxy definitions).
-using AllKeys =
-    Corpus_t<JniUserDefinedCorpusTag, void, jboolean, jbyte, jshort, jint,
-             jfloat, jlong, jchar, jdouble, jstring, jobject, Self, jarray,
-             jobjectArray, jintArray, jbooleanArray, jbyteArray, jcharArray,
-             jshortArray, jdoubleArray, jfloatArray, jlongArray>;
+using AllKeys = metaprogramming::Corpus_t<
+    JniUserDefinedCorpusTag, void, jboolean, jbyte, jshort, jint, jfloat, jlong,
+    jchar, jdouble, jstring, jobject, Self, jarray, jobjectArray, jintArray,
+    jbooleanArray, jbyteArray, jcharArray, jshortArray, jdoubleArray,
+    jfloatArray, jlongArray>;
 
 template <typename TUndecayed>
 struct ProxyHelper {

jni_bind.h

@@ -22,8 +22,8 @@
 #include "jni_dep.h"
 
 // JNI Corpus.
-#include "implementation/corpus.h"
-#include "implementation/corpus_tag.h"
+#include "metaprogramming/corpus.h"
+#include "metaprogramming/corpus_tag.h"
 
 // Headers for static definitions.
 #include "implementation/array.h"

metaprogramming/BUILD

@@ -267,6 +267,32 @@ cc_test(
     ],
 )
 
+cc_library(
+    name = "corpus",
+    hdrs = ["corpus.h"],
+    deps = [
+        ":concatenate",
+        ":corpus_tag",
+        ":detect",
+    ],
+)
+
+cc_library(
+    name = "corpus_tag",
+    hdrs = ["corpus_tag.h"],
+)
+
+cc_test(
+    name = "corpus_test",
+    srcs = ["corpus_test.cc"],
+    deps = [
+        ":corpus",
+        ":corpus_tag",
+        ":detect",
+        "@googletest//:gtest_main",
+    ],
+)
+
 cc_library(
     name = "deep_equal",
     hdrs = ["deep_equal.h"],

implementation/corpus.h → metaprogramming/corpus.h

@@ -18,22 +18,20 @@
 
 #include <tuple>
 
-#include "implementation/corpus_tag.h"
-#include "metaprogramming/concatenate.h"
-#include "metaprogramming/detect.h"
+#include "concatenate.h"
+#include "corpus_tag.h"
+#include "detect.h"
 
-namespace jni {
+namespace jni::metaprogramming {
 
 // Provides the universe of keys, including user defined types if any.
 // Users define custom types by partially specialising UserDefined (see test).
 template <typename... Defaults>
 struct Corpus {
-  template <typename T, bool = ::jni::metaprogramming::Detect_v<
-                            UserDefined, JniUserDefinedCorpusTag> >
+  template <typename T, bool = Detect_v<UserDefined, T> >
   struct Helper {
-    using type = ::jni::metaprogramming::ConcatenateTup_t<
-        ::jni::metaprogramming::Detect_t<UserDefined, JniUserDefinedCorpusTag>,
-        std::tuple<Defaults...> >;
+    using type =
+        ConcatenateTup_t<Detect_t<UserDefined, T>, std::tuple<Defaults...> >;
   };
 
   template <typename T>
@@ -48,6 +46,6 @@ struct Corpus {
 template <typename T, typename... Defaults>
 using Corpus_t = typename Corpus<Defaults...>::template type<T>;
 
-}  // namespace jni
+}  // namespace jni::metaprogramming
 
 #endif  // JNI_BIND_IMPLEMENTATION_CORPUS_H_

implementation/corpus_tag.h → metaprogramming/corpus_tag.h

@@ -16,15 +16,12 @@
 #ifndef JNI_BIND_IMPLEMENTATION_CORPUS_TAG_H_
 #define JNI_BIND_IMPLEMENTATION_CORPUS_TAG_H_
 
-namespace jni {
-
-// Provide this base tag to UserDefined to enable custom types.
-struct JniUserDefinedCorpusTag {};
+namespace jni::metaprogramming {
 
 // Provide a partial specialization to this class to provide custom types.
 template <typename T>
 struct UserDefined;
 
-}  // namespace jni
+}  // namespace jni::metaprogramming
 
 #endif  // JNI_BIND_IMPLEMENTATION_CORPUS_TAG_H_

implementation/corpus_test.cc → metaprogramming/corpus_test.cc

@@ -14,38 +14,39 @@
  * limitations under the License.
  */
 #include <tuple>
+#include <type_traits>
 
-#include "implementation/corpus_tag.h"
+#include "corpus_tag.h"
+
+struct CorpusTag {};
 
 struct A {};
 struct B {};
 struct C {};
 
 // Note: This ordering is intentional (see `::jni::Corpus`).
-namespace jni {
+namespace jni::metaprogramming {
 
 template <>
-struct UserDefined<JniUserDefinedCorpusTag> {
+struct UserDefined<CorpusTag> {
   using type = std::tuple<A, B, C>;
 };
 
-}  // namespace jni
+}  // namespace jni::metaprogramming
 
-#include "implementation/corpus.h"
+#include "metaprogramming/corpus.h"
 #include "metaprogramming/detect.h"
 
-using ::jni::Corpus_t;
-using ::jni::JniUserDefinedCorpusTag;
-using ::jni::UserDefined;
+using ::jni::metaprogramming::Corpus_t;
 using ::jni::metaprogramming::Detect_t;
+using ::jni::metaprogramming::UserDefined;
 
 namespace {
 
 static_assert(
-    std::is_same_v<Detect_t<jni::UserDefined, JniUserDefinedCorpusTag>,
-                   std::tuple<A, B, C>>);
+    std::is_same_v<Detect_t<UserDefined, CorpusTag>, std::tuple<A, B, C>>);
 
-static_assert(std::is_same_v<Corpus_t<JniUserDefinedCorpusTag, int, float>,
+static_assert(std::is_same_v<Corpus_t<CorpusTag, int, float>,
                              std::tuple<A, B, C, int, float>>);
 
 }  // namespace