From 7f24b27652ee6fa84e38f181cea57f319af0c204 Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Mon, 28 Jul 2025 13:52:00 +0200 Subject: Make failed assert exit immediately --- src/solvers/coord/common.h | 2 +- src/solvers/h48/coordinate.h | 5 ++--- src/solvers/h48/gendata_cocsep.h | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src/solvers') diff --git a/src/solvers/coord/common.h b/src/solvers/coord/common.h index d000ce9..d38b7d3 100644 --- a/src/solvers/coord/common.h +++ b/src/solvers/coord/common.h @@ -133,7 +133,7 @@ coord_gendata_generic( writetableinfo(&info, coord_datasize, data); - DBG_ASSERT(n == coord->sym.classes, SIZE_MAX, + DBG_ASSERT(n == coord->sym.classes, "%s coordinate data: computed %" PRIu64 " classes, " "expected %" PRIu64 "\n", coord->name, n, coord->sym.classes); diff --git a/src/solvers/h48/coordinate.h b/src/solvers/h48/coordinate.h index eb08fd8..9437fa7 100644 --- a/src/solvers/h48/coordinate.h +++ b/src/solvers/h48/coordinate.h @@ -15,7 +15,7 @@ coord_h48( uint32_t data; uint8_t ttrep; - DBG_ASSERT(h <= 11, -1, "coord_h48: h must be between 0 and 11\n"); + DBG_ASSERT(h <= 11, "coord_h48: h must be between 0 and 11\n"); cocsep = coord_cocsep(c); data = cocsepdata[cocsep]; @@ -54,8 +54,7 @@ invcoord_h48( cube_t ret; int64_t hh, coclass, ee, esep, eo; - DBG_ASSERT(h <= 11, ZERO_CUBE, - "invcoord_h48: h must be between 0 and 11\n"); + DBG_ASSERT(h <= 11, "invcoord_h48: h must be between 0 and 11\n"); hh = (int64_t)h; coclass = i / H48_ESIZE(h); diff --git a/src/solvers/h48/gendata_cocsep.h b/src/solvers/h48/gendata_cocsep.h index 3117a8e..7a589b5 100644 --- a/src/solvers/h48/gendata_cocsep.h +++ b/src/solvers/h48/gendata_cocsep.h @@ -61,9 +61,8 @@ gendata_cocsep( writetableinfo(&info, COCSEP_FULLSIZE, buf); - DBG_ASSERT(n == COCSEP_CLASSES, 0, - "cocsep: computed %" PRIu16 " symmetry classes, " - "expected %zu\n", n, COCSEP_CLASSES); + DBG_ASSERT(n == COCSEP_CLASSES, "cocsep: computed %" PRIu16 + " symmetry classes, expected %zu\n", n, COCSEP_CLASSES); LOG("[H48 gendata] cocsep data computed\n"); -- cgit v1.3