Compare commits

...

14 Commits

Author SHA1 Message Date
Peter Dimov
f017dac435 Enable failing tests 2025-01-26 21:26:46 +02:00
Peter Dimov
567ba40840 Add a dummy element to array<T, 0> to enable initialization with = {{}} 2025-01-26 21:15:39 +02:00
Peter Dimov
29700ff270 Update revision history 2025-01-26 21:02:26 +02:00
Peter Dimov
b147799665 Remove local hash_value overload; boost::hash supports array-like types natively. 2025-01-26 20:35:19 +02:00
Peter Dimov
acef60446a Update revision history 2025-01-26 20:31:53 +02:00
Peter Dimov
3d9f39814c Re-enable failing tests 2025-01-26 19:23:41 +02:00
Peter Dimov
89f09e33f1 Change array<T, 0>::begin() to return nullptr and make it constexpr. 2025-01-26 19:21:39 +02:00
Peter Dimov
43326390d9 Reenable failing test 2025-01-26 08:19:00 +02:00
Peter Dimov
c95d855018 Remove obsolete workaround from failed_rangecheck 2025-01-26 08:09:41 +02:00
Peter Dimov
0a72026887 Update revision history 2025-01-26 06:09:05 +02:00
Peter Dimov
d2c295b85f Add array_access_test_cx2.cpp 2025-01-26 05:53:09 +02:00
Peter Dimov
324827cfc0 Add array_assign_test_cx.cpp 2025-01-26 05:45:36 +02:00
Peter Dimov
9253e8f1af Add array_fill_test_cx.cpp 2025-01-26 05:41:56 +02:00
Peter Dimov
cd0532b8fa Remove inclusion of <algorithm> 2025-01-26 05:08:42 +02:00
14 changed files with 213 additions and 54 deletions

View File

@@ -14,3 +14,8 @@ http://www.boost.org/LICENSE_1_0.txt
* Converted documentation to AsciiDoc (Christian Mazakas).
* Added `noexcept` and `constexpr` as appropriate.
* Marked obsolete functions as deprecated.
* Removed obsolete compiler workarounds.
* Changed `array<T, 0>::begin()`, `cbegin()`, `end()`, `cend()` to return `nullptr`, enabling `constexpr`.
This matches the behavior of `std::array`.
* Removed local `hash_value` overload; `boost::hash` supports array-like types natively.

View File

