Unbreak random array declarators.

[cdecl99.git] / test / declgen.c

diff --git a/test/declgen.c b/test/declgen.c
index af7dd8d6c12f625008f2e51e25cdad161ff2f4b2..d7bdbc1a40526c1262fa4b5dc908450b0f9dd739 100644 (file)
--- a/test/declgen.c
+++ b/test/declgen.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 #include <errno.h>
 #include <assert.h>
 #include <stdbool.h>
@@ -268,6 +269,20 @@ gen_declspecs(struct gen_rng *rng, unsigned flags)
        return gen_randomize_specs(rng, s);
 }
 
+static uintmax_t gen_uintmax(struct gen_rng *rng)
+{
+       unsigned char tmp;
+       uintmax_t ret = 0;
+
+       for (size_t i = 0; i < sizeof ret; i++) {
+               tmp = gsl_rng_uniform_int(rng->rng, UCHAR_MAX+1);
+               ret <<= CHAR_BIT;
+               ret |= tmp;
+       }
+
+       return ret;
+}
+
 /*
  * Generate a random array declarator, selecting one of four possibilities
  * uniformly at random.
@@ -289,7 +304,7 @@ static void gen_array(struct gen_rng *rng, struct cdecl_declarator *d)
                d->u.array.length = 0;
                break;
        case 3:
-               d->u.array.length = gsl_rng_uniform_int(rng->rng, -1);
+               d->u.array.length = gen_uintmax(rng);
                break;
        default:
                assert(0);