summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne Juul <arnej@verizonmedia.com>2021-03-19 14:23:07 +0000
committerArne Juul <arnej@verizonmedia.com>2021-03-19 14:23:07 +0000
commit312c1f168399ee51b8abd3e27b53e94ff9975db1 (patch)
tree76d348814cd250e84c2332f4676eb83bd8514b45
parentc3080e2878e5f05379ae68ca31390aaac9f0a0d5 (diff)
use CellMeta::join
-rw-r--r--eval/src/tests/instruction/mixed_simple_join_function/mixed_simple_join_function_test.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/eval/src/tests/instruction/mixed_simple_join_function/mixed_simple_join_function_test.cpp b/eval/src/tests/instruction/mixed_simple_join_function/mixed_simple_join_function_test.cpp
index 8ac7949303b..2b016645073 100644
--- a/eval/src/tests/instruction/mixed_simple_join_function/mixed_simple_join_function_test.cpp
+++ b/eval/src/tests/instruction/mixed_simple_join_function/mixed_simple_join_function_test.cpp
@@ -162,14 +162,6 @@ struct LhsRhs {
}
};
-CellType join_ct(CellType lct, CellType rct) {
- if (lct == CellType::DOUBLE || rct == CellType::DOUBLE) {
- return CellType::DOUBLE;
- } else {
- return CellType::FLOAT;
- }
-}
-
TEST("require that various parameter combinations work") {
for (CellType lct : CellTypeUtils::list_types()) {
for (CellType rct : CellTypeUtils::list_types()) {
@@ -197,7 +189,7 @@ TEST("require that various parameter combinations work") {
param_repo.add("b", b_spec);
}
TEST_STATE(expr);
- CellType result_ct = join_ct(lct, rct);
+ CellType result_ct = CellMeta::join(CellMeta{lct, false}, CellMeta{rct, false}).cell_type;
Primary primary = Primary::RHS;
if (params.overlap == Overlap::FULL) {
bool w_lhs = (lct == result_ct) && left_mut;