Portability improvements for new random number generator.

[cdecl99.git] / test / test.h

diff --git a/test/test.h b/test/test.h
index dbf3f82e11170ff7e72fd85c3881b0fdf64a461d..5ffe291e14c22112fda985226546c7cfb118947a 100644 (file)
--- a/test/test.h
+++ b/test/test.h
@@ -22,63 +22,19 @@
 #include <stdbool.h>
 #include <limits.h>
 #include <assert.h>
-#include <getopt.h>
 
 #ifndef _
 #  define _(x) (x)
 #endif
 
-static inline int
-print_option_start(const struct option *opt, const char *argname)
-{
-       int w;
-
-       if (!argname)
-               argname = _("ARG");
-
-       if (opt->val >= CHAR_MIN && opt->val <= CHAR_MAX) {
-               switch (opt->has_arg) {
-               case 0:
-                       w = printf(_("  -%c, --%s"), opt->val, opt->name);
-                       break;
-               case 1:
-                       w = printf(_("  -%c, --%s=%s"),
-                                  opt->val, opt->name, argname);
-                       break;
-               case 2:
-                       w = printf(_("  -%c, --%s[=%s]"),
-                                  opt->val, opt->name, argname);
-                       break;
-               default:
-                       assert(0);
-               }
-       } else {
-               switch (opt->has_arg) {
-               case 0:
-                       w = printf(_("  --%s"), opt->name);
-                       break;
-               case 1:
-                       w = printf(_("  --%s=%s"), opt->name, argname);
-                       break;
-               case 2:
-                       w = printf(_("  --%s[=%s]"), opt->name, argname);
-                       break;
-               default:
-                       assert(0);
-               }
-       }
-
-       if (w > 18) {
-               putchar('\n');
-               w = 0;
-       }
-
-       return w;
-}
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
 
 struct cdecl_declspec;
+struct option;
 struct cdecl;
 
+struct test_rng;
+
 void *malloc_nofail(size_t size);
 void *realloc_nofail(void *ptr, size_t size);
 void test_print_specifiers(struct cdecl_declspec *spec);
@@ -88,5 +44,28 @@ void test_explain_decl(struct cdecl *decl);
 bool strict_strtoul(unsigned long *val, const char *str, int base);
 
 void test_print_version(const char *program);
+void test_print_options(const struct option *lopts);
+
+/*
+ * Allocate a new random number generator with the given seed string (which
+ * should normally be a command-line argument).  The string is parsed as an
+ * integer value as if by strtoull with a base of 0.
+ */
+struct test_rng *test_rng_alloc(const char *seed);
+
+/*
+ * Free the random number generator rng.
+ */
+void test_rng_free(struct test_rng *rng);
+
+/*
+ * Return a random value uniformly on the half-open interval [0,1)
+ */
+double test_rng_uniform(struct test_rng *rng);
+
+/*
+ * Return a random integer uniformly on the closed interval [0, limit-1]
+ */
+unsigned test_rng_uniform_int(struct test_rng *rng, unsigned limit);
 
 #endif