added support for CxxWrap v0.17.x and made runtime check of libcxxwrap release more strict

Author: grasph

src/CodeTree.cpp

@@ -186,18 +186,18 @@ std::string CodeTree::wrapper_classsname(const std::string& classname) const{
 
 std::ostream&
 CodeTree::generate_version_check_cxx(std::ostream& o) const{
-  auto [jllmin, jllmax] = version_libcxxwrap_bounds(cxxwrap_version_);
+  auto [sjllmin, sjllmax] = version_libcxxwrap_static_bounds(cxxwrap_version_);
 
   indent(o,0) << "//method from libcxxwrap returning its version\n";
   indent(o,0) << "extern \"C\" JLCXX_API const char* cxxwrap_version_string();\n\n";
   indent(o, 0) << "//Check the code is compiled with a compatible version of libcxxwrap:\n";
   indent(o,0) << "static_assert(1000*1000*JLCXX_VERSION_MAJOR "
-    " + 1000 * JLCXX_VERSION_MINOR + JLCXX_VERSION_PATCH >= " << jllmin << "\n";
+    " + 1000 * JLCXX_VERSION_MINOR + JLCXX_VERSION_PATCH >= " << sjllmin << "\n";
   indent(o, 1) << "&& 1000 * 1000 * JLCXX_VERSION_MAJOR "
-    " + 1000 * JLCXX_VERSION_MINOR + JLCXX_VERSION_PATCH < " << jllmax << ",\n";
+    " + 1000 * JLCXX_VERSION_MINOR + JLCXX_VERSION_PATCH < " << sjllmax << ",\n";
   indent(o,1) << "\"The code was generated with WrapIt! for \"\n";
   indent(o,1) << "\"a different CxxWrap version (controlled with the cxxwrap_version parameter).\");\n\n";
-  indent(o, 0) << "//Check the version of loaded libcxxwrap library:\n";
+  indent(o, 0) << "//Check the version of loaded libcxxrap library:\n";
   indent(o,0) << "void throw_if_version_incompatibility(){\n";
   indent(o,1) <<   "std::string version_str = cxxwrap_version_string();\n";
   indent(o,1) <<   "static std::regex r(\"([[:digit:]]{1,3})\\\\.([[:digit:]]{1,3})\\\\.([[:digit:]]{1,3})\");\n";
@@ -208,13 +208,15 @@ CodeTree::generate_version_check_cxx(std::ostream& o) const{
   indent(o,2) <<     "long version_int =   1000*1000*strtol(matches[1].str().c_str(), 0, 10)\n";
   indent(o,2) <<     "                   +      1000*strtol(matches[2].str().c_str(), 0, 10)\n";
   indent(o,2) <<     "                   +           strtol(matches[3].str().c_str(), 0, 10);\n";
-  indent(o,2) <<     "if(version_int < " << jllmin << " || version_int >= " <<  jllmax << "){\n";
+  indent(o,2) <<     "long jllmin = 1000*1000*JLCXX_VERSION_MAJOR + 1000 * JLCXX_VERSION_MINOR;\n";
+  indent(o,2) <<     "long jllmax = 1000*1000*JLCXX_VERSION_MAJOR + 1000 * (JLCXX_VERSION_MINOR + 1);\n";
+  indent(o,2) <<     "if(version_int < jllmin || version_int >= jllmax){\n";
   indent(o,3) <<     "throw std::runtime_error(std::string(\"Found libcxxwrap_jll version \")\n";
-  indent(o,3) <<       " + version_str + \", while module " << module_name_ << " requires a version in \"\n";
-  indent(o,3) <<       "\"[" << version_int_to_string(jllmin) << ", " << version_int_to_string(jllmax) << ").\"\n";
-  indent(o,3) <<       "\" Note: if the module was installed with the package manager, the Project.toml file \"\n";
-  indent(o,3) <<       "\"of the package is probably missing a compat specification that would have prevented \"\n";
-  indent(o,3) <<       "\"the inconsistency.\");\n";
+  indent(o,4) <<       "+ version_str + \", while module " << module_name_ << " requires version \"\n";
+  indent(o,4) <<       "+ std::to_string(JLCXX_VERSION_MAJOR) + \".\" + std::to_string(JLCXX_VERSION_MINOR) + \".x.\"\n";
+  indent(o,4) <<       "\" Note: if the module was installed with the package manager, the Project.toml file \"\n";
+  indent(o,4) <<       "\"of the package is probably missing a compat specification that would have prevented \"\n";
+  indent(o,4) <<       "\"the inconsistency.\");\n";
   indent(o,2) <<     "}\n";
   indent(o,1) <<   "}\n";
   indent(o,0) << "}\n";
@@ -3052,6 +3054,11 @@ CodeTree::gen_apply_stl(std::ostream& o, int indent_depth,
                         const TypeRcd& type_rcd,
                         const std::string& add_type_param) const{
 
+  if(cxxwrap_version_ >= cxxwrap_v0_17){
+    //apply_stl not relevant for CxxWrap 0.17+
+    return o;
+  }
+  
   if(type_rcd.stl){
     indent(o, indent_depth) << "jlcxx::stl::apply_stl<" << add_type_param
                             << ">(jlModule);\n";

src/cxxwrap_version.cpp

@@ -1,15 +1,32 @@
 #include "cxxwrap_version.h"
 
 //according to https://github.com/JuliaInterop/libcxxwrap-julia/releases
-//we have breaking changes with libcxxwrap_jll versions,
+//we have following CxxWrap/libcxxwrap version mapping
 //v0.10.0 (not used by any CxxWrap release),
-//v0.11.0 (CxxWrap v0.14.0),
-//v0.12.0 (CxxWrap v0.15.0)
-//v0.13.0 (not breaking, see https://github.com/JuliaInterop/CxxWrap.jl/releases/tag/v0.16.0)
-std::tuple<long, long> version_libcxxwrap_bounds(long cxxwrap_version){
+//v0.11.0 (CxxWrap v0.14.0)
+//v0.12.0 (CxxWrap v0.15.0) change in generated code
+//v0.13.0 (CxxWrap v0.16.0)
+//v0.14.0 (CxxWrap v0.17.0) change in generated code
+
+
+std::tuple<long, long> version_libcxxwrap_static_bounds(long cxxwrap_version){
   if(cxxwrap_version < cxxwrap_v0_15){
     return std::tuple<long, long>(11*1000, 12*1000);
-  } else{
+  } else if(cxxwrap_version < cxxwrap_v0_17){
     return std::tuple<long, long>(12*1000, 14*1000);
+  } else{
+    return std::tuple<long, long>(14*1000, 15*1000);
+  }
+}
+
+std::tuple<long, long> version_libcxxwrap_runtime_bounds(long cxxwrap_version){
+  if(cxxwrap_version < cxxwrap_v0_15){    //CxxWrap v0.14
+    return std::tuple<long, long>(11*1000, 12*1000);
+  } else if(cxxwrap_version < 16 * 1000){ //CxxWrap v0.15
+    return std::tuple<long, long>(12*1000, 13*1000);
+  } else if(cxxwrap_version < 17 * 1000){ //CxxWrap v0.16
+    return std::tuple<long, long>(13*1000, 14*1000);
+  } else{ //CxxWrap v0.17+
+    return std::tuple<long, long>(14*1000, 15*1000);
   }
 }

src/cxxwrap_version.h

@@ -1,11 +1,16 @@
 #include <tuple>
 
 //Default value for the cxxwrap_version config parameter
-static const char* default_cxxwrap_version = "0.16.0";
+static const char* default_cxxwrap_version = "0.17.0";
 
-static const char* supported_cxxwrap_versions = "0.14.x, 0.15.x, 0.16.x";
+static const char* supported_cxxwrap_versions = "0.14.x, 0.15.x, 0.16.x, 0.17.x";
 
 static int cxxwrap_v0_15 = 15 * 1000; //v0.15
+static int cxxwrap_v0_17 = 17 * 1000; //v0.17
 
-std::tuple<long, long> version_libcxxwrap_bounds(long cxxwrap_version);
+//get libcxxwrap release interval for which code generated code is valid
+std::tuple<long, long> version_libcxxwrap_static_bounds(long cxxwrap_version);
+
+//get libcxxwrap release interval the library was built for
+std::tuple<long, long> version_libcxxwrap_runtime_bounds(long cxxwrap_version);