V2 cpp20 (#148)

* Renamed a lot of files to make sure they're in the right location when I get the big C++20 move under way

* Added v2 tests

* Added constexpr wherever it compiles

* Added filesystem and json tests to v2

* Tinkering and simplifying

* More constexpr improvements

* Started using concepts

* Refactored string_traits to use C++20 concepts

* Using nested namespaces

* Added build switch to enable v2

* Replaced deprecated header

* Updated percent encoding functions

* Update CMake minimum version

* Updated Git CI configuration

* Updated Git CI configuration, enabling v2

* Updated IDNA table tests that were not compiling on CI using C++20 compiler

* Fix test failure caused by misunderstanding of return type of path::generic_u8string when changing from C++17 to C++20

* Not all compilers like constexpr destructors

* Added GCC 10 tests to CI

* Fixed issue with member function accessor names in host class

* Not everything can be constexpr yet

Author: glynos

.github/workflows/skyr-url-ci.yml

@@ -1,10 +1,10 @@
 name: skyr-url CI
 
 # Trigger on pushes to all branches and for all pull-requests
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 env:
-  CMAKE_VERSION: 3.16.2
+  CMAKE_VERSION: 3.17.3
   NINJA_VERSION: 1.9.0
 
 jobs:
@@ -77,6 +77,37 @@ jobs:
             cxx_standard: 20
           }
 
+
+          # GCC-10
+          - {
+            name: "Linux GCC 10 Debug (C++17)", artifact: "Linux.tar.xz",
+            os: ubuntu-latest,
+            build_type: Debug,
+            cc: "gcc-10", cxx: "g++-10",
+            cxx_standard: 17
+          }
+          - {
+            name: "Linux GCC 10 Release (C++17)", artifact: "Linux.tar.xz",
+            os: ubuntu-latest,
+            build_type: RelWithDebInfo,
+            cc: "gcc-10", cxx: "g++-10",
+            cxx_standard: 17
+          }
+          - {
+            name: "Linux GCC 10 Debug (C++20)", artifact: "Linux.tar.xz",
+            os: ubuntu-latest,
+            build_type: Debug,
+            cc: "gcc-10", cxx: "g++-10",
+            cxx_standard: 20,
+          }
+          - {
+            name: "Linux GCC 10 Release (C++20)", artifact: "Linux.tar.xz",
+            os: ubuntu-latest,
+            build_type: RelWithDebInfo,
+            cc: "gcc-10", cxx: "g++-10",
+            cxx_standard: 20,
+          }
+
           # Clang-8
           - {
             name: "Linux Clang 8 Debug (C++17)", artifact: "Linux.tar.xz",
@@ -153,6 +184,22 @@ jobs:
             cxx_standard: 20,
           }
 
