tests: Consolidate error messaging a bit.

[cdecl99.git] / t / rng.c

diff --git a/t/rng.c b/t/rng.c
index 8ae2f1369cb812dff820e368ceab54d0e133ef17..2e2fc09ebfe15c48edae62e304a11f0cfbc831b0 100644 (file)
--- a/t/rng.c
+++ b/t/rng.c
@@ -1,6 +1,6 @@
 /*
  * Simple random number generator for testing.
- * Copyright © 2022 Nick Bowler
+ * Copyright © 2022-2024 Nick Bowler
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,10 +27,10 @@
 #include <inttypes.h>
 #include <errno.h>
 #include <limits.h>
-#include <float.h>
-#include <math.h>
 
-#include "test.h"
+#if !TEST_RNG_NO_EXTERNAL_API
+#  include "test.h"
+#endif
 
 #define B64(x) ((x) & 0xffffffffffffffff)
 
@@ -72,35 +72,21 @@ static unsigned long long splitmix64(unsigned long long *state)
        return z ^ (z >> 31);
 }
 
-#if HAVE_STRTOULL
-#  define STRTOULL strtoull
-#elif HAVE___STRTOULL
-/* HP-UX 11 has __strtoull in <inttypes.h> */
-#  define STRTOULL __strtoull
-#else
-/*
- * Just fall back to strtoul -- in the worst case we just lose the ability
- * to set all 64 bits of the seed.
- */
-#  define STRTOULL strtoul
-#endif
-
+#if !TEST_RNG_NO_EXTERNAL_API
 struct test_rng *test_rng_alloc(const char *seed_str)
 {
        unsigned long long seed;
+       uintmax_t limit, seed_val;
        struct test_rng *rng;
-       char *end;
 
-       errno = 0;
-       seed = STRTOULL(seed_str, &end, 0);
-       if (*end != 0) {
-               fprintf(stderr, "%s: invalid seed\n", seed_str);
-               return NULL;
-       } else if (errno != 0) {
-               fprintf(stderr, "%s: invalid seed: %s\n",
-                               seed_str, strerror(errno));
+       limit  = (uintmax_t)0xffffffff;
+       limit |= (limit << 16 << 16);
+
+       if (!test_strtoumax(&seed_val, seed_str, limit)) {
+               print_error("%s: invalid seed", seed_str);
                return NULL;
        }
+       seed = seed_val;
 
        rng = malloc_nofail(sizeof *rng);
        rng->state[0] = splitmix64(&seed);
@@ -116,20 +102,6 @@ void test_rng_free(struct test_rng *rng)
        free(rng);
 }
 
-#define BITS_PER_FP_DIGIT ( FLT_RADIX <  4 ? 1 \
-                         : FLT_RADIX <  8 ? 2 \
-                         : FLT_RADIX < 16 ? 3 \
-                         : FLT_RADIX < 32 ? 4 \
-                         : 5 )
-
-double test_rng_uniform(struct test_rng *rng)
-{
-       unsigned long long val = xoshiro256p(rng->state);
-       int prec = MIN(64, DBL_MANT_DIG*BITS_PER_FP_DIGIT);
-
-       return ldexp(val >> (64-prec), -prec);
-}
-
 /* Calculate the least power of two greater than val, minus 1. */
 static unsigned rng_mask(unsigned val)
 {
@@ -155,3 +127,4 @@ unsigned test_rng_uniform_int(struct test_rng *rng, unsigned max)
 
        return val;
 }
+#endif