@@ -37,15 +37,14 @@
#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
# pragma warning(push)
# pragma warning(disable:4996) // 'std::equal': Function call with parameters that may be unsafe
# pragma warning(disable:4510) // boost::array<T,N>' : default constructor could not be generated
# pragma warning(disable:4610) // warning C4610: class 'boost::array<T,N>' can never be instantiated - user defined constructor required
# pragma warning(disable:4512) // boost::array<T,N>' : assignment operator could not be generated
# pragma warning(disable:4610) // class 'boost::array<T,N>' can never be instantiated - user defined constructor required
#endif
#include <boost/assert.hpp>
#include <boost/static_assert.hpp>
#include <boost/throw_exception.hpp>
#include <algorithm>
#include <iterator>
#include <stdexcept>
#include <utility>
@@ -158,15 +157,29 @@ namespace boost {
// assignment with type conversion
template <typename T2>
array<T,N>& operator= (const array<T2,N>& rhs) {
std::copy(rhs.begin(),rhs.end(), begin());
array<T,N>& operator= (const array<T2,N>& rhs)
{
for( std::size_t i = 0; i < N; ++i )
{
elems[ i ] = rhs.elems[ i ];
}
return *this;
}
// fill with one value
BOOST_CXX14_CONSTEXPR void fill (const T& value)
{
std::fill_n(begin(),size(),value);
// using elems[ 0 ] as a temporary copy
// avoids the aliasing opportunity betw.
// `value` and `elems`
elems[ 0 ] = value;
for( std::size_t i = 1; i < N; ++i )
{
elems[ i ] = elems[ 0 ];
}
}
// an obsolete synonym for fill
@@ -182,6 +195,8 @@ namespace boost {
template< class T >
class array< T, 0 > {
public:
struct {} elems; // enables initialization with = {{}}
public:
// type definitions
@@ -194,13 +209,13 @@ namespace boost {
typedef std::ptrdiff_t difference_type;
// iterator support
iterator begin() BOOST_NOEXCEPT { return iterator( reinterpret_cast< T * >( this ) ); }
const_iterator begin() const BOOST_NOEXCEPT { return const_iterator( reinterpret_cast< const T * >( this ) ); }
const_iterator cbegin() const BOOST_NOEXCEPT { return const_iterator( reinterpret_cast< const T * >( this ) ); }
BOOST_CXX14_CONSTEXPR iterator begin() BOOST_NOEXCEPT { return data(); }
BOOST_CONSTEXPR const_iterator begin() const BOOST_NOEXCEPT { return data(); }
BOOST_CONSTEXPR const_iterator cbegin() const BOOST_NOEXCEPT { return data(); }
iterator end() BOOST_NOEXCEPT { return begin(); }
const_iterator end() const BOOST_NOEXCEPT { return begin(); }
const_iterator cend() const BOOST_NOEXCEPT { return cbegin(); }
BOOST_CXX14_CONSTEXPR iterator end() BOOST_NOEXCEPT { return begin(); }
BOOST_CONSTEXPR const_iterator end() const BOOST_NOEXCEPT { return begin(); }
BOOST_CONSTEXPR const_iterator cend() const BOOST_NOEXCEPT { return cbegin(); }
// reverse iterator support
typedef std::reverse_iterator<iterator> reverse_iterator;
@@ -290,19 +305,10 @@ namespace boost {
BOOST_CXX14_CONSTEXPR void fill (const T& ) {}
// check range (may be private because it is static)
static reference failed_rangecheck () {
std::out_of_range e("attempt to access element of an empty array");
boost::throw_exception(e);
#if defined(BOOST_NO_EXCEPTIONS) || (!defined(BOOST_MSVC) && !defined(__PATHSCALE__))
//
// We need to return something here to keep
// some compilers happy: however we will never
// actually get here....
//
static T placeholder;
return placeholder;
#endif
}
static reference failed_rangecheck ()
{
boost::throw_exception( std::out_of_range( "attempt to access element of an empty array" ) );
}
};
// comparisons
@@ -391,14 +397,6 @@ namespace boost {
return arg.elems;
}
template <class It> std::size_t hash_range(It, It);
template<class T, std::size_t N>
std::size_t hash_value(const array<T,N>& arr)
{
return boost::hash_range(arr.begin(), arr.end());
}
template <size_t Idx, typename T, size_t N>
BOOST_CXX14_CONSTEXPR T &get(boost::array<T,N> &arr) BOOST_NOEXCEPT {
BOOST_STATIC_ASSERT_MSG ( Idx < N, "boost::get<>(boost::array &) index out of range" );

View File

@@ -59,6 +59,9 @@ compile array_get_test_cx.cpp ;
# C++14 constexpr
compile array_assign_test_cx.cpp ;
compile array_access_test_cx2.cpp ;
compile array_fill_test_cx.cpp ;
compile array_eq_test_cx.cpp ;
compile array_lt_test_cx.cpp ;

View File

@@ -5,11 +5,11 @@
* http://www.boost.org/LICENSE_1_0.txt)
*/
#include <boost/array.hpp>
#include <boost/core/lightweight_test_trait.hpp>
#include <algorithm>
#include <string>
#include <iostream>
#include <boost/array.hpp>
#include <boost/core/lightweight_test_trait.hpp>
namespace {
@@ -44,7 +44,12 @@ void RunTests()
BOOST_TEST ( const_test_case.begin() == const_test_case.end());
BOOST_TEST ( const_test_case.cbegin() == const_test_case.cend());
BOOST_TEST ( test_case.begin() != const_test_case.begin() );
// BOOST_TEST ( test_case.begin() != const_test_case.begin() );
//
// TR1 specified that begin() must return a unique value for zero-sized
// arrays. However, this makes constexpr unimplementable, and all standard
// libraries have converged on using nullptr instead (see LWG issue 2157.)
if( test_case.data() == const_test_case.data() ) {
// Value of data is unspecified in TR1, so no requirement this test pass or fail
// However, it must compile!

View File

@@ -0,0 +1,45 @@
// Copyright 2025 Peter Dimov
// Distributed under the Boost Software License, Version 1.0.
// https://www.boost.org/LICENSE_1_0.txt)
#include <boost/array.hpp>
#include <boost/config.hpp>
#include <boost/config/pragma_message.hpp>
#include <boost/config/workaround.hpp>
#include <cstddef>
#if defined(BOOST_NO_CXX14_CONSTEXPR)
BOOST_PRAGMA_MESSAGE("Test skipped because BOOST_NO_CXX14_CONSTEXPR is defined")
#else
#define STATIC_ASSERT(...) static_assert(__VA_ARGS__, #__VA_ARGS__)
template<class T, std::size_t N> constexpr boost::array<T, N> modified( boost::array<T, N> a1 )
{
a1.front() = 1;
a1[ 1 ] = 2;
a1.at( 2 ) = 3;
a1.back() = 4;
return a1;
}
template<class T> void test1()
{
constexpr boost::array<T, 4> a1 = {};
constexpr boost::array<T, 4> a2 = modified( a1 );
STATIC_ASSERT( a2[0] == 1 );
STATIC_ASSERT( a2[1] == 2 );
STATIC_ASSERT( a2[2] == 3 );
STATIC_ASSERT( a2[3] == 4 );
}
int main()
{
test1<int>();
}
#endif

View File

@@ -0,0 +1,54 @@
// Copyright 2025 Peter Dimov
// Distributed under the Boost Software License, Version 1.0.
// https://www.boost.org/LICENSE_1_0.txt)
#include <boost/array.hpp>
#include <boost/config.hpp>
#include <boost/config/pragma_message.hpp>
#include <boost/config/workaround.hpp>
#include <cstddef>
#if defined(BOOST_NO_CXX14_CONSTEXPR)
BOOST_PRAGMA_MESSAGE("Test skipped because BOOST_NO_CXX14_CONSTEXPR is defined")
#else
#define STATIC_ASSERT(...) static_assert(__VA_ARGS__, #__VA_ARGS__)
template<class T, std::size_t N> constexpr boost::array<T, N> assigned( boost::array<T, N> const& a1 )
{
boost::array<T, N> a2 = {};
a2 = a1;
return a2;
}
template<class T> void test1()
{
constexpr boost::array<T, 4> a1 = {{ 1, 2, 3, 4 }};
constexpr boost::array<T, 4> a2 = assigned( a1 );
STATIC_ASSERT( a1[0] == a2[0] );
STATIC_ASSERT( a1[1] == a2[1] );
STATIC_ASSERT( a1[2] == a2[2] );
STATIC_ASSERT( a1[3] == a2[3] );
}
template<class T> void test2()
{
constexpr boost::array<T, 0> a1 = {};
constexpr boost::array<T, 0> a2 = assigned( a1 );
(void)a1;
(void)a2;
}
int main()
{
test1<int>();
test2<int>();
}
#endif

View File

@@ -44,11 +44,11 @@ template<class T> void test4()
int main()
{
// test1<int, 0>();
test1<int, 0>();
test1<int, 1>();
test1<int, 7>();
// test1<int const, 0>();
test1<int const, 0>();
test1<int const, 1>();
test1<int const, 7>();

View File

@@ -0,0 +1,51 @@
// Copyright 2025 Peter Dimov
// Distributed under the Boost Software License, Version 1.0.
// https://www.boost.org/LICENSE_1_0.txt)
#include <boost/array.hpp>
#include <boost/config.hpp>
#include <boost/config/pragma_message.hpp>
#include <boost/config/workaround.hpp>
#include <cstddef>
#if defined(BOOST_NO_CXX14_CONSTEXPR)
BOOST_PRAGMA_MESSAGE("Test skipped because BOOST_NO_CXX14_CONSTEXPR is defined")
#else
#define STATIC_ASSERT(...) static_assert(__VA_ARGS__, #__VA_ARGS__)
template<class T, std::size_t N> constexpr boost::array<T, N> filled( T const& v )
{
boost::array<T, N> r = {};
r.fill( v );
return r;
}
template<class T> void test1()
{
constexpr boost::array<T, 4> a1 = filled<T, 4>( 7 );
STATIC_ASSERT( a1[0] == 7 );
STATIC_ASSERT( a1[1] == 7 );
STATIC_ASSERT( a1[2] == 7 );
STATIC_ASSERT( a1[3] == 7 );
}
template<class T> void test2()
{
constexpr boost::array<T, 0> a1 = filled<T, 0>( 7 );
(void)a1;
}
int main()
{
test1<int>();
test2<int>();
}
#endif

View File

@@ -46,11 +46,11 @@ template<class T> void test4()
int main()
{
// test1<int, 0>();
test1<int, 0>();
test1<int, 1>();
test1<int, 7>();
// test1<int const, 0>();
test1<int const, 0>();
test1<int const, 1>();
test1<int const, 7>();
@@ -58,7 +58,7 @@ int main()
test2<int, 1>();
test2<int, 7>();
// test2<int const, 0>();
test2<int const, 0>();
#if BOOST_WORKAROUND(BOOST_MSVC, < 1910) || BOOST_WORKAROUND(BOOST_GCC, < 50000)

View File

@@ -56,7 +56,8 @@ template<class T> void test4()
template<class T> void test5()
{
// constexpr boost::array<T, 0> a = {{}};
constexpr boost::array<T, 0> a = {{}};
(void)a;
}
template<class T> void test6()

View File

@@ -94,11 +94,11 @@ template<class T> void test2()
int main()
{
// test<int, 0>();
test<int, 0>();
test<int, 1>();
test<int, 7>();
// test<int const, 0>();
test<int const, 0>();
test<int const, 1>();
test<int const, 7>();

View File

@@ -39,20 +39,17 @@ template<class T> void test2()
{
constexpr boost::array<T, 0> a = {};
// iterator access is not constexpr for boost::array<T, 0>
// it is for std::array<T, 0>, though, so we should change it
STATIC_ASSERT( a.begin() == a.end() );
STATIC_ASSERT( a.cbegin() == a.cend() );
}
int main()
{
// test1<int, 0>();
test1<int, 0>();
test1<int, 1>();
test1<int, 7>();
// test2<int>();
test2<int>();
}
#endif

View File

@@ -76,11 +76,11 @@ template<class T, std::size_t N> void test()
int main()
{
// test<int, 0>();
test<int, 0>();
test<int, 1>();
test<int, 7>();
// test<int const, 0>();
test<int const, 0>();
test<int const, 1>();
test<int const, 7>();

View File

@@ -49,11 +49,11 @@ template<class T, std::size_t N> void test3()
int main()
{
// test1<int, 0>();
test1<int, 0>();
test1<int, 1>();
test1<int, 7>();
// test1<int const, 0>();
test1<int const, 0>();
test1<int const, 1>();
test1<int const, 7>();