removing separate if block for complex arrays, compareComplex is promotable for arrays

jmag722 · jmag722 · commit 7a05872504a3 · 2026-01-27T22:09:38.000-06:00
diff --git a/modules/packages/UnitTest.chpl b/modules/packages/UnitTest.chpl
@@ -538,12 +538,10 @@ module UnitTest {
       }
 
       if equalNan {
-        if isComplexType(T) {
+        if isComplexType(T) ||
+          (isArrayType(T) && isComplexType(actual.eltType)) {
           return compareComplex(actual, expected);
         }
-        if isArrayType(T) && isComplexType(actual.eltType) {
-          return [(a, e) in zip(actual, expected)] compareComplex(a, e);
-        }
         if isImagType(T) || (isArrayType(T) && isImagType(actual.eltType)) {
           // no imaginary NaN, must cast to real
           return compareNanTrue(actual:real, expected:real);

Original file line number	Diff line number	Diff line change
`@@ -538,12 +538,10 @@ module UnitTest {`
`538`	`538`	`}`
`539`	`539`
`540`	`540`	`if equalNan {`
`541`		`- if isComplexType(T) {`
	`541`	`+ if isComplexType(T) \|\|`
	`542`	`+ (isArrayType(T) && isComplexType(actual.eltType)) {`
`542`	`543`	`return compareComplex(actual, expected);`
`543`	`544`	`}`
`544`		`- if isArrayType(T) && isComplexType(actual.eltType) {`
`545`		`- return [(a, e) in zip(actual, expected)] compareComplex(a, e);`
`546`		`- }`
`547`	`545`	`if isImagType(T) \|\| (isArrayType(T) && isImagType(actual.eltType)) {`
`548`	`546`	`// no imaginary NaN, must cast to real`
`549`	`547`	`return compareNanTrue(actual:real, expected:real);`