Update dxcommon to latest version.

[cdecl99.git] / test / declgen.c

diff --git a/test/declgen.c b/test/declgen.c
index af7dd8d6c12f625008f2e51e25cdad161ff2f4b2..3f4c3944f613c0c094ee070899a66639d5c8ae6f 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);
@@ -322,6 +337,24 @@ static void gen_function(struct gen_rng *rng, struct cdecl_declarator *d)
 
        if (d->u.function.parameters) {
                d->u.function.variadic = gsl_rng_uniform(rng->rng) < 0.5;
+       } else if (gsl_rng_uniform(rng->rng) < 0.5) {
+               struct cdecl *param;
+
+               /* We will never generate (void) above; do it here. */
+               param = malloc_nofail(sizeof *param);
+               *param = (struct cdecl) { 0 };
+
+               param->declarators = malloc_nofail(sizeof *param->declarators);
+               *param->declarators = (struct cdecl_declarator) {
+                       .type = CDECL_DECL_NULL,
+               };
+
+               param->specifiers = malloc_nofail(sizeof *param->specifiers);
+               *param->specifiers = (struct cdecl_declspec) {
+                       .type = CDECL_TYPE_VOID,
+               };
+
+               d->u.function.parameters = param;
        }
 }