Move metaprogramming/ to bind_lang/metaprogramming/.

BUILD

@@ -34,6 +34,10 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":jni_dep",
+        "//bind_lang/metaprogramming:corpus",
+        "//bind_lang/metaprogramming:corpus_tag",
+        "//bind_lang/metaprogramming:singleton",
+        "//bind_lang/metaprogramming:string_literal",
         "//class_defs:java_lang_classes",
         "//class_defs:java_lang_exception",
         "//class_defs:java_lang_throwable",
@@ -92,10 +96,6 @@ cc_library(
         "//implementation/jni_helper:jni_env",
         "//implementation/jni_helper:lifecycle",
         "//implementation/jni_helper:static_field_value",
-        "//metaprogramming:corpus",
-        "//metaprogramming:corpus_tag",
-        "//metaprogramming:singleton",
-        "//metaprogramming:string_literal",
     ],
 )
 
@@ -175,11 +175,11 @@ genrule(
         ":headers_for_export",
         ":jni_bind_decorative_text",
         ":jni_bind_release_input",
+        "//bind_lang/metaprogramming:headers_for_export",
         "//class_defs:headers_for_export",
         "//class_defs/android:headers_for_export",
         "//implementation:headers_for_export",
         "//implementation/jni_helper:headers_for_export",
-        "//metaprogramming:headers_for_export",
     ],
     visibility = ["//third_party/jni_wrapper/godbolt:__pkg__"],
 )
@@ -199,11 +199,11 @@ genrule(
         ":headers_for_export",
         ":jni_bind_decorative_text",
         ":jni_bind_release_input",
+        "//bind_lang/metaprogramming:headers_for_export",
         "//class_defs:headers_for_export",
         "//class_defs/android:headers_for_export",
         "//implementation:headers_for_export",
         "//implementation/jni_helper:headers_for_export",
-        "//metaprogramming:headers_for_export",
     ],
     visibility = ["//visibility:private"],
 )

CMakeLists.txt

@@ -15,7 +15,7 @@ target_include_directories(jni_bind INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/class_defs
     ${CMAKE_CURRENT_SOURCE_DIR}/implementation
     ${CMAKE_CURRENT_SOURCE_DIR}/implementation/jni_helper
-    ${CMAKE_CURRENT_SOURCE_DIR}/metaprogramming)
+    ${CMAKE_CURRENT_SOURCE_DIR}/bind_lang/metaprogramming)
 
 target_link_libraries(jni_bind INTERFACE jdk:jni)
 
@@ -26,7 +26,7 @@ endif()
 
 enable_testing()
 
