From c1df59594b8b781a7c867e257747ba1c5d7bbb59 Mon Sep 17 00:00:00 2001 From: Yagiz Nizipli Date: Thu, 30 Jan 2025 18:46:45 -0500 Subject: [PATCH] Fix a regression due to llvm bug (#859) * add more macos versions to test * revert private due to llvm bug --- .github/workflows/macos_install.yml | 8 ++--- include/ada/url_pattern.h | 46 ++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/.github/workflows/macos_install.yml b/.github/workflows/macos_install.yml index fa948c1cb..a5f848043 100644 --- a/.github/workflows/macos_install.yml +++ b/.github/workflows/macos_install.yml @@ -1,4 +1,4 @@ -name: macos (Installation) +name: macOS (Installation) on: pull_request: @@ -22,11 +22,11 @@ concurrency: jobs: macos-build: - runs-on: macos-15 strategy: matrix: - include: - - shared: OFF + shared: [OFF] + runs-on: [macos-13, macos-14, macos-15] + runs-on: ${{matrix.runs-on}} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Prepare diff --git a/include/ada/url_pattern.h b/include/ada/url_pattern.h index 90091b958..1d2e82bf8 100644 --- a/include/ada/url_pattern.h +++ b/include/ada/url_pattern.h @@ -289,15 +289,59 @@ class url_pattern { std::variant input, const std::string_view* base_url, const url_pattern_options* options); - private: + /** + * @private + * We can not make this private due to a LLVM bug. + * Ref: https://github.com/ada-url/ada/pull/859 + */ url_pattern_component protocol_component{}; + /** + * @private + * We can not make this private due to a LLVM bug. + * Ref: https://github.com/ada-url/ada/pull/859 + */ url_pattern_component username_component{}; + /** + * @private + * We can not make this private due to a LLVM bug. + * Ref: https://github.com/ada-url/ada/pull/859 + */ url_pattern_component password_component{}; + /** + * @private + * We can not make this private due to a LLVM bug. + * Ref: https://github.com/ada-url/ada/pull/859 + */ url_pattern_component hostname_component{}; + /** + * @private + * We can not make this private due to a LLVM bug. + * Ref: https://github.com/ada-url/ada/pull/859 + */ url_pattern_component port_component{}; + /** + * @private + * We can not make this private due to a LLVM bug. + * Ref: https://github.com/ada-url/ada/pull/859 + */ url_pattern_component pathname_component{}; + /** + * @private + * We can not make this private due to a LLVM bug. + * Ref: https://github.com/ada-url/ada/pull/859 + */ url_pattern_component search_component{}; + /** + * @private + * We can not make this private due to a LLVM bug. + * Ref: https://github.com/ada-url/ada/pull/859 + */ url_pattern_component hash_component{}; + /** + * @private + * We can not make this private due to a LLVM bug. + * Ref: https://github.com/ada-url/ada/pull/859 + */ bool ignore_case_ = false; };