Changeset 2a301ff for tests/array-collections/dimexpr-match-cfa.cfa

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• tests/array-collections/dimexpr-match-cfa.cfa (moved) (moved from tests/array-container/dimexpr-match-cfa.cfa ) (4 diffs)

tests/array-collections/dimexpr-match-cfa.cfa

@@ -9 +9 @@
 #ifdef INCLUDE_MINIMAL
 #define POUNDINCLUDE #include
-POUNDINCLUDE <containers/array.hfa>
+POUNDINCLUDE <collections/array.hfa>
 #else
-#include <containers/array.hfa>                           // part of SUT
+#include <collections/array.hfa>                                                // part of SUT
 #endif
 
-#include "dimexpr-match.hfa"                              // test framework
+#include "dimexpr-match.hfa"                                                    // test framework
 
 // CFA "classic" behaviour is inconsistent between "C array" and "new array."
@@ -44 +44 @@
 #endif
 
+forall( [N] )
+void zip( array(float, N) & a, array(float, N) & b ) {}
 
 DECLN_runTests {
@@ -50 +52 @@
     int mut7 = 7, mut42 = 42;
 
-    
     #define TRY_COMPAT( LV, RV )            \
     {                                       \
@@ -103 +104 @@
     #undef TRY_COMPAT
 
-
-    forall( [N] )
-    void zip( array(float, N) & a, array(float, N) & b ) {}
-
     #define TRY_COMPAT( LV, RV )            \
     {                                       \