From b5b66923e385a660f1abf3dea396d55f9341c115 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 26 May 2015 18:57:27 +0000 Subject: [PATCH] Add tests to ensure that string/vector/array have contiguous iterators - which they did. Mark N4284 as complete git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@238233 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../sequences/array/contiguous.pass.cpp} | 19 +++++++ .../sequences/vector/contiguous.pass.cpp | 52 ++++++++++++++++++ .../string.require/contiguous.pass.cpp | 53 +++++++++++++++++++ www/cxx1z_status.html | 2 +- 4 files changed, 125 insertions(+), 1 deletion(-) rename test/std/{strings/basic.string/string.require/nothing_to_do.pass.cpp => containers/sequences/array/contiguous.pass.cpp} (50%) create mode 100644 test/std/containers/sequences/vector/contiguous.pass.cpp create mode 100644 test/std/strings/basic.string/string.require/contiguous.pass.cpp diff --git a/test/std/strings/basic.string/string.require/nothing_to_do.pass.cpp b/test/std/containers/sequences/array/contiguous.pass.cpp similarity index 50% rename from test/std/strings/basic.string/string.require/nothing_to_do.pass.cpp rename to test/std/containers/sequences/array/contiguous.pass.cpp index b58f5c55b..27933b0c5 100644 --- a/test/std/strings/basic.string/string.require/nothing_to_do.pass.cpp +++ b/test/std/containers/sequences/array/contiguous.pass.cpp @@ -7,6 +7,25 @@ // //===----------------------------------------------------------------------===// +// + +// An array is a contiguous container + +#include +#include + +template +void test_contiguous ( const C &c ) +{ + for ( size_t i = 0; i < c.size(); ++i ) + assert ( *(c.begin() + i) == *(std::addressof(*c.begin()) + i)); +} + int main() { + { + typedef double T; + typedef std::array C; + test_contiguous (C()); + } } diff --git a/test/std/containers/sequences/vector/contiguous.pass.cpp b/test/std/containers/sequences/vector/contiguous.pass.cpp new file mode 100644 index 000000000..f685986cf --- /dev/null +++ b/test/std/containers/sequences/vector/contiguous.pass.cpp @@ -0,0 +1,52 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// An vector is a contiguous container + +#include +#include + +#include "test_allocator.h" +#include "min_allocator.h" + +template +void test_contiguous ( const C &c ) +{ + for ( size_t i = 0; i < c.size(); ++i ) + assert ( *(c.begin() + i) == *(std::addressof(*c.begin()) + i)); +} + +int main() +{ + { + typedef int T; + typedef std::vector C; + test_contiguous(C()); + test_contiguous(C(3, 5)); + } + + { + typedef double T; + typedef test_allocator A; + typedef std::vector C; + test_contiguous(C(A(3))); + test_contiguous(C(7, 9.0, A(5))); + } +#if __cplusplus >= 201103L + { + typedef double T; + typedef min_allocator A; + typedef std::vector C; + test_contiguous(S(A{})); + test_contiguous(S(9, 11.0, A{})); + } +#endif +} diff --git a/test/std/strings/basic.string/string.require/contiguous.pass.cpp b/test/std/strings/basic.string/string.require/contiguous.pass.cpp new file mode 100644 index 000000000..ca31ace0e --- /dev/null +++ b/test/std/strings/basic.string/string.require/contiguous.pass.cpp @@ -0,0 +1,53 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// An string is a contiguous container + +#include +#include + +#include "test_allocator.h" +#include "min_allocator.h" + + +template +void test_contiguous ( const C &c ) +{ + for ( size_t i = 0; i < c.size(); ++i ) + assert ( *(c.begin() + i) == *(std::addressof(*c.begin()) + i)); +} + +int main() +{ + { + typedef std::string S; + test_contiguous(S()); + test_contiguous(S("1")); + test_contiguous(S("1234567890123456789012345678901234567890123456789012345678901234567890")); + } + + { + typedef test_allocator A; + typedef std::basic_string, A> S; + test_contiguous(S(A(3))); + test_contiguous(S("1", A(5))); + test_contiguous(S("1234567890123456789012345678901234567890123456789012345678901234567890", A(7))); + } +#if __cplusplus >= 201103L + { + typedef min_allocator A; + typedef std::basic_string, A> S; + test_contiguous(S(A{})); + test_contiguous(S("1", A())); + test_contiguous(S("1234567890123456789012345678901234567890123456789012345678901234567890", A())); + } +#endif +} diff --git a/www/cxx1z_status.html b/www/cxx1z_status.html index e4a4333fc..a2365e72a 100644 --- a/www/cxx1z_status.html +++ b/www/cxx1z_status.html @@ -60,7 +60,7 @@ N4277LWGTriviallyCopyable reference_wrapper.UrbanaComplete3.2 N4279LWGImproved insertion interface for unique-key maps.Urbana N4280LWGNon-member size() and moreUrbanaComplete3.6 - N4284LWGContiguous Iterators.Urbana + N4284LWGContiguous Iterators.UrbanaComplete3.6 N4285CWGCleanup for exception-specification and throw-expression.Urbana N4387LWGimproving pair and tupleLenexa