adapt to changes in libyang 4.7

The regex handling has been changed, and the order of some built-in
modules is now different.

Change-Id: I2b790ad516254af20bb425accbeeea485b7d13d0

Author: jktjkt

.zuul.yaml

@@ -4,13 +4,13 @@
         - f38-gcc-cover:
             required-projects:
               - name: github/CESNET/libyang
-                override-checkout: cesnet/2026-01-16--before-pcre2
+                override-checkout: devel
               - name: github/doctest/doctest
                 override-checkout: v2.3.6
         - f38-clang-asan-ubsan:
             required-projects: &projects
               - name: github/CESNET/libyang
-                override-checkout: cesnet/2026-01-16--before-pcre2
+                override-checkout: devel
               - name: github/doctest/doctest
                 override-checkout: v2.4.11
         - f38-clang-tsan:

CMakeLists.txt

@@ -22,15 +22,11 @@ option(WITH_DOCS "Create and install internal documentation (needs Doxygen)" ${D
 option(BUILD_SHARED_LIBS "By default, shared libs are enabled. Turn off for a static build." ON)
 
 find_package(PkgConfig REQUIRED)
-# FIXME: there's no version for this one...
-pkg_check_modules(LIBYANG REQUIRED libyang>=4.6.1 IMPORTED_TARGET)
+pkg_check_modules(LIBYANG REQUIRED libyang>=4.7.0 IMPORTED_TARGET)
 
 # FIXME from gcc 14.1 on we should be able to use the calendar/time from libstdc++ and thus remove the date dependency
 find_package(date)
 
-# libyang::Regex::~Regex() bypasses libyang and calls out to libpcre directly
-pkg_check_modules(LIBPCRE2 REQUIRED libpcre2-8 IMPORTED_TARGET)
-
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 include(CheckIncludeFileCXX)
@@ -61,7 +57,7 @@ add_library(yang-cpp
     src/utils/newPath.cpp
     )
 
-target_link_libraries(yang-cpp PRIVATE PkgConfig::LIBYANG PkgConfig::LIBPCRE2)
+target_link_libraries(yang-cpp PRIVATE PkgConfig::LIBYANG)
 # We do not offer any long-term API/ABI guarantees. To make stuff easier for downstream consumers,
 # we will be bumping both API and ABI versions very deliberately.
 # There will be no attempts at semver tracking, for example.

src/Regex.cpp

@@ -6,34 +6,28 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-// The following header MUST be included before anything else which "might" use PCRE2
-// because that library uses the preprocessor to prepare the "correct" versions of symbols.
-#include <libyang/tree_data.h>
-
 #include <libyang-cpp/Regex.hpp>
-#include <pcre2.h>
+#include <libyang/tree_data.h>
 #include "utils/exception.hpp"
 
-#define THE_PCRE2_CODE_P reinterpret_cast<pcre2_code*>(this->code)
-#define THE_PCRE2_CODE_P_P reinterpret_cast<pcre2_code**>(&this->code)
-
 namespace libyang {
 
 Regex::Regex(const std::string& pattern)
     : code(nullptr)
 {
-    auto res = ly_pattern_compile(nullptr, pattern.c_str(), THE_PCRE2_CODE_P_P);
+    auto res = ly_pattern_compile(nullptr, pattern.c_str(), &code);
     throwIfError(res, ly_last_logmsg());
 }
 
 Regex::~Regex()
 {
-    pcre2_code_free(THE_PCRE2_CODE_P);
+    ly_pattern_free(code);
+    code = nullptr;
 }
 
 bool Regex::matches(const std::string& input)
 {
-    auto res = ly_pattern_match(nullptr, nullptr /* we have a precompiled pattern */, input.c_str(), input.size(), THE_PCRE2_CODE_P_P);
+    auto res = ly_pattern_match(nullptr, nullptr /* we have a precompiled pattern */, input.c_str(), input.size(), &code);
     if (res == LY_SUCCESS) {
         return true;
     } else if (res == LY_ENOT) {

tests/context.cpp

@@ -372,16 +372,16 @@ TEST_CASE("context")
         ctx->parseModule(valid_yang_model, libyang::SchemaFormat::YANG);
         auto modules = ctx->modules();
         REQUIRE(modules.size() == 9);
-        REQUIRE(modules.at(0).name() == "ietf-yang-metadata");
-        REQUIRE(modules.at(0).ns() == "urn:ietf:params:xml:ns:yang:ietf-yang-metadata");
-        REQUIRE(modules.at(1).name() == "yang");
-        REQUIRE(modules.at(1).ns() == "urn:ietf:params:xml:ns:yang:1");
-        REQUIRE(modules.at(2).name() == "default");
-        REQUIRE(modules.at(2).ns() == "urn:ietf:params:xml:ns:netconf:default:1.0");
-        REQUIRE(modules.at(3).name() == "ietf-inet-types");
-        REQUIRE(modules.at(3).ns() == "urn:ietf:params:xml:ns:yang:ietf-inet-types");
-        REQUIRE(modules.at(4).name() == "ietf-yang-types");
-        REQUIRE(modules.at(4).ns() == "urn:ietf:params:xml:ns:yang:ietf-yang-types");
+        REQUIRE(modules.at(0).name() == "ietf-inet-types");
+        REQUIRE(modules.at(0).ns() == "urn:ietf:params:xml:ns:yang:ietf-inet-types");
+        REQUIRE(modules.at(1).name() == "ietf-yang-types");
+        REQUIRE(modules.at(1).ns() == "urn:ietf:params:xml:ns:yang:ietf-yang-types");
+        REQUIRE(modules.at(2).name() == "ietf-yang-metadata");
+        REQUIRE(modules.at(2).ns() == "urn:ietf:params:xml:ns:yang:ietf-yang-metadata");
+        REQUIRE(modules.at(3).name() == "yang");
+        REQUIRE(modules.at(3).ns() == "urn:ietf:params:xml:ns:yang:1");
+        REQUIRE(modules.at(4).name() == "default");
+        REQUIRE(modules.at(4).ns() == "urn:ietf:params:xml:ns:netconf:default:1.0");
         REQUIRE(modules.at(5).name() == "ietf-yang-schema-mount");
         REQUIRE(modules.at(5).ns() == "urn:ietf:params:xml:ns:yang:ietf-yang-schema-mount");
         REQUIRE(modules.at(6).name() == "ietf-yang-structure-ext");