+          # Clang-11
+          - {
+            name: "Linux Clang 11 Debug (C++20)", artifact: "Linux.tar.xz",
+            os: ubuntu-latest,
+            build_type: Debug,
+            cc: "clang-11", cxx: "clang++-11",
+            cxx_standard: 20,
+          }
+          - {
+            name: "Linux Clang 11 Release (C++20)", artifact: "Linux.tar.xz",
+            os: ubuntu-latest,
+            build_type: RelWithDebInfo,
+            cc: "clang-11", cxx: "clang++-11",
+            cxx_standard: 20,
+          }
+
           # AppleClang
           - {
             name: "macOS Clang Debug (C++17)", artifact: "macOS.tar.xz",
@@ -270,6 +317,16 @@ jobs:
           chmod +x llvm.sh
           sudo ./llvm.sh 10
 
+      - name: Install Clang 11
+        id: install_clang_11
+        if: startsWith(matrix.config.os, 'ubuntu') && ( matrix.config.cxx == 'clang++-11' )
+        shell: bash
+        working-directory: ${{ env.HOME }}
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh 11
+
       - name: Install vcpkg (Linux)
         id: vcpkg_linux
         if: startsWith(matrix.config.os, 'ubuntu')
@@ -339,6 +396,17 @@ jobs:
           endif()
           set(ENV{PATH} "$ENV{GITHUB_WORKSPACE}${path_separator}$ENV{PATH}")
 
+          set(BUILD_V2 OFF)
+          if ("${{ matrix.config.name }}" STREQUAL "Windows MSVC 2019 Debug (C++20)" OR
+              "${{ matrix.config.name }}" STREQUAL "Windows MSVC 2019 Release (C++20)" OR
+              "${{ matrix.config.name }}" STREQUAL "Linux GCC 10 Debug (C++20)" OR
+              "${{ matrix.config.name }}" STREQUAL "Linux GCC 10 Release (C++20)" OR
+              "${{ matrix.config.name }}" STREQUAL "Linux Clang 11 Debug (C++20)" OR
+              "${{ matrix.config.name }}" STREQUAL "Linux Clang 11 Release (C++20)"
+          )
+            set(BUILD_V2 ON)
+          endif()
+
           execute_process(
             COMMAND ${{ steps.cmake_and_ninja.outputs.cmake_dir }}/cmake
               -S .
@@ -349,6 +417,7 @@ jobs:
               -D skyr_BUILD_TESTS=ON
               -D skyr_BUILD_DOCS=OFF
               -D skyr_BUILD_EXAMPLES=OFF
+              -D skyr_BUILD_V2=${BUILD_V2}
               -D CMAKE_BUILD_TYPE=${{ matrix.config.build_type }}
               -D CMAKE_TOOLCHAIN_FILE=$ENV{GITHUB_WORKSPACE}/vcpkg/scripts/buildsystems/vcpkg.cmake
               -D CMAKE_INSTALL_PREFIX=$ENV{GITHUB_WORKSPACE}/install

CMakeLists.txt

@@ -4,11 +4,11 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 
 
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.17)
 
 project(
         skyr-url
-        VERSION 1.13.0
+        VERSION 2.0.0
         HOMEPAGE_URL https://cpp-netlib.github.io/url
         DESCRIPTION "A C++ library that implements the WhatWG URL specification"
         LANGUAGES CXX
@@ -25,9 +25,14 @@ option(skyr_USE_STATIC_CRT "Use static C Runtime library (/MT or MTd)." ON)
 option(skyr_BUILD_WITH_LLVM_LIBCXX "Instruct Clang to use LLVM's implementation of C++ standard library" OFF)
 option(skyr_ENABLE_FILESYSTEM_FUNCTIONS "Enable functions to convert URL to std::filesystem::path" ON)
 option(skyr_ENABLE_JSON_FUNCTIONS "Enable functions to convert URL components to JSON" ON)
+option(skyr_BUILD_V2 "Build v2, which uses C++20 features" ON)
 
 set(CMAKE_VERBOSE_MAKEFILE true)
-set(CMAKE_CXX_STANDARD 17)
+if (skyr_BUILD_V2)
+    set(CMAKE_CXX_STANDARD 20)
+else()
+    set(CMAKE_CXX_STANDARD 17)
+endif()
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -67,16 +72,16 @@ endif()
 
 # Add an alias for projects that use skyr-url as a dependency
 if (NOT CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
-    add_library(skyr::skyr-url ALIAS skyr-url)
+    add_library(skyr::skyr-url ALIAS skyr-url-v1)
     if (skyr_ENABLE_FILESYSTEM_FUNCTIONS)
-        add_library(skyr::skyr-filesystem ALIAS skyr-filesystem)
+        add_library(skyr::skyr-filesystem ALIAS skyr-filesystem-v1)
     endif()
     if (skyr_ENABLE_JSON_FUNCTIONS)
-        add_library(skyr::skyr-json ALIAS skyr-json)
+        add_library(skyr::skyr-json ALIAS skyr-json-v1)
     endif()
 endif()
 
-# Install
+## Install
 include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
 
@@ -90,12 +95,12 @@ write_basic_package_version_file(
         COMPATIBILITY SameMajorVersion
         ARCH_INDEPENDENT)
 
-set(skyr_TARGETS skyr-url)
+set(skyr_TARGETS skyr-url-v1)
 if (skyr_ENABLE_FILESYSTEM_FUNCTIONS)
-    list(APPEND skyr_TARGETS skyr-filesystem)
+    list(APPEND skyr_TARGETS skyr-filesystem-v1)
 endif()
 if (skyr_ENABLE_JSON_FUNCTIONS)
-    list(APPEND skyr_TARGETS skyr-json)
+    list(APPEND skyr_TARGETS skyr-json-v1)
 endif()
 
 install(TARGETS ${skyr_TARGETS}

examples/CMakeLists.txt

@@ -1,60 +1 @@
-# Copyright (c) Glyn Matthews 2018-20.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-include(${PROJECT_SOURCE_DIR}/cmake/skyr-url-functions.cmake)
-
-set(full_warnings $<BOOL:${skyr_FULL_WARNINGS}>)
-set(warnings_as_errors $<BOOL:${skyr_WARNINGS_AS_ERRORS}>)
-set(no_exceptions $<BOOL:${skyr_BUILD_WITHOUT_EXCEPTIONS}>)
-set(no_rtti $<BOOL:${skyr_BUILD_WITHOUT_RTTI}>)
-
-set(gnu $<CXX_COMPILER_ID:GNU>)
-set(clang $<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>)
-set(libcxx $<AND:${clang},$<BOOL:${skyr_BUILD_WITH_LLVM_LIBCXX}>>)
-set(msvc $<CXX_COMPILER_ID:MSVC>)
-
-foreach(
-        file_name
-        example_01.cpp
-        example_02.cpp
-        example_03.cpp
-        example_04.cpp
-        example_05.cpp
-        example_06.cpp
-        example_07.cpp
-        example_08.cpp
-        example_09.cpp
-        example_10.cpp
-        example_11.cpp
-)
-    skyr_remove_extension(${file_name} example)
-    add_executable(${example} ${file_name})
-    add_dependencies(${example} skyr-url)
-    target_compile_options(
-            ${example}
-            PRIVATE
-            $<$<AND:$<OR:${gnu},${clang}>,${full_warnings}>:-Wall>
-            $<$<AND:$<OR:${gnu},${clang}>,${warnings_as_errors}>:-Werror>
-            $<$<AND:$<OR:${gnu},${clang}>,${no_exceptions}>:-fno-exceptions>
-            $<$<AND:$<OR:${gnu},${clang}>,${no_rtti}>:-fno-rtti>
-            $<$<AND:$<OR:${gnu},${clang}>,$<CONFIG:MinSizeRel>>:-flto>
-            $<${libcxx}:-stdlib=libc++>
-
-            $<$<AND:${msvc},${full_warnings}>:/W4>
-            $<$<AND:${msvc},${warnings_as_errors}>:/WX>
-            $<$<AND:${msvc},$<NOT:${no_exceptions}>>:/EHsc>
-            $<$<AND:${msvc},${no_rtti}>:/GR->
-    )
-    target_link_libraries(
-            ${example}
-            PRIVATE
-            skyr-url
-    )
-    set_target_properties(
-            ${example}
-            PROPERTIES
-            RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/examples
-    )
-endforeach()
+add_subdirectory(v1)

examples/v1/CMakeLists.txt

@@ -0,0 +1,60 @@
+# Copyright (c) Glyn Matthews 2018-20.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+include(${PROJECT_SOURCE_DIR}/cmake/skyr-url-functions.cmake)
+
+set(full_warnings $<BOOL:${skyr_FULL_WARNINGS}>)
+set(warnings_as_errors $<BOOL:${skyr_WARNINGS_AS_ERRORS}>)
+set(no_exceptions $<BOOL:${skyr_BUILD_WITHOUT_EXCEPTIONS}>)
+set(no_rtti $<BOOL:${skyr_BUILD_WITHOUT_RTTI}>)
+
+set(gnu $<CXX_COMPILER_ID:GNU>)
+set(clang $<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>)
+set(libcxx $<AND:${clang},$<BOOL:${skyr_BUILD_WITH_LLVM_LIBCXX}>>)
+set(msvc $<CXX_COMPILER_ID:MSVC>)
+
+foreach(
+        file_name
+        example_01.cpp
+        example_02.cpp
+        example_03.cpp
+        example_04.cpp
+        example_05.cpp
+        example_06.cpp
+        example_07.cpp
+        example_08.cpp
+        example_09.cpp
+        example_10.cpp
+        example_11.cpp
+)
+    skyr_remove_extension(${file_name} example)
+    add_executable(${example} ${file_name})
+    add_dependencies(${example} skyr-url-v1)
+    target_compile_options(
+            ${example}
+            PRIVATE
+            $<$<AND:$<OR:${gnu},${clang}>,${full_warnings}>:-Wall>
+            $<$<AND:$<OR:${gnu},${clang}>,${warnings_as_errors}>:-Werror>
+            $<$<AND:$<OR:${gnu},${clang}>,${no_exceptions}>:-fno-exceptions>
+            $<$<AND:$<OR:${gnu},${clang}>,${no_rtti}>:-fno-rtti>
+            $<$<AND:$<OR:${gnu},${clang}>,$<CONFIG:MinSizeRel>>:-flto>
+            $<${libcxx}:-stdlib=libc++>
+
+            $<$<AND:${msvc},${full_warnings}>:/W4>
+            $<$<AND:${msvc},${warnings_as_errors}>:/WX>
+            $<$<AND:${msvc},$<NOT:${no_exceptions}>>:/EHsc>
+            $<$<AND:${msvc},${no_rtti}>:/GR->
+    )
+    target_link_libraries(
+            ${example}
+            PRIVATE
+            skyr-url-v1
+    )
+    set_target_properties(
+            ${example}
+            PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/examples
+    )
+endforeach()

examples/example_01.cpp renamed to examples/v1/example_01.cpp

@@ -8,7 +8,7 @@
 
 #include <locale>
 #include <string>
-#include <range/v3/distance.hpp>
+#include <range/v3/iterator/operations.hpp>
 #include <range/v3/algorithm/find_if_not.hpp>
 #include <range/v3/algorithm/remove_if.hpp>
 #include <range/v3/view/reverse.hpp>

examples/example_01.md renamed to examples/v1/example_01.md

@@ -15,7 +15,7 @@
 #include <range/v3/algorithm/find_if_not.hpp>
 #include <range/v3/action/erase.hpp>
 #include <range/v3/iterator.hpp>
-#include <range/v3/distance.hpp>
+#include <range/v3/iterator/operations.hpp>
 #include <range/v3/range/conversion.hpp>
 #include <range/v3/range/access.hpp>
 #include <range/v3/view/join.hpp>

examples/example_02.cpp renamed to examples/v1/example_02.cpp

@@ -32,7 +32,7 @@ enum class path_errc {
 /// \param path A filesystem path
 /// \returns a url object or an error on failure
 inline auto from_path(const stdfs::path &path) -> tl::expected<url, url_parse_errc> {
-  return make_url("file://" + path.generic_u8string());
+  return make_url("file://" + path.generic_string());
 }
 
 /// Converts a URL pathname to a filesystem path

examples/example_02.md renamed to examples/v1/example_02.md

@@ -28,7 +28,7 @@ class iterator_value<T*> {
 
 template <class Range>
 using iterator_value_t = typename iterator_value<Range>::type;
-}  // namespace unicode::traits
+}  // namespace unicode::concepts
 }  // namespace v1
 }  // namespace skyr
 

examples/example_03.cpp renamed to examples/v1/example_03.cpp

@@ -28,7 +28,7 @@ class range_iterator<T[N]> { // NOLINT
 
 template <class Range>
 using range_iterator_t = typename range_iterator<Range>::type;
-}  // namespace unicode::traits
+}  // namespace unicode::concepts
 }  // namespace v1
 }  // namespace skyr
 

examples/example_03.md renamed to examples/v1/example_03.md

@@ -28,7 +28,7 @@ class range_value<T[N]> { // NOLINT
 
 template <class Range>
 using range_value_t = typename range_value<Range>::type;
-}  // namespace unicode::traits
+}  // namespace unicode::concepts
 }  // namespace v1
 }  // namespace skyr
 

examples/example_04.cpp renamed to examples/v1/example_04.cpp

@@ -145,12 +145,12 @@ class url {
   /// Copy assignment operator
   /// \param other Another `url` object
   /// \return *this
-  url &operator=(const url &other) = default;
+  auto operator=(const url &other) -> url & = default;
 
   /// Move assignment operator
   /// \param other Another `url` object
   /// \return *this
-  url &operator=(url&& other) = default;
+  auto operator=(url&& other) -> url & = default;
 
   /// Destructor
   ~url() = default;