diff --git a/lfs.c b/lfs.c index 0b30f2bd..ac5d6b3b 100644 --- a/lfs.c +++ b/lfs.c @@ -191,7 +191,7 @@ static int lfs_bd_cmp(lfs_t *lfs, int res = memcmp(dat, data + i, diff); if (res) { - return res < 0 ? LFS_CMP_LT : LFS_CMP_GT; + return (res < 0) ? LFS_CMP_LT : LFS_CMP_GT; } } @@ -2886,7 +2886,7 @@ static int lfsr_rbyd_appendattr(lfs_t *lfs, lfsr_rbyd_t *rbyd, && (upper_rid-1 < rid-lfs_smax32(-delta, 0) || (upper_rid-1 == rid-lfs_smax32(-delta, 0) && ((delta > 0 && !lfsr_tag_isgrow(tag)) - || (lfsr_tag_iswide(tag) + || ((lfsr_tag_iswide(tag)) ? lfsr_tag_supkey(tag_) < lfsr_tag_supkey(tag) : lfsr_tag_key(tag_) < lfsr_tag_key(tag)))))) { if (lfsr_tag_isrm(tag) || !lfsr_tag_key(tag)) { @@ -2898,7 +2898,7 @@ static int lfsr_rbyd_appendattr(lfs_t *lfs, lfsr_rbyd_t *rbyd, // split less than alt = LFSR_TAG_ALT( LE, - TAG(!lfsr_tag_hasdiverged(tag_) + TAG((!lfsr_tag_hasdiverged(tag_)) ? LFSR_TAG_R : LFSR_TAG_B), lfsr_tag_key(tag_)); @@ -2910,7 +2910,7 @@ static int lfsr_rbyd_appendattr(lfs_t *lfs, lfsr_rbyd_t *rbyd, && (upper_rid-1 > rid || (upper_rid-1 == rid && ((delta > 0 && !lfsr_tag_isgrow(tag)) - || (lfsr_tag_iswide(tag) + || ((lfsr_tag_iswide(tag)) ? lfsr_tag_supkey(tag_) > lfsr_tag_supkey(tag) : lfsr_tag_key(tag_) > lfsr_tag_key(tag)))))) { if (lfsr_tag_isrm(tag) || !lfsr_tag_key(tag)) { @@ -2922,7 +2922,7 @@ static int lfsr_rbyd_appendattr(lfs_t *lfs, lfsr_rbyd_t *rbyd, // split greater than alt = LFSR_TAG_ALT( GT, - TAG(!lfsr_tag_hasdiverged(tag_) + TAG((!lfsr_tag_hasdiverged(tag_)) ? LFSR_TAG_R : LFSR_TAG_B), lfsr_tag_key(tag)); @@ -2959,9 +2959,9 @@ leaf:; // can't find trunks during fetch lfs_ssize_t d = lfsr_bd_progtag(lfs, rbyd->blocks[0], rbyd->eoff, // rm => null or shrubnull, otherwise strip off control bits - (lfsr_tag_isrm(tag) + (lfsr_tag_isrm(tag)) ? lfsr_tag_mode(lfsr_tag_shrubkey(tag)) - : lfsr_tag_shrubkey(tag)), + : lfsr_tag_shrubkey(tag), upper_rid - lower_rid + delta, lfsr_data_size(&data), &rbyd->cksum); @@ -3524,7 +3524,7 @@ static int lfsr_rbyd_appendgdelta(lfs_t *lfs, lfsr_rbyd_t *rbyd) { lfs_size_t size = lfsr_grm_size(grm_buf); err = lfsr_rbyd_appendattr(lfs, rbyd, -1, // opportunistically remove this tag if delta is all zero - (size == 0 ? LFSR_TAG_RM(GRMDELTA) : LFSR_TAG_GRMDELTA), 0, + (size == 0) ? LFSR_TAG_RM(GRMDELTA) : LFSR_TAG_GRMDELTA, 0, LFSR_DATA_BUF(grm_buf, size)); if (err) { return err; @@ -5370,7 +5370,7 @@ static int lfsr_mdir_alloc__(lfs_t *lfs, lfsr_mdir_t *mdir, lfsr_smid_t mid) { return err; } // note we allow corrupt errors here, as long as they are consistent - rev = (err != LFS_ERR_CORRUPT ? lfs_fromle32_(&rev) : 0); + rev = (err != LFS_ERR_CORRUPT) ? lfs_fromle32_(&rev) : 0; // align revision count in new mdirs to our block_cycles, this makes // sure we don't immediately try to relocate the mdir @@ -5407,7 +5407,7 @@ static int lfsr_mdir_swap__(lfs_t *lfs, lfsr_mdir_t *mdir_, return err; } // note we allow corrupt errors here, as long as they are consistent - rev = (err != LFS_ERR_CORRUPT ? lfs_fromle32_(&rev) : 0); + rev = (err != LFS_ERR_CORRUPT) ? lfs_fromle32_(&rev) : 0; // decide if we need to relocate if (!force diff --git a/lfs_util.h b/lfs_util.h index b816d305..a291acc7 100644 --- a/lfs_util.h +++ b/lfs_util.h @@ -187,7 +187,7 @@ static inline int32_t lfs_sclamp32(int32_t a, int32_t min, int32_t max) { // Absolute value of signed numbers static inline int32_t lfs_abs32(int32_t a) { - return a < 0 ? -a : a; + return (a < 0) ? -a : a; } // TODO how many of these do we actually need diff --git a/runners/bench_runner.c b/runners/bench_runner.c index 583e604f..4955010d 100644 --- a/runners/bench_runner.c +++ b/runners/bench_runner.c @@ -59,7 +59,7 @@ static void leb16_print(uintmax_t x) { } while (true) { - char nibble = (x & 0xf) | (x > 0xf ? 0x10 : 0); + char nibble = (x & 0xf) | ((x > 0xf) ? 0x10 : 0); printf("%c", (nibble < 10) ? '0'+nibble : 'a'+nibble-10); if (x <= 0xf) { break; @@ -103,7 +103,7 @@ static uintmax_t leb16_parse(const char *s, char **tail) { if (tail) { *tail = (char*)s; } - return neg ? -x : x; + return (neg) ? -x : x; } @@ -228,7 +228,7 @@ size_t bench_define_permutations(size_t define) { for (size_t i = 0; i < BENCH_DEFINE_MAP_COUNT; i++) { if (define < bench_define_maps[i].count && bench_define_maps[i].defines[define].cb) { - return bench_define_maps[i].defines[define].permutations + return (bench_define_maps[i].defines[define].permutations) ? bench_define_maps[i].defines[define].permutations : 1; } @@ -267,7 +267,7 @@ intmax_t bench_define(size_t define) { } else { const char *name = bench_define_name(define); fprintf(stderr, "error: undefined define %s (%zd)\n", - name ? name : "(unknown)", + (name) ? name : "(unknown)", define); assert(false); exit(-1); @@ -391,7 +391,7 @@ void bench_define_suite(const struct bench_suite *suite) { suite->define_names, suite->define_count}; // set define count - bench_define_count = suite->define_count > BENCH_IMPLICIT_DEFINE_COUNT + bench_define_count = (suite->define_count > BENCH_IMPLICIT_DEFINE_COUNT) ? suite->define_count : BENCH_IMPLICIT_DEFINE_COUNT; @@ -824,7 +824,7 @@ static void case_forperm( bench_seen_t seen = {NULL, 0, 0}; for (size_t k = 0; - k < (case_->permutations ? case_->permutations : 1); + k < ((case_->permutations) ? case_->permutations : 1); k++) { // define case permutation bench_define_case(suite, case_, k); diff --git a/runners/test_runner.c b/runners/test_runner.c index e91a9de1..fadcf771 100644 --- a/runners/test_runner.c +++ b/runners/test_runner.c @@ -59,7 +59,7 @@ static void leb16_print(uintmax_t x) { } while (true) { - char nibble = (x & 0xf) | (x > 0xf ? 0x10 : 0); + char nibble = (x & 0xf) | ((x > 0xf) ? 0x10 : 0); printf("%c", (nibble < 10) ? '0'+nibble : 'a'+nibble-10); if (x <= 0xf) { break; @@ -103,7 +103,7 @@ static uintmax_t leb16_parse(const char *s, char **tail) { if (tail) { *tail = (char*)s; } - return neg ? -x : x; + return (neg) ? -x : x; } @@ -240,7 +240,7 @@ size_t test_define_permutations(size_t define) { for (size_t i = 0; i < TEST_DEFINE_MAP_COUNT; i++) { if (define < test_define_maps[i].count && test_define_maps[i].defines[define].cb) { - return test_define_maps[i].defines[define].permutations + return (test_define_maps[i].defines[define].permutations) ? test_define_maps[i].defines[define].permutations : 1; } @@ -279,7 +279,7 @@ intmax_t test_define(size_t define) { } else { const char *name = test_define_name(define); fprintf(stderr, "error: undefined define %s (%zd)\n", - name ? name : "(unknown)", + (name) ? name : "(unknown)", define); assert(false); exit(-1); @@ -403,7 +403,7 @@ void test_define_suite(const struct test_suite *suite) { suite->define_names, suite->define_count}; // set define count - test_define_count = suite->define_count > TEST_IMPLICIT_DEFINE_COUNT + test_define_count = (suite->define_count > TEST_IMPLICIT_DEFINE_COUNT) ? suite->define_count : TEST_IMPLICIT_DEFINE_COUNT; @@ -772,7 +772,7 @@ static void case_forperm( test_seen_t seen = {NULL, 0, 0}; for (size_t k = 0; - k < (case_->permutations ? case_->permutations : 1); + k < ((case_->permutations) ? case_->permutations : 1); k++) { // define case permutation test_define_case(suite, case_, k); @@ -1644,7 +1644,7 @@ static void run_powerloss_exhaustive_layer( // run through the test without additional powerlosses, collecting possible // branches as we do so - lfs_emubd_setpowercycles(state.cfg, depth > 0 ? 1 : 0); + lfs_emubd_setpowercycles(state.cfg, (depth > 0) ? 1 : 0); bdcfg->powerloss_data = &state; // run the tests diff --git a/tests/test_alloc.toml b/tests/test_alloc.toml index 478e753b..0bf1f56d 100644 --- a/tests/test_alloc.toml +++ b/tests/test_alloc.toml @@ -165,7 +165,7 @@ code = ''' memset(seen, 0, (BLOCK_COUNT+7)/8); lfsr_traversal_t traversal = LFSR_TRAVERSAL( - VALIDATE ? LFSR_TRAVERSAL_VALIDATE : 0); + (VALIDATE) ? LFSR_TRAVERSAL_VALIDATE : 0); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -325,7 +325,7 @@ code = ''' memset(seen, 0, (BLOCK_COUNT+7)/8); lfsr_traversal_t traversal = LFSR_TRAVERSAL( - (VALIDATE ? LFSR_TRAVERSAL_VALIDATE : 0) + ((VALIDATE) ? LFSR_TRAVERSAL_VALIDATE : 0) | LFSR_TRAVERSAL_ALL); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops @@ -473,7 +473,7 @@ code = ''' memset(seen, 0, (BLOCK_COUNT+7)/8); lfsr_traversal_t traversal = LFSR_TRAVERSAL( - (VALIDATE ? LFSR_TRAVERSAL_VALIDATE : 0) + ((VALIDATE) ? LFSR_TRAVERSAL_VALIDATE : 0) | LFSR_TRAVERSAL_ALL); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops diff --git a/tests/test_btree.toml b/tests/test_btree.toml index d8ec869a..487c7afc 100644 --- a/tests/test_btree.toml +++ b/tests/test_btree.toml @@ -2638,7 +2638,7 @@ code = ''' &tag_, &weight_, buf1, SIZE) => SIZE; assert(tag_ == LFSR_TAG_DATA); assert(weight_ == 1); - assert(memcmp(buf1, (SIBLING ? "a" : "b"), 1) == 0); + assert(memcmp(buf1, ((SIBLING) ? "a" : "b"), 1) == 0); // and check that our pop worked lfsr_btree_get(&lfs, &btree, 1, @@ -2704,7 +2704,7 @@ code = ''' &tag_, &weight_, buf1, SIZE) => SIZE; assert(tag_ == LFSR_TAG_DATA); assert(weight_ == 1); - assert(memcmp(buf1, (SIBLING ? "a" : "b"), 1) == 0); + assert(memcmp(buf1, ((SIBLING) ? "a" : "b"), 1) == 0); // and check that our pop worked lfsr_btree_get(&lfs, &btree, 1, @@ -2765,7 +2765,7 @@ code = ''' &tag_, &weight_, buf1, SIZE) => SIZE; assert(tag_ == LFSR_TAG_DATA); assert(weight_ == 1); - assert(memcmp(buf1, (SIBLING ? "a" : "b"), 1) == 0); + assert(memcmp(buf1, ((SIBLING) ? "a" : "b"), 1) == 0); // and check that our pop worked lfsr_btree_get(&lfs, &btree, 1, @@ -2835,7 +2835,7 @@ code = ''' &tag_, &weight_, buf1, SIZE) => 1; assert(tag_ == LFSR_TAG_DATA); assert(weight_ == 1); - assert(memcmp(buf1, (SIBLING ? "a" : "b"), 1) == 0); + assert(memcmp(buf1, ((SIBLING) ? "a" : "b"), 1) == 0); // and check that our pop worked lfsr_btree_get(&lfs, &btree, 1, @@ -3895,7 +3895,7 @@ code = ''' // choose a pseudo-random op uint8_t op = TEST_PRNG(&prng) % 3; // choose a pseudo-random bid - lfs_size_t bid = TEST_PRNG(&prng) % (sim_size == 0 ? 1 : sim_size); + lfs_size_t bid = TEST_PRNG(&prng) % ((sim_size == 0) ? 1 : sim_size); // choose a pseudo-random name lfs_size_t x = TEST_PRNG(&prng) % (26*26*26); char name[3] = { @@ -4068,7 +4068,7 @@ code = ''' // choose a pseudo-random op uint8_t op = TEST_PRNG(&prng) % 3; // choose a pseudo-random bid - lfs_size_t bid = TEST_PRNG(&prng) % (sim_size == 0 ? 1 : sim_size); + lfs_size_t bid = TEST_PRNG(&prng) % ((sim_size == 0) ? 1 : sim_size); // choose a pseudo-random name lfs_size_t x = TEST_PRNG(&prng) % (26*26*26); char name[3] = { diff --git a/tests/test_dirs.toml b/tests/test_dirs.toml index 196cda72..56f38ec5 100644 --- a/tests/test_dirs.toml +++ b/tests/test_dirs.toml @@ -1211,7 +1211,7 @@ code = ''' // create a directory here char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), x); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), x); int err = lfsr_mkdir(&lfs, name); assert(!err || err == LFS_ERR_EXIST); } @@ -1227,7 +1227,7 @@ code = ''' // test that our directories match our simulation for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), sim[j]); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), sim[j]); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; @@ -1238,7 +1238,7 @@ code = ''' } lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; struct lfs_info info; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -3897,7 +3897,7 @@ code = ''' // create a directory here char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), x); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), x); int err = lfsr_mkdir(&lfs, name); assert(!err || err == LFS_ERR_EXIST); @@ -3912,7 +3912,7 @@ code = ''' // remove this directory char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), x); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), x); lfsr_remove(&lfs, name) => 0; } } @@ -3928,7 +3928,7 @@ code = ''' // test that our directories match our simulation for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), sim[j]); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), sim[j]); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; @@ -3939,7 +3939,7 @@ code = ''' } lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; struct lfs_info info; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -5393,7 +5393,7 @@ code = ''' // check if we have already started renaming, in case of powerloss struct lfs_info info; - err = lfsr_stat(&lfs, (BEFORE ? "/0mved0000" : "/mved0000"), &info); + err = lfsr_stat(&lfs, ((BEFORE) ? "/0mved0000" : "/mved0000"), &info); if (err == LFS_ERR_NOENT) { // make this many directories for (lfs_size_t i = 0; i < N; i++) { @@ -5450,7 +5450,7 @@ code = ''' char old_name[256]; sprintf(old_name, "dir%04d", i); char new_name[256]; - sprintf(new_name, "%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(new_name, "%smved%04d", ((BEFORE) ? "0" : ""), i); int err = lfsr_rename(&lfs, old_name, new_name); assert(!err || (TEST_PLS && err == LFS_ERR_NOENT)); @@ -5466,7 +5466,7 @@ code = ''' // check that our renames worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -5486,7 +5486,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -5516,7 +5516,7 @@ code = ''' // check if we have already started renaming, in case of powerloss struct lfs_info info; - err = lfsr_stat(&lfs, (BEFORE ? "/0mved0000" : "/mved0000"), &info); + err = lfsr_stat(&lfs, ((BEFORE) ? "/0mved0000" : "/mved0000"), &info); if (err == LFS_ERR_NOENT) { // make this many directories for (lfs_size_t i = 0; i < N; i++) { @@ -5573,7 +5573,7 @@ code = ''' char old_name[256]; sprintf(old_name, "dir%04d", i); char new_name[256]; - sprintf(new_name, "%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(new_name, "%smved%04d", ((BEFORE) ? "0" : ""), i); int err = lfsr_rename(&lfs, old_name, new_name); assert(!err || (TEST_PLS && err == LFS_ERR_NOENT)); @@ -5589,7 +5589,7 @@ code = ''' // check that our renames worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -5609,7 +5609,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -5639,7 +5639,7 @@ code = ''' // check if we have already started renaming, in case of powerloss struct lfs_info info; - err = lfsr_stat(&lfs, (BEFORE ? "/0mved0000" : "/mved0000"), &info); + err = lfsr_stat(&lfs, ((BEFORE) ? "/0mved0000" : "/mved0000"), &info); if (err == LFS_ERR_NOENT) { // make this many directories for (lfs_size_t i = 0; i < N; i++) { @@ -5738,7 +5738,7 @@ code = ''' char old_name[256]; sprintf(old_name, "dir%04d", i); char new_name[256]; - sprintf(new_name, "%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(new_name, "%smved%04d", ((BEFORE) ? "0" : ""), i); int err = lfsr_rename(&lfs, old_name, new_name); assert(!err || (TEST_PLS && err == LFS_ERR_NOENT)); @@ -5753,11 +5753,11 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char old_name[256]; sprintf(old_name, "%smved%04d/child%04d", - (BEFORE ? "0" : ""), i, j); + ((BEFORE) ? "0" : ""), i, j); char new_name[256]; sprintf(new_name, "%smved%04d/%schmved%04d", - (BEFORE ? "0" : ""), i, - (BEFORE ? "0" : ""), j); + ((BEFORE) ? "0" : ""), i, + ((BEFORE) ? "0" : ""), j); int err = lfsr_rename(&lfs, old_name, new_name); assert(!err || (TEST_PLS && err == LFS_ERR_NOENT)); @@ -5774,7 +5774,7 @@ code = ''' // check that our renames worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -5784,10 +5784,10 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char name[256]; sprintf(name, "%smved%04d/%schmved%04d", - (BEFORE ? "0" : ""), i, (BEFORE ? "0" : ""), j); + ((BEFORE) ? "0" : ""), i, ((BEFORE) ? "0" : ""), j); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "%schmved%04d", (BEFORE ? "0" : ""), j); + sprintf(name, "%schmved%04d", ((BEFORE) ? "0" : ""), j); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -5806,7 +5806,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -5817,7 +5817,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -5829,7 +5829,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "%schmved%04d", (BEFORE ? "0" : ""), j); + sprintf(name, "%schmved%04d", ((BEFORE) ? "0" : ""), j); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -5860,7 +5860,7 @@ code = ''' // check if we have already started renaming, in case of powerloss struct lfs_info info; - err = lfsr_stat(&lfs, (BEFORE ? "/0mved0000" : "/mved0000"), &info); + err = lfsr_stat(&lfs, ((BEFORE) ? "/0mved0000" : "/mved0000"), &info); if (err == LFS_ERR_NOENT) { // make this many directories for (lfs_size_t i = 0; i < N; i++) { @@ -6001,7 +6001,7 @@ code = ''' char old_name[256]; sprintf(old_name, "dir%04d", i); char new_name[256]; - sprintf(new_name, "%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(new_name, "%smved%04d", ((BEFORE) ? "0" : ""), i); int err = lfsr_rename(&lfs, old_name, new_name); assert(!err || (TEST_PLS && err == LFS_ERR_NOENT)); @@ -6016,11 +6016,11 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char old_name[256]; sprintf(old_name, "%smved%04d/child%04d", - (BEFORE ? "0" : ""), i, j); + ((BEFORE) ? "0" : ""), i, j); char new_name[256]; sprintf(new_name, "%smved%04d/%schmved%04d", - (BEFORE ? "0" : ""), i, - (BEFORE ? "0" : ""), j); + ((BEFORE) ? "0" : ""), i, + ((BEFORE) ? "0" : ""), j); int err = lfsr_rename(&lfs, old_name, new_name); assert(!err || (TEST_PLS && err == LFS_ERR_NOENT)); @@ -6035,13 +6035,13 @@ code = ''' for (lfs_size_t k = 0; k < N; k++) { char old_name[256]; sprintf(old_name, "%smved%04d/%schmved%04d/grandchild%04d", - (BEFORE ? "0" : ""), i, - (BEFORE ? "0" : ""), j, k); + ((BEFORE) ? "0" : ""), i, + ((BEFORE) ? "0" : ""), j, k); char new_name[256]; sprintf(new_name, "%smved%04d/%schmved%04d/%sgrmved%04d", - (BEFORE ? "0" : ""), i, - (BEFORE ? "0" : ""), j, - (BEFORE ? "0" : ""), k); + ((BEFORE) ? "0" : ""), i, + ((BEFORE) ? "0" : ""), j, + ((BEFORE) ? "0" : ""), k); int err = lfsr_rename(&lfs, old_name, new_name); assert(!err || (TEST_PLS && err == LFS_ERR_NOENT)); @@ -6059,7 +6059,7 @@ code = ''' // check that our removes worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -6069,11 +6069,11 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char name[256]; sprintf(name, "%smved%04d/%schmved%04d", - (BEFORE ? "0" : ""), i, - (BEFORE ? "0" : ""), j); + ((BEFORE) ? "0" : ""), i, + ((BEFORE) ? "0" : ""), j); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "%schmved%04d", (BEFORE ? "0" : ""), j); + sprintf(name, "%schmved%04d", ((BEFORE) ? "0" : ""), j); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -6081,12 +6081,12 @@ code = ''' for (lfs_size_t k = 0; k < N; k++) { char name[256]; sprintf(name, "%smved%04d/%schmved%04d/%sgrmved%04d", - (BEFORE ? "0" : ""), i, - (BEFORE ? "0" : ""), j, - (BEFORE ? "0" : ""), k); + ((BEFORE) ? "0" : ""), i, + ((BEFORE) ? "0" : ""), j, + ((BEFORE) ? "0" : ""), k); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "%sgrmved%04d", (BEFORE ? "0" : ""), k); + sprintf(name, "%sgrmved%04d", ((BEFORE) ? "0" : ""), k); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -6106,7 +6106,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -6117,7 +6117,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -6129,7 +6129,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "%schmved%04d", (BEFORE ? "0" : ""), j); + sprintf(name, "%schmved%04d", ((BEFORE) ? "0" : ""), j); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -6141,8 +6141,8 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char name[256]; sprintf(name, "%smved%04d/%schmved%04d", - (BEFORE ? "0" : ""), i, - (BEFORE ? "0" : ""), j); + ((BEFORE) ? "0" : ""), i, + ((BEFORE) ? "0" : ""), j); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -6154,7 +6154,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t k = 0; k < N; k++) { char name[256]; - sprintf(name, "%sgrmved%04d", (BEFORE ? "0" : ""), k); + sprintf(name, "%sgrmved%04d", ((BEFORE) ? "0" : ""), k); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -6186,7 +6186,7 @@ code = ''' // check if we have already started renaming, in case of powerloss struct lfs_info info; - err = lfsr_stat(&lfs, (BEFORE ? "/0mved0000" : "/mved0000"), &info); + err = lfsr_stat(&lfs, ((BEFORE) ? "/0mved0000" : "/mved0000"), &info); if (err == LFS_ERR_NOENT) { // create this many directory in a sort of linked-list by nesting char name[4096]; @@ -6253,7 +6253,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { sprintf(&old_name[strlen(old_name)], "/dir%04d", i); sprintf(&new_name[strlen(new_name)], "/%smved%04d", - (BEFORE ? "0" : ""), i); + ((BEFORE) ? "0" : ""), i); err = lfsr_rename(&lfs, old_name, new_name); assert(!err || (TEST_PLS && err == LFS_ERR_NOENT)); @@ -6273,11 +6273,11 @@ code = ''' char name[4096]; memset(name, 0, sizeof(name)); for (lfs_size_t i = 0; i < N; i++) { - sprintf(&name[strlen(name)], "/%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(&name[strlen(name)], "/%smved%04d", ((BEFORE) ? "0" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; - sprintf(name2, "%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(name2, "%smved%04d", ((BEFORE) ? "0" : ""), i); assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -6285,7 +6285,7 @@ code = ''' memset(name, 0, sizeof(name)); for (lfs_size_t i = 0; i < N; i++) { - sprintf(&name[strlen(name)], "/%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(&name[strlen(name)], "/%smved%04d", ((BEFORE) ? "0" : ""), i); lfsr_dir_t dir; lfsr_dir_open(&lfs, &dir, name) => 0; struct lfs_info info; @@ -6299,7 +6299,7 @@ code = ''' assert(info.size == 0); if (i < N-1) { char name2[256]; - sprintf(name2, "%smved%04d", (BEFORE ? "0" : ""), i+1); + sprintf(name2, "%smved%04d", ((BEFORE) ? "0" : ""), i+1); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); @@ -6365,7 +6365,7 @@ code = ''' // create a directory here char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), x); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), x); int err = lfsr_mkdir(&lfs, name); assert(!err || err == LFS_ERR_EXIST); @@ -6401,9 +6401,9 @@ code = ''' // rename this directory char old_name[256]; - sprintf(old_name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), x); + sprintf(old_name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), x); char new_name[256]; - sprintf(new_name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), y); + sprintf(new_name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), y); lfsr_rename(&lfs, old_name, new_name) => 0; } } @@ -6419,7 +6419,7 @@ code = ''' // test that our directories match our simulation for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), sim[j]); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), sim[j]); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; @@ -6430,7 +6430,7 @@ code = ''' } lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; struct lfs_info info; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -6510,7 +6510,7 @@ code = ''' // create a directory here char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), x); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), x); int err = lfsr_mkdir(&lfs, name); assert(!err || err == LFS_ERR_EXIST); @@ -6525,7 +6525,7 @@ code = ''' // remove this directory char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), x); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), x); lfsr_remove(&lfs, name) => 0; } else { @@ -6560,9 +6560,9 @@ code = ''' // rename this directory char old_name[256]; - sprintf(old_name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), x); + sprintf(old_name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), x); char new_name[256]; - sprintf(new_name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), y); + sprintf(new_name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), y); lfsr_rename(&lfs, old_name, new_name) => 0; } } @@ -6578,7 +6578,7 @@ code = ''' // test that our directories match our simulation for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), sim[j]); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), sim[j]); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; @@ -6589,7 +6589,7 @@ code = ''' } lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; struct lfs_info info; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); diff --git a/tests/test_dread.toml b/tests/test_dread.toml index 9e886c7c..7ba69c53 100644 --- a/tests/test_dread.toml +++ b/tests/test_dread.toml @@ -22,7 +22,7 @@ code = ''' // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } @@ -32,7 +32,7 @@ code = ''' // because these tests are tightly bound to the current littlefs version. // lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; lfsr_dir_tell(&lfs, &dir) => 0; struct lfs_info info; lfsr_dir_read(&lfs, &dir, &info) => 0; @@ -76,12 +76,12 @@ code = ''' // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; // read our directory once lfsr_dir_tell(&lfs, &dir) => 0;; @@ -153,12 +153,12 @@ code = ''' // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; // read our directory once lfsr_dir_tell(&lfs, &dir) => 0; @@ -246,12 +246,12 @@ code = ''' } char name[256]; - sprintf(name, "%s/ardvark", (PARENT ? "pricklypear" : "")); + sprintf(name, "%s/ardvark", ((PARENT) ? "pricklypear" : "")); lfsr_mkdir(&lfs, name) => 0; // read to the end lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; struct lfs_info info; lfsr_dir_read(&lfs, &dir, &info) => 0; @@ -351,13 +351,13 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } // start reading lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; struct lfs_info info; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -486,13 +486,13 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } // start reading lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; struct lfs_info info; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -621,13 +621,13 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } // start reading lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; struct lfs_info info; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -750,13 +750,13 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i+1); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i+1); lfsr_mkdir(&lfs, name) => 0; } // start reading lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; struct lfs_info info; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -779,7 +779,7 @@ code = ''' // make a dir at J char name[256]; - sprintf(name, "%s/dir%04d_", (PARENT ? "pricklypear" : ""), (int)J); + sprintf(name, "%s/dir%04d_", ((PARENT) ? "pricklypear" : ""), (int)J); lfsr_mkdir(&lfs, name) => 0; // seek after mkdir? this tests that the internal position is @@ -794,9 +794,11 @@ code = ''' } // we should be able to keep reading, though we may pick up J - for (lfs_size_t i = I + (I >= J ? 1 : 0); i < N+1; i++) { + for (lfs_size_t i = I + ((I >= J) ? 1 : 0); i < N+1; i++) { char name[256]; - sprintf(name, "dir%04d%s", i+1 - (i >= J ? 1 : 0), (i == J ? "_" : "")); + sprintf(name, "dir%04d%s", + i+1 - ((i >= J) ? 1 : 0), + (i == J) ? "_" : ""); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -849,13 +851,13 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } // start reading lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; struct lfs_info info; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -878,7 +880,7 @@ code = ''' // remove the dir at J char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), (int)J); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)J); lfsr_remove(&lfs, name) => 0; // seek after remove? this tests that the internal position is @@ -960,13 +962,13 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } // start reading lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; struct lfs_info info; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -989,13 +991,13 @@ code = ''' // rename the dir at J char old_name[256]; - sprintf(old_name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), (int)J); + sprintf(old_name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)J); char new_name[256]; sprintf(new_name, "%s/%smved%04d", - (PARENT == 1 ? "pricklypear" - : PARENT >= 2 ? "quiabentia" + ((PARENT == 1) ? "pricklypear" + : (PARENT >= 2) ? "quiabentia" : ""), - (BEFORE ? "0" : ""), + ((BEFORE) ? "0" : ""), (int)J); lfsr_rename(&lfs, old_name, new_name) => 0; @@ -1076,13 +1078,13 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i+1); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i+1); lfsr_mkdir(&lfs, name) => 0; } // start reading lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; struct lfs_info info; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -1105,11 +1107,11 @@ code = ''' // make a dir at J char name[256]; - sprintf(name, "%s/dir%04d_", (PARENT ? "pricklypear" : ""), (int)J); + sprintf(name, "%s/dir%04d_", ((PARENT) ? "pricklypear" : ""), (int)J); lfsr_mkdir(&lfs, name) => 0; // make a dir at K - sprintf(name, "%s/dir%04d_", (PARENT ? "pricklypear" : ""), (int)K); + sprintf(name, "%s/dir%04d_", ((PARENT) ? "pricklypear" : ""), (int)K); lfsr_mkdir(&lfs, name) => 0; // seek after mkdir? this tests that the internal position is @@ -1124,12 +1126,14 @@ code = ''' } // we should be able to keep reading, though we may pick up J - for (lfs_size_t i = I + (I >= J ? 1 : 0) + (I >= K ? 1 : 0); i < N+2; i++) { + for (lfs_size_t i = I + ((I >= J) ? 1 : 0) + ((I >= K) ? 1 : 0); + i < N+2; + i++) { char name[256]; sprintf(name, "dir%04d%s", - i+1 - (i >= J + (J >= K ? 1 : 0) ? 1 : 0) - - (i >= K + (K >= J ? 1 : 0) ? 1 : 0), - (i == J + (J > K ? 1 : 0) || i == K + (K > J ? 1 : 0) + i+1 - (i >= J + ((J >= K) ? 1 : 0) ? 1 : 0) + - (i >= K + ((K >= J) ? 1 : 0) ? 1 : 0), + (i == J + ((J > K) ? 1 : 0) || i == K + ((K > J) ? 1 : 0) ? "_" : "")); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -1187,13 +1191,13 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } // start reading lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; struct lfs_info info; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -1216,11 +1220,11 @@ code = ''' // remove the dir at J char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), (int)J); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)J); lfsr_remove(&lfs, name) => 0; // remove the dir at K - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), (int)K); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)K); lfsr_remove(&lfs, name) => 0; // seek after remove? this tests that the internal position is @@ -1306,13 +1310,13 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } // start reading lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; struct lfs_info info; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -1335,23 +1339,23 @@ code = ''' // rename the dir at J char old_name[256]; - sprintf(old_name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), (int)J); + sprintf(old_name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)J); char new_name[256]; sprintf(new_name, "%s/%smved%04d", - (PARENT == 1 ? "pricklypear" - : PARENT >= 2 ? "quiabentia" + ((PARENT == 1) ? "pricklypear" + : (PARENT >= 2) ? "quiabentia" : ""), - (BEFORE ? "0" : ""), + ((BEFORE) ? "0" : ""), (int)J); lfsr_rename(&lfs, old_name, new_name) => 0; // rename the dir at K - sprintf(old_name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), (int)K); + sprintf(old_name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)K); sprintf(new_name, "%s/%smved%04d", - (PARENT == 1 ? "pricklypear" - : PARENT >= 2 ? "quiabentia" + ((PARENT == 1) ? "pricklypear" + : (PARENT >= 2) ? "quiabentia" : ""), - (BEFORE ? "0" : ""), + ((BEFORE) ? "0" : ""), (int)K); lfsr_rename(&lfs, old_name, new_name) => 0; @@ -1511,7 +1515,7 @@ code = ''' // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); } @@ -1519,7 +1523,7 @@ code = ''' // check that our mkdir worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; @@ -1530,7 +1534,7 @@ code = ''' } lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; struct lfs_info info; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -1552,7 +1556,7 @@ code = ''' lfsr_dir_close(&lfs, &dir) => 0; // now remove directories recursively - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); assert(info.type == LFS_TYPE_DIR); @@ -1570,7 +1574,7 @@ code = ''' assert(info.size == 0); char path[1024]; - sprintf(path, "%s/%s", (PARENT ? "pricklypear" : ""), info.name); + sprintf(path, "%s/%s", ((PARENT) ? "pricklypear" : ""), info.name); lfsr_remove(&lfs, path) => 0; // seek between removes? this tests that the internal position is @@ -1590,12 +1594,12 @@ code = ''' // check that our removes worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT; } - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); assert(info.type == LFS_TYPE_DIR); @@ -1650,20 +1654,20 @@ code = ''' // check if we have already started renaming, in case of powerloss struct lfs_info info; err = lfsr_stat(&lfs, - (PARENT == 1 ? (BEFORE + ((PARENT == 1) ? ((BEFORE) ? "pricklypear/0mved0000" : "pricklypear/mved0000") - : PARENT >= 2 ? (BEFORE + : (PARENT >= 2) ? ((BEFORE) ? "quiabentia/0mved0000" : "quiabentia/mved0000") - : (BEFORE + : ((BEFORE) ? "/0mved0000" : "/mved0000")), &info); if (err == LFS_ERR_NOENT) { // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); } @@ -1671,7 +1675,7 @@ code = ''' // check that our mkdir worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; @@ -1682,7 +1686,7 @@ code = ''' } lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; struct lfs_info info; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -1706,7 +1710,7 @@ code = ''' // now rename directories recursively lfsr_dir_t dir; - lfsr_dir_open(&lfs, &dir, (PARENT ? "pricklypear" : "/")) => 0; + lfsr_dir_open(&lfs, &dir, ((PARENT) ? "pricklypear" : "/")) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); assert(info.type == LFS_TYPE_DIR); @@ -1731,13 +1735,13 @@ code = ''' assert(info.size == 0); char old_path[1024]; - sprintf(old_path, "%s/%s", (PARENT ? "pricklypear" : ""), info.name); + sprintf(old_path, "%s/%s", ((PARENT) ? "pricklypear" : ""), info.name); char new_path[1024]; sprintf(new_path, "%s/%smved%s", - (PARENT == 1 ? "pricklypear" - : PARENT >= 2 ? "quiabentia" + ((PARENT == 1) ? "pricklypear" + : (PARENT >= 2) ? "quiabentia" : ""), - (BEFORE ? "0" : ""), + ((BEFORE) ? "0" : ""), &info.name[strlen("dir")]); err = lfsr_rename(&lfs, old_path, new_path); assert(!err || (TEST_PLS && err == LFS_ERR_NOENT)); @@ -1758,27 +1762,27 @@ code = ''' // check that our renames worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", (PARENT ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT; sprintf(name, "%s/%smved%04d", - (PARENT == 1 ? "pricklypear" - : PARENT >= 2 ? "quiabentia" + ((PARENT == 1) ? "pricklypear" + : (PARENT >= 2) ? "quiabentia" : ""), - (BEFORE ? "0" : ""), + ((BEFORE) ? "0" : ""), i); lfsr_stat(&lfs, name, &info) => 0; char name2[256]; - sprintf(name2, "%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(name2, "%smved%04d", ((BEFORE) ? "0" : ""), i); assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); } lfsr_dir_open(&lfs, &dir, - (PARENT == 1 ? "pricklypear" - : PARENT >= 2 ? "quiabentia" + ((PARENT == 1) ? "pricklypear" + : (PARENT >= 2) ? "quiabentia" : "/")) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -1790,7 +1794,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", (BEFORE ? "0" : ""), i); + sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); diff --git a/tests/test_mtree.toml b/tests/test_mtree.toml index f5f41842..3c491771 100644 --- a/tests/test_mtree.toml +++ b/tests/test_mtree.toml @@ -1095,9 +1095,9 @@ code = ''' // choose to create or delete, note we make sure to never delete to zero uint8_t op = (lfsr_mid_rid(&lfs, mdir.mid) == mdir.rbyd.weight || (lfsr_mid_rid(&lfs, mdir.mid) == mdir.rbyd.weight-1 - && lfsr_mtree_weight(&lfs) == lfsr_mweight(&lfs)) + && lfsr_mtree_weight(&lfs) == lfsr_mweight(&lfs))) ? 0 - : TEST_PRNG(&prng) % 2); + : TEST_PRNG(&prng) % 2; // force a compaction? if (FORCE_COMPACTION) { @@ -2153,9 +2153,9 @@ code = ''' // choose to create or delete, note we make sure to never delete to zero uint8_t op = (lfsr_mid_rid(&lfs, mdir.mid) == mdir.rbyd.weight || (lfsr_mid_rid(&lfs, mdir.mid) == mdir.rbyd.weight-1 - && lfsr_mtree_weight(&lfs) == lfsr_mweight(&lfs)) + && lfsr_mtree_weight(&lfs) == lfsr_mweight(&lfs))) ? 0 - : TEST_PRNG(&prng) % 3); + : TEST_PRNG(&prng) % 3; // force a compaction? if (FORCE_COMPACTION) { @@ -3017,7 +3017,7 @@ code = ''' memset(seen, 0, (BLOCK_COUNT+7)/8); lfsr_traversal_t traversal = LFSR_TRAVERSAL( - VALIDATE ? LFSR_TRAVERSAL_VALIDATE : 0); + (VALIDATE) ? LFSR_TRAVERSAL_VALIDATE : 0); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -3130,7 +3130,7 @@ code = ''' memset(seen, 0, (BLOCK_COUNT+7)/8); lfsr_traversal_t traversal = LFSR_TRAVERSAL( - VALIDATE ? LFSR_TRAVERSAL_VALIDATE : 0); + (VALIDATE) ? LFSR_TRAVERSAL_VALIDATE : 0); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -3255,7 +3255,7 @@ code = ''' memset(seen, 0, (BLOCK_COUNT+7)/8); lfsr_traversal_t traversal = LFSR_TRAVERSAL( - VALIDATE ? LFSR_TRAVERSAL_VALIDATE : 0); + (VALIDATE) ? LFSR_TRAVERSAL_VALIDATE : 0); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -3372,7 +3372,7 @@ code = ''' memset(seen, 0, (BLOCK_COUNT+7)/8); lfsr_traversal_t traversal = LFSR_TRAVERSAL( - VALIDATE ? LFSR_TRAVERSAL_VALIDATE : 0); + (VALIDATE) ? LFSR_TRAVERSAL_VALIDATE : 0); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -3506,7 +3506,7 @@ code = ''' memset(seen, 0, (BLOCK_COUNT+7)/8); lfsr_traversal_t traversal = LFSR_TRAVERSAL( - VALIDATE ? LFSR_TRAVERSAL_VALIDATE : 0); + (VALIDATE) ? LFSR_TRAVERSAL_VALIDATE : 0); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -3674,7 +3674,7 @@ code = ''' memset(seen, 0, (BLOCK_COUNT+7)/8); lfsr_traversal_t traversal = LFSR_TRAVERSAL( - VALIDATE ? LFSR_TRAVERSAL_VALIDATE : 0); + (VALIDATE) ? LFSR_TRAVERSAL_VALIDATE : 0); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); diff --git a/tests/test_rbyd.toml b/tests/test_rbyd.toml index 59e0786c..dbb54a96 100644 --- a/tests/test_rbyd.toml +++ b/tests/test_rbyd.toml @@ -1963,10 +1963,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -2053,10 +2053,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -2314,10 +2314,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -2385,10 +2385,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -2475,10 +2475,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -2746,10 +2746,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -2893,10 +2893,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -3480,10 +3480,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -4013,10 +4013,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -4114,10 +4114,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -4424,10 +4424,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -4515,10 +4515,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -5166,10 +5166,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -5280,10 +5280,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -5726,10 +5726,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -5836,10 +5836,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -5966,10 +5966,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N*M); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N*M]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N*M); // print permutation to help debugging @@ -6079,10 +6079,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -6293,10 +6293,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N*M); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N*M]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N*M); // print permutation to help debugging @@ -6488,10 +6488,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -6627,10 +6627,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -7155,10 +7155,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -7311,10 +7311,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -7502,10 +7502,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -7628,10 +7628,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -8032,10 +8032,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -8182,10 +8182,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -8773,10 +8773,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -8860,10 +8860,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -9874,10 +9874,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -9985,10 +9985,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -10106,10 +10106,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -10235,10 +10235,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -10373,10 +10373,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -10523,10 +10523,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -10652,10 +10652,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -10790,10 +10790,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -10939,10 +10939,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -11095,10 +11095,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -11617,10 +11617,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -11704,10 +11704,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -11843,10 +11843,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -11984,10 +11984,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -12073,10 +12073,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -12221,10 +12221,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -12371,10 +12371,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -12457,10 +12457,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging @@ -12598,10 +12598,10 @@ code = ''' // test all permutations of a given size size_t perm_count = TEST_FACTORIAL(N); for (size_t i = 0; - i < (PERMUTATION == -1 ? perm_count : 1); + i < ((PERMUTATION == -1) ? perm_count : 1); i++) { uint32_t perm[N]; - size_t perm_i = PERMUTATION == -1 ? i : (size_t)PERMUTATION; + size_t perm_i = (PERMUTATION == -1) ? i : (size_t)PERMUTATION; TEST_PERMUTATION(perm_i, perm, N); // print permutation to help debugging