Skip to content

Implement LWG-3204 sub_match::swap only swaps the base class #3494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stephan T. Lavavej (StephanTLavavej) merged 3 commits into from
Feb 26, 2023
Merged

Implement LWG-3204 sub_match::swap only swaps the base class #3494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8495361
Implement LWG-3204 `sub_match::swap` only swaps the base class
fsb4000 Feb 23, 2023
8649a92
check noexcept
fsb4000 Feb 23, 2023
13a8cc2
remove unneeded code
fsb4000 Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions stl/inc/regex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,11 @@ public:
return _Compare(_Ptr, _Traits::length(_Ptr));
}

void swap(sub_match& _Other) noexcept(_Is_nothrow_swappable<_BidIt>::value) {
this->_Mybase::swap(_Other);

@StephanTLavavej Stephan T. Lavavej (StephanTLavavej) Feb 23, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No change requested: As I mentioned on Discord, I think only _Mybase::swap(_Other); should be necessary here, but I can't bring myself to reset testing for this, given that it's not harmful and it follows the accepted resolution.

_STD swap(matched, _Other.matched);
}

int _Compare(const value_type* const _Ptr, const _Size_type _Count) const {
// compare *this to array [_Ptr, _Ptr + _Count)
const _Mybase _Range(_Effective_range());
Expand Down
31 changes: 31 additions & 0 deletions tests/std/tests/Dev09_173612_tr1_regex_leak/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
// Copyright (c) Microsoft Corporation.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <cassert>
#include <cstddef>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <locale>
#include <new>
#include <regex>

using namespace std;

#define STATIC_ASSERT(...) static_assert(__VA_ARGS__, #__VA_ARGS__)

#pragma warning(disable : 28251) // Inconsistent annotation for 'new': this instance has no annotations.

const int N = 1000;
Expand Down Expand Up @@ -166,6 +170,31 @@ void test(const char* s) {
}
}

// Also test LWG-3204: sub_match::swap only swaps the base class
void test_lwg3204() {
csub_match sm1{};
sm1.first = "hello";
sm1.second = "world";
sm1.matched = true;

csub_match sm2{};
sm2.first = "fluffy";
sm2.second = "cat";
sm2.matched = false;

sm1.swap(sm2);

assert(strcmp(sm1.first, "fluffy") == 0);
assert(strcmp(sm1.second, "cat") == 0);
assert(!sm1.matched);

assert(strcmp(sm2.first, "hello") == 0);
assert(strcmp(sm2.second, "world") == 0);
assert(sm2.matched);

STATIC_ASSERT(noexcept(sm1.swap(sm2)));
}


int main() {
// Perform any locale allocations before we begin the tests.
Expand Down Expand Up @@ -207,4 +236,6 @@ int main() {
test("Huck[[:alpha:]]+");
test("Tom|Sawyer|Huckleberry|Finn");
test("Twain");

test_lwg3204();
}