Update scan lib and use latest API (#354)

Twon · Feb 9, 2025 · a78f740 · a78f740
1 parent 7a3725b
commit a78f740
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -82,7 +82,7 @@ class Morpheus(ConanFile):
         "ms-gsl/4.0.0",
         "rapidjson/cci.20230929",
         "range-v3/0.12.0",
-        "scnlib/2.0.2",
+        "scnlib/4.0.1",
     )
 
     build_requires = (

diff --git a/libraries/application/src/morpheus/application/po/adapters/scannable.hpp b/libraries/application/src/morpheus/application/po/adapters/scannable.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "morpheus/core/conformance/ranges.hpp"
 #include "morpheus/core/conformance/scan.hpp"
 #include "morpheus/core/meta/concepts/scannable.hpp"
 

diff --git a/libraries/core/src/morpheus/core/meta/concepts/scannable.hpp b/libraries/core/src/morpheus/core/meta/concepts/scannable.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "morpheus/core/conformance/ranges.hpp"
 #include "morpheus/core/conformance/scan.hpp"
 #include "morpheus/core/meta/detail/scannable.hpp"
 
@@ -11,6 +12,6 @@ namespace morpheus::meta::concepts
 /// \concept Scannable
 ///     Verifies a given T is a scannable type.
 template <class T, class CharT>
-concept Scannable = detail::ScannableWith<std::remove_reference_t<T>, scan_ns::basic_scan_context<CharT>>;
+concept Scannable = detail::ScannableWith<std::remove_reference_t<T>, scan_ns::basic_scan_context<morpheus::ranges::subrange<const CharT*, const CharT*>, CharT>>;
 
 } // namespace morpheus::meta::concepts
diff --git a/libraries/core/src/morpheus/core/meta/detail/scannable.hpp b/libraries/core/src/morpheus/core/meta/detail/scannable.hpp
@@ -12,7 +12,7 @@ template <class T, class Context, class Scanner = typename Context::template sca
 concept ScannableWith =
     std::semiregular<Scanner> &&
     requires(Scanner& s, const Scanner& cs, T& t, Context& ctx, scan_ns::basic_scan_parse_context<typename Context::char_type> pctx) {
-        { s.parse(pctx) } -> std::same_as<scan_ns::scan_expected<typename decltype(pctx)::iterator>>;
+        { s.parse(pctx) } -> std::same_as<typename decltype(pctx)::iterator>;
         { cs.scan(t, ctx) } -> std::same_as<scan_ns::scan_expected<typename Context::iterator>>;
     };
 

diff --git a/libraries/core/tests/meta/concepts/scannable.tests.cpp b/libraries/core/tests/meta/concepts/scannable.tests.cpp
@@ -1,3 +1,4 @@
+#include "morpheus/core/conformance/ranges.hpp"
 #include "morpheus/core/conformance/scan.hpp"
 #include "morpheus/core/meta/concepts/scannable.hpp"
 
@@ -35,8 +36,8 @@ class UnscannableType;
 
 TEST_CASE("Meta concept scannable_with verifies a given type customises scan_ns::scanner", "[morpheus.meta.concepts.scannable_with]")
 {
-    STATIC_REQUIRE(!detail::ScannableWith<UnscannableType, scan_ns::basic_scan_context<char>>);
-    STATIC_REQUIRE(detail::ScannableWith<ScannableType, scan_ns::basic_scan_context<char>>);
+    STATIC_REQUIRE(!detail::ScannableWith<UnscannableType, scan_ns::basic_scan_context<morpheus::ranges::subrange<char*, char*>, char>>);
+    STATIC_REQUIRE(detail::ScannableWith<ScannableType, scan_ns::basic_scan_context<morpheus::ranges::subrange<char*, char*>, char>>);
 }
 
 TEST_CASE("Meta concept scannable_with verifies a given type customises scan_ns::scanner", "[morpheus.meta.concepts.scannable]")