-file(GLOB METAPROGRAMMING_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/metaprogramming/*_test.cc")
+file(GLOB METAPROGRAMMING_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/bind_lang/metaprogramming/*_test.cc")
 foreach(TEST_SRC ${METAPROGRAMMING_TESTS})
     get_filename_component(TEST_NAME ${TEST_SRC} NAME_WE)
     add_jni_test(${TEST_NAME} ${TEST_SRC})

README.md

@@ -610,7 +610,7 @@ obj.Call<"Foo">(1.5f, "argString");
 obj.Access<"intField">().Set(123);
 ```
 
-This syntax was all that could be supported in C++17, and unfortunately [relies on a clang extension](metaprogramming/invocable_map.h). Because C++17 does not support string literals in non-type template parameters, the new syntax is not possible. Conversely, the syntax enabled by the clang extension is not possible to represent in standard C++20.
+This syntax was all that could be supported in C++17, and unfortunately [relies on a clang extension](bind_lang/metaprogramming/invocable_map.h). Because C++17 does not support string literals in non-type template parameters, the new syntax is not possible. Conversely, the syntax enabled by the clang extension is not possible to represent in standard C++20.
 
 As such, the documentation and sample code all use the new syntax, and because this uses standard C++20, it is portable. The old syntax is fully unit tested under the [legacy directory](implementation/legacy), and will continue to be supported for clang on C++17 and onwards. In the unlikely event this syntax needed deprecation I will only do so after a major version bump.
 

metaprogramming/BUILD → bind_lang/metaprogramming/BUILD

@@ -7,8 +7,6 @@ package(
 
 licenses(["notice"])
 
-exports_files(["LICENSE"])
-
 ################################################################################
 # All.
 ################################################################################
@@ -599,6 +597,7 @@ cc_library(
         ":per_element",
         ":tuple_manipulation",
         ":type_of_nth_element",
+        ":unwrap",
     ],
 )
 
@@ -715,6 +714,7 @@ cc_test(
     deps = [
         ":min_max",
         ":reduce",
+        ":vals",
         "@googletest//:gtest_main",
     ],
 )
@@ -1239,6 +1239,7 @@ cc_test(
     name = "vals_equal_diminished_test",
     srcs = ["vals_equal_diminished_test.cc"],
     deps = [
+        ":vals",
         ":vals_equal_diminished",
         "@googletest//:gtest_main",
     ],

metaprogramming/all.h → bind_lang/metaprogramming/all.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_ALL_H_
-#define JNI_BIND_METAPROGRAMMING_ALL_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_ALL_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_ALL_H_
 
 #include <type_traits>
 
@@ -36,4 +36,4 @@ static constexpr bool All_v = All_t<Func, Ts...>::value;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_ALL_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_ALL_H_

metaprogramming/all_unique.h → bind_lang/metaprogramming/all_unique.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_ALL_UNIQUE_H_
-#define JNI_BIND_METAPROGRAMMING_ALL_UNIQUE_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_ALL_UNIQUE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_ALL_UNIQUE_H_
 
 #include <type_traits>
 
@@ -49,4 +49,4 @@ constexpr bool AllUniqueValues(const T1&& t1, const Ts&&... ts) {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_ALL_UNIQUE_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_ALL_UNIQUE_H_

metaprogramming/any.h → bind_lang/metaprogramming/any.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_ANY_H_
-#define JNI_BIND_METAPROGRAMMING_ANY_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_ANY_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_ANY_H_
 
 #include <type_traits>
 
@@ -44,4 +44,4 @@ static constexpr bool Any_Tup_v = TupleUnroller_t<Any<Func>, Ts>::value;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_ANY_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_ANY_H_

metaprogramming/apply.h → bind_lang/metaprogramming/apply.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_APPLY_H_
-#define JNI_BIND_METAPROGRAMMING_APPLY_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_APPLY_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_APPLY_H_
 
 #include "tuple_manipulation.h"
 
@@ -39,4 +39,4 @@ using ApplyTup_t = TupleUnroller_t<Apply<Function>, TupleType>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_APPLY_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_APPLY_H_

metaprogramming/base.h → bind_lang/metaprogramming/base.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_BASE_H_
-#define JNI_BIND_METAPROGRAMMING_BASE_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_BASE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_BASE_H_
 
 #include <type_traits>
 
@@ -32,4 +32,4 @@ using Base_t = typename Base<BaseToTest>::template type<TypeToTest>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_BASE_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_BASE_H_

metaprogramming/base_filter.h → bind_lang/metaprogramming/base_filter.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_BASE_FILTER_H_
-#define JNI_BIND_METAPROGRAMMING_BASE_FILTER_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_BASE_FILTER_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_BASE_FILTER_H_
 
 #include <tuple>
 #include <type_traits>
@@ -67,4 +67,4 @@ using BaseFilterWithDefault_t =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_BASE_FILTER_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_BASE_FILTER_H_

metaprogramming/call.h → bind_lang/metaprogramming/call.h

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef JNI_BIND_METAPROGRAMMING_CALL_H_
-#define JNI_BIND_METAPROGRAMMING_CALL_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_CALL_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_CALL_H_
 
 #include <tuple>
 
@@ -41,4 +41,4 @@ using Call_t = typename Call::type<T>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_CALL_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_CALL_H_

metaprogramming/call_test.cc → bind_lang/metaprogramming/call_test.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "metaprogramming/call.h"
+#include "bind_lang/metaprogramming/call.h"
 
 #include <tuple>
 #include <type_traits>

metaprogramming/cartesian_product.h → bind_lang/metaprogramming/cartesian_product.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_CARTESIAN_PRODUCT_H_
-#define JNI_BIND_METAPROGRAMMING_CARTESIAN_PRODUCT_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_CARTESIAN_PRODUCT_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_CARTESIAN_PRODUCT_H_
 
 #include <cstddef>
 #include <tuple>
@@ -102,4 +102,4 @@ using CartesianProduct_t = typename CartesianProduct::template type<Tups...>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_CARTESIAN_PRODUCT_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_CARTESIAN_PRODUCT_H_

metaprogramming/cartesian_product_test.cc → bind_lang/metaprogramming/cartesian_product_test.cc

@@ -31,7 +31,6 @@ using ::jni::metaprogramming::GenerateBitSequenceFromTupSets_t;
 using ::jni::metaprogramming::InvokeAsPack_t;
 using ::jni::metaprogramming::NBit;
 using ::jni::metaprogramming::NBitSequence;
-using ::jni::metaprogramming::TupleUnroller_t;
 
 template <typename... Ts>
 using Tup = std::tuple<Ts...>;

metaprogramming/chain.h → bind_lang/metaprogramming/chain.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_CHAIN_H_
-#define JNI_BIND_METAPROGRAMMING_CHAIN_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_CHAIN_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_CHAIN_H_
 
 #include "invoke.h"
 
@@ -44,4 +44,4 @@ struct Chain<FirstFunc, Funcs...> {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_CHAIN_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_CHAIN_H_

metaprogramming/color.h → bind_lang/metaprogramming/color.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_COLOUR_H_
-#define JNI_BIND_METAPROGRAMMING_COLOUR_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_COLOR_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_COLOR_H_
 
 #include <string>
 #include <string_view>
@@ -73,4 +73,4 @@ inline std::string Colorize(std::string_view colour, std::string_view str,
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_COLOUR_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_COLOR_H_

metaprogramming/combine.h → bind_lang/metaprogramming/combine.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_COMBINE_H_
-#define JNI_BIND_METAPROGRAMMING_COMBINE_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_COMBINE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_COMBINE_H_
 
 #include <tuple>
 
@@ -43,4 +43,4 @@ using Combine_t = typename Combine::template type<Tup1, Tup2>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_COMBINE_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_COMBINE_H_

metaprogramming/concatenate.h → bind_lang/metaprogramming/concatenate.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_CONCATENATE_H_
-#define JNI_BIND_METAPROGRAMMING_CONCATENATE_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_CONCATENATE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_CONCATENATE_H_
 
 #include <tuple>
 
@@ -49,4 +49,4 @@ using ConcatenateTup_t = Reduce_t<Combine, Tups...>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_CONCATENATE_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_CONCATENATE_H_

metaprogramming/conditional.h → bind_lang/metaprogramming/conditional.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_CONDITIONAL_H_
-#define JNI_BIND_METAPROGRAMMING_CONDITIONAL_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_CONDITIONAL_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_CONDITIONAL_H_
 
 #include <tuple>
 #include <type_traits>
@@ -40,4 +40,4 @@ using Conditional_t = typename Conditional<Func>::template type<Ts...>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_CONDITIONAL_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_CONDITIONAL_H_

metaprogramming/contains.h → bind_lang/metaprogramming/contains.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_CONTAINS_H_
-#define JNI_BIND_METAPROGRAMMING_CONTAINS_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_CONTAINS_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_CONTAINS_H_
 
 #include "any.h"
 #include "invoke.h"
@@ -44,4 +44,4 @@ constexpr bool ContainsValue(const SoughtType& sought_value, Ts&&... ts) {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_CONTAINS_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_CONTAINS_H_

metaprogramming/contains_base.h → bind_lang/metaprogramming/contains_base.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_CONTAINS_BASE_H_
-#define JNI_BIND_METAPROGRAMMING_CONTAINS_BASE_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_CONTAINS_BASE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_CONTAINS_BASE_H_
 
 #include "any.h"
 #include "base.h"
@@ -41,4 +41,4 @@ static constexpr bool TupContainsBase_v =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_CONTAINS_BASE_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_CONTAINS_BASE_H_

metaprogramming/corpus.h → bind_lang/metaprogramming/corpus.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_IMPLEMENTATION_CORPUS_H_
-#define JNI_BIND_IMPLEMENTATION_CORPUS_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_CORPUS_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_CORPUS_H_
 
 #include <tuple>
 
@@ -49,4 +49,4 @@ using Corpus_t = typename Corpus<Defaults...>::template type<T>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_IMPLEMENTATION_CORPUS_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_CORPUS_H_