Changeset a738c68

Timestamp:

Sep 14, 2023, 10:43:31 AM (8 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

3df4cd9

Parents:

efe420f3

Message:

Update max/min so n-ary version doesn't match against the 2 argument case. Also added a test.

Files:

• libcfa/src/common.hfa (modified) (1 diff)
• tests/.expect/minmax.txt (modified) (1 diff)
• tests/minmax.cfa (modified) (1 diff)

libcfa/src/common.hfa

@@ -69 +69 @@
         T min( T v1, T v2 ) { return v1 < v2 ? v1 : v2; }
 
-        forall( T, Ts... | { T min( T, T ); T min( T, Ts ); } )
-        T min( T v1, T v2, Ts vs ) { return min( min( v1, v2 ), vs ); }
+        forall( T, Ts... | { T min( T, T ); T min( T, T, Ts ); } )
+        T min( T v1, T v2, T v3, Ts vs ) { return min( min( v1, v2 ), v3, vs ); }
 
         forall( T | { int ?>?( T, T ); } )
         T max( T v1, T v2 ) { return v1 > v2 ? v1 : v2; }
 
-        forall( T, Ts... | { T max( T, T ); T max( T, Ts ); } )
-        T max( T v1, T v2, Ts vs ) { return max( max( v1, v2 ), vs ); }
+        forall( T, Ts... | { T max( T, T ); T max( T, T, Ts ); } )
+        T max( T v1, T v2, T v3, Ts vs ) { return max( max( v1, v2 ), v3, vs ); }
 
         forall( T | { T min( T, T ); T max( T, T ); } )

tests/.expect/minmax.txt

@@ -20 +20 @@
 double                  4. 3.1  max 4.
 long double             4. 3.1  max 4.
+
+3 arguments
+2 3 4   min 2   max 4
+4 2 3   min 2   max 4
+3 4 2   min 2   max 4
+4 arguments
+3 2 5 4 min 2   max 5
+5 3 4 2 min 2   max 5

tests/minmax.cfa

@@ -45 +45 @@
         sout | "double\t\t\t"                           | 4.0 | 3.1 | "\tmax" | max( 4.0, 3.1 );
         sout | "long double\t\t"                        | 4.0l | 3.1l | "\tmax" | max( 4.0l, 3.1l );
+
+        sout | nl;
+
+        sout | "3 arguments";
+        sout | 2 | 3 | 4 | "\tmin" | min(2, 3, 4) | "\tmax" | max(2, 3, 4);
+        sout | 4 | 2 | 3 | "\tmin" | min(4, 2, 3) | "\tmax" | max(4, 2, 3);
+        sout | 3 | 4 | 2 | "\tmin" | min(3, 4, 2) | "\tmax" | max(3, 4, 2);
+
+        sout | "4 arguments";
+        sout | 3 | 2 | 5 | 4 | "\tmin" | min(3, 2, 5, 4) | "\tmax" | max(3, 2, 5, 4);
+        sout | 5 | 3 | 4 | 2 | "\tmin" | min(5, 3, 4, 2) | "\tmax" | max(5, 3, 4, 2);
 } // main