Constexpr Array from one value constructor, improved test.

Merged constexpr test cases into other ones to remove duplicate code.
Copied the constructors from Math::Vector as I don't feel reinventing
all that again.

src/Array.h

@@ -29,8 +29,8 @@
  */
 
 #include <type_traits>
-#include <Utility/Debug.h>
 
+#include "Math/BoolVector.h" /* for Math::Implementation::Sequence */
 #include "Magnum.h"
 
 namespace Magnum {
@@ -62,23 +62,24 @@ template<UnsignedInt dimensions, class T> class Array {
          * @param first     First value
          * @param next      Next values
          */
-        #ifndef DOXYGEN_GENERATING_OUTPUT
+        #ifdef DOXYGEN_GENERATING_OUTPUT
-        template<class ...U> constexpr /*implicit*/ Array(T first, T second, U... next): _data{first, second, next...} {
-            static_assert(sizeof...(next)+2 == dimensions, "Improper number of arguments passed to Array constructor");
-        }
-        template<class U = T> constexpr /*implicit*/ Array(typename std::enable_if<std::is_same<T, U>::value && dimensions == 1, U>::type first): _data{first} {}
-        #else
         template<class ...U> constexpr /*implicit*/ Array(T first, U... next);
+        #else
+        template<class ...U, class V = typename std::enable_if<sizeof...(U)+1 == dimensions, T>::type> constexpr /*implicit*/ Array(T first, U... next): _data{first, next...} {}
         #endif
 
-        /**
+        /** @brief Construct array with one value for all fields */
-         * @brief Constructor
+        #ifdef DOXYGEN_GENERATING_OUTPUT
-         * @param value Value for all fields
+        constexpr /*implicit*/ Array(T value);
-         */
+        #else
-        template<class U, class = typename std::enable_if<std::is_same<T, U>::value && dimensions != 1, U>::type> /*implicit*/ Array(U value) {
+        #ifndef CORRADE_GCC46_COMPATIBILITY
-            for(UnsignedInt i = 0; i != dimensions; ++i)
+        template<class U, class V = typename std::enable_if<std::is_same<T, U>::value && dimensions != 1, T>::type> constexpr /*implicit*/ Array(U value): Array(typename Math::Implementation::GenerateSequence<dimensions>::Type(), value) {}
-                _data[i] = value;
+        #else
+        template<class U, class V = typename std::enable_if<std::is_same<T, U>::value && dimensions != 1, T>::type> /*implicit*/ Array(U value) {
+            *this = Array(typename Math::Implementation::GenerateSequence<dimensions>::Type(), value);
         }
+        #endif
+        #endif
 
         /** @brief Equality */
         bool operator==(const Array<dimensions, T>& other) const {
@@ -104,6 +105,10 @@ template<UnsignedInt dimensions, class T> class Array {
         constexpr const T* data() const { return _data; } /**< @overload */
 
     private:
+
+        /* Implementation for Array<dimensions, T>::Array(U) */
+        template<std::size_t ...sequence> constexpr explicit Array(Math::Implementation::Sequence<sequence...>, T value): _data{Math::Implementation::repeat(value, sequence)...} {}
+
         T _data[dimensions];
 };
 

src/Test/ArrayTest.cpp

@@ -33,7 +33,6 @@ class ArrayTest: public TestSuite::Tester {
         ArrayTest();
 
         void construct();
-        void constexprConstruct();
         void equality();
         void access();
 };
@@ -44,37 +43,31 @@ typedef Magnum::Array3D<int> Array3D;
 
 ArrayTest::ArrayTest() {
     addTests({&ArrayTest::construct,
-              &ArrayTest::constexprConstruct,
               &ArrayTest::equality,
               &ArrayTest::access});
 }
 
 void ArrayTest::construct() {
-    CORRADE_COMPARE(Array1D(5), (Array<1, int>(5)));
+    constexpr Array<3, Int> a = {5, 6, 7};
-    CORRADE_COMPARE(Array2D(5, 3), (Array<2, int>(5, 3)));
+    CORRADE_COMPARE(a, (Array<3, Int>(5, 6, 7)));
-    CORRADE_COMPARE(Array3D(5, 3, -2), (Array<3, int>(5, 3, -2)));
+
-
+    constexpr Array<3, Int> a2 = 5;
-    /* Verify proper expansion */
+    CORRADE_COMPARE(a2, (Array<3, Int>(5, 5, 5)));
-    CORRADE_COMPARE((Array<3, int>(5)), (Array<3, int>(5, 5, 5)));
+
-    CORRADE_COMPARE(Array2D(5), (Array<2, int>(5, 5)));
+    constexpr Array1D b = 5;
-    CORRADE_COMPARE(Array3D(5), (Array<3, int>(5, 5, 5)));
+    CORRADE_COMPARE(b, (Array<1, Int>(5)));
-}
+
+    constexpr Array2D c = {5, 3};
+    CORRADE_COMPARE(c, (Array<2, Int>(5, 3)));
+
+    constexpr Array2D c2 = 5;
+    CORRADE_COMPARE(c2, (Array<2, Int>(5, 5)));
+
+    constexpr Array3D d = {5, 3, -2};
+    CORRADE_COMPARE(d, (Array<3, Int>(5, 3, -2)));
 
-void ArrayTest::constexprConstruct() {
+    constexpr Array3D d2 = 5;
-    /* Verify that all full constructors can be called as constexpr */
+    CORRADE_COMPARE(d2, (Array<3, Int>(5, 5, 5)));
-    constexpr Array1D a(5);
-    constexpr Array2D b(5, 3);
-    constexpr Array2D b2(5);
-    constexpr Array3D c(5, 6, 7);
-    constexpr Array3D c2(5);
-    constexpr Array<3, int> d(5, 6, 7);
-
-    CORRADE_COMPARE(a, Array1D(5));
-    CORRADE_COMPARE(b, Array2D(5, 3));
-    CORRADE_COMPARE(b2, Array2D(5));
-    CORRADE_COMPARE(c, Array3D(5, 6, 7));
-    CORRADE_COMPARE(c2, Array3D(5));
-    CORRADE_COMPARE(d, (Array<3, int>(5, 6, 7)));
 }
 
 void ArrayTest::equality() {
@@ -84,11 +77,18 @@ void ArrayTest::equality() {
 
 void ArrayTest::access() {
     Array1D a(50);
-    const Array1D ac(50);
+    constexpr Array1D ac(50);
     Array2D b(5, 3);
-    const Array2D bc(5, 3);
+    constexpr Array2D bc(5, 3);
     Array3D c(-5, 6, 7);
-    const Array3D cc(-5, 6, 7);
+    constexpr Array3D cc(-5, 6, 7);
+
+    CORRADE_COMPARE(a[0], 50);
+    CORRADE_COMPARE(ac[0], 50);
+    CORRADE_COMPARE(b[1], 3);
+    CORRADE_COMPARE(bc[1], 3);
+    CORRADE_COMPARE(c[2], 7);
+    CORRADE_COMPARE(cc[2], 7);
 
     CORRADE_COMPARE(a.x(), 50);
     CORRADE_COMPARE(ac.x(), 50);