Update to the latest clp submodule commit. (#39)

y-scope · Nov 10, 2023 · 49521ce · 49521ce
1 parent 3de1afc
commit 49521ce
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,10 +26,10 @@ add_library(clp-ffi-java SHARED
         src/main/cpp/libclp_ffi_java/ClpIrOutputStreamState.hpp
         src/main/cpp/libclp_ffi_java/common.cpp
         src/main/cpp/libclp_ffi_java/common.hpp
-        src/main/cpp/libclp_ffi_java/common.tpp
+        src/main/cpp/libclp_ffi_java/common.inc
         src/main/cpp/libclp_ffi_java/GeneralException.hpp
         src/main/cpp/libclp_ffi_java/ir_stream/common.hpp
-        src/main/cpp/libclp_ffi_java/ir_stream/common.tpp
+        src/main/cpp/libclp_ffi_java/ir_stream/common.inc
         src/main/cpp/libclp_ffi_java/Java_AbstractClpIrOutputStream.cpp
         src/main/cpp/libclp_ffi_java/Java_AbstractClpWildcardQueryEncoder.cpp
         src/main/cpp/libclp_ffi_java/Java_EightByteClpIrOutputStream.cpp
@@ -45,7 +45,7 @@ add_library(clp-ffi-java SHARED
         src/main/cpp/libclp_ffi_java/static_init.hpp
         src/main/cpp/submodules/clp/components/core/src/ffi/encoding_methods.cpp
         src/main/cpp/submodules/clp/components/core/src/ffi/encoding_methods.hpp
-        src/main/cpp/submodules/clp/components/core/src/ffi/encoding_methods.tpp
+        src/main/cpp/submodules/clp/components/core/src/ffi/encoding_methods.inc
         src/main/cpp/submodules/clp/components/core/src/ffi/ir_stream/encoding_methods.cpp
         src/main/cpp/submodules/clp/components/core/src/ffi/ir_stream/encoding_methods.hpp
         src/main/cpp/submodules/clp/components/core/src/ffi/ir_stream/protocol_constants.hpp
@@ -63,9 +63,11 @@ add_library(clp-ffi-java SHARED
         src/main/cpp/submodules/clp/components/core/src/ffi/search/Subquery.hpp
         src/main/cpp/submodules/clp/components/core/src/ffi/search/WildcardToken.cpp
         src/main/cpp/submodules/clp/components/core/src/ffi/search/WildcardToken.hpp
+        src/main/cpp/submodules/clp/components/core/src/ir/parsing.cpp
+        src/main/cpp/submodules/clp/components/core/src/ir/parsing.hpp
         src/main/cpp/submodules/clp/components/core/src/string_utils.cpp
         src/main/cpp/submodules/clp/components/core/src/string_utils.hpp
-        src/main/cpp/submodules/clp/components/core/src/string_utils.tpp
+        src/main/cpp/submodules/clp/components/core/src/string_utils.inc
         target/include/com_yscope_clp_compressorfrontend_MessageDecoder.h
         target/include/com_yscope_clp_compressorfrontend_MessageEncoder.h
         target/include/com_yscope_clp_irstream_AbstractClpIrOutputStream.h
@@ -76,6 +78,7 @@ target_compile_features(clp-ffi-java
         PRIVATE cxx_std_17
         )
 target_include_directories(clp-ffi-java PRIVATE
+        ${CMAKE_SOURCE_DIR}/src/main/cpp/submodules/clp/components/core/submodules
         ${JNI_INCLUDE_DIRS}
         target/include
         )

diff --git a/src/main/cpp/libclp_ffi_java/Java_EightByteClpWildcardQueryEncoder.cpp b/src/main/cpp/libclp_ffi_java/Java_EightByteClpWildcardQueryEncoder.cpp
@@ -12,6 +12,7 @@
 #include "../submodules/clp/components/core/src/ffi/search/query_methods.hpp"
 #include "../submodules/clp/components/core/src/ffi/search/QueryMethodFailed.hpp"
 #include "../submodules/clp/components/core/src/ffi/search/WildcardToken.hpp"
+#include "../submodules/clp/components/core/src/ir/parsing.hpp"
 #include "../submodules/clp/components/core/src/string_utils.hpp"
 #include "../submodules/clp/components/core/src/type_utils.hpp"
 #include "common.hpp"
@@ -127,7 +128,7 @@ static jobjectArray encode_native (
         for (const auto& query_var : query_vars) {
             auto success = std::visit(overloaded{
                     [&] (const EightByteExactVariableToken& var) {
-                        if (ffi::VariablePlaceholder::Dictionary == var.get_placeholder()) {
+                        if (ir::VariablePlaceholder::Dictionary == var.get_placeholder()) {
                             // These static casts are safe since the original query
                             // length is a jsize
                             dict_var_bounds.push_back(
@@ -144,17 +145,17 @@ static jobjectArray encode_native (
                             case ffi::search::TokenType::IntegerVariable:
                                 wildcard_var_placeholders.push_back(
                                         enum_to_underlying_type(
-                                                ffi::VariablePlaceholder::Integer));
+                                                ir::VariablePlaceholder::Integer));
                                 break;
                             case ffi::search::TokenType::FloatVariable:
                                 wildcard_var_placeholders.push_back(
                                         enum_to_underlying_type(
-                                                ffi::VariablePlaceholder::Float));
+                                                ir::VariablePlaceholder::Float));
                                 break;
                             case ffi::search::TokenType::DictionaryVariable:
                                 wildcard_var_placeholders.push_back(
                                         enum_to_underlying_type(
-                                                ffi::VariablePlaceholder::Dictionary));
+                                                ir::VariablePlaceholder::Dictionary));
                                 break;
                             default:
                                 // This should never happen

diff --git a/src/main/cpp/libclp_ffi_java/Java_MessageDecoder.cpp b/src/main/cpp/libclp_ffi_java/Java_MessageDecoder.cpp
@@ -9,16 +9,17 @@
 
 // Project headers
 #include "../submodules/clp/components/core/src/ffi/encoding_methods.hpp"
+#include "../submodules/clp/components/core/src/ir/parsing.hpp"
 #include "../submodules/clp/components/core/src/string_utils.hpp"
 #include "../submodules/clp/components/core/src/type_utils.hpp"
 #include "common.hpp"
 #include "JavaException.hpp"
 
 using ffi::decode_message;
 using ffi::eight_byte_encoded_variable_t;
-using ffi::VariablePlaceholder;
 using ffi::wildcard_match_encoded_vars;
 using ffi::wildcard_query_matches_any_encoded_var;
+using ir::VariablePlaceholder;
 using libclp_ffi_java::cJSizeMax;
 using libclp_ffi_java::get_java_primitive_array_elements;
 using libclp_ffi_java::JavaExceptionOccurred;

diff --git a/src/main/cpp/libclp_ffi_java/common.hpp b/src/main/cpp/libclp_ffi_java/common.hpp
@@ -86,6 +86,6 @@ namespace libclp_ffi_java {
     );
 }
 
-#include "common.tpp"
+#include "common.inc"
 
 #endif // LIBCLP_FFI_JAVA_COMMON_HPP
diff --git a/src/main/cpp/libclp_ffi_java/common.tpp → src/main/cpp/libclp_ffi_java/common.inc b/src/main/cpp/libclp_ffi_java/common.tpp → src/main/cpp/libclp_ffi_java/common.inc
@@ -1,5 +1,5 @@
-#ifndef LIBCLP_FFI_JAVA_COMMON_TPP
-#define LIBCLP_FFI_JAVA_COMMON_TPP
+#ifndef LIBCLP_FFI_JAVA_COMMON_INC
+#define LIBCLP_FFI_JAVA_COMMON_INC
 
 // C++ standard libraries
 #include <functional>
@@ -170,4 +170,4 @@ namespace libclp_ffi_java {
     }
 }
 
-#endif // LIBCLP_FFI_JAVA_COMMON_TPP
+#endif // LIBCLP_FFI_JAVA_COMMON_INC
diff --git a/src/main/cpp/libclp_ffi_java/ir_stream/common.hpp b/src/main/cpp/libclp_ffi_java/ir_stream/common.hpp
@@ -60,6 +60,6 @@ namespace libclp_ffi_java::ir_stream {
                                  jint message_length);
 }
 
-#include "common.tpp"
+#include "common.inc"
 
 #endif //LIBCLP_FFI_JAVA_IR_STREAM_COMMON_HPP
diff --git a/.../cpp/libclp_ffi_java/ir_stream/common.tpp → .../cpp/libclp_ffi_java/ir_stream/common.inc b/.../cpp/libclp_ffi_java/ir_stream/common.tpp → .../cpp/libclp_ffi_java/ir_stream/common.inc
@@ -1,5 +1,5 @@
-#ifndef LIBCLP_FFI_JAVA_IR_STREAM_COMMON_TPP
-#define LIBCLP_FFI_JAVA_IR_STREAM_COMMON_TPP
+#ifndef LIBCLP_FFI_JAVA_IR_STREAM_COMMON_INC
+#define LIBCLP_FFI_JAVA_IR_STREAM_COMMON_INC
 
 // C++ standard libraries
 #include <cstdint>
@@ -125,4 +125,4 @@ namespace libclp_ffi_java::ir_stream {
     }
 }
 
-#endif //LIBCLP_FFI_JAVA_IR_STREAM_COMMON_TPP
+#endif //LIBCLP_FFI_JAVA_IR_STREAM_COMMON_INC
diff --git a/src/main/cpp/submodules/clp b/src/main/cpp/submodules/clp