Don't allow restrict-qualified pointers to functions.

[cdecl99.git] / test / declgen.c

diff --git a/test/declgen.c b/test/declgen.c
index 9c774ff6a97ace92499c5020d5f92718c622c640..4fb39cb52e26539d29df0749a1c8e24e508c07d0 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>
@@ -178,6 +179,10 @@ retry:
        case CDECL_TYPE_IDENT:
                assert(!specs->next);
                specs->ident = gen_identifier(rng);
+               break;
+       default:
+               /* Nothing to be done. */
+               ;
        }
 
        return specs;
@@ -264,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.
@@ -274,19 +293,21 @@ static void gen_array(struct gen_rng *rng, struct cdecl_declarator *d)
        d->u.array = (struct cdecl_array){0};
 
        switch (gsl_rng_uniform_int(rng->rng, 4)) {
-       case '0':
+       case 0:
                d->u.array.vla = malloc_nofail(1);
                d->u.array.vla[0] = 0;
                break;
-       case '1':
+       case 1:
                d->u.array.vla = gen_identifier(rng);
                break;
-       case '2':
+       case 2:
                d->u.array.length = 0;
                break;
-       case '3':
-               d->u.array.length = gsl_rng_uniform_int(rng->rng, -1);
+       case 3:
+               d->u.array.length = gen_uintmax(rng);
                break;
+       default:
+               assert(0);
        }
 }
 
@@ -316,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;
        }
 }
 
@@ -363,6 +402,12 @@ struct cdecl_declarator *gen_declarators(struct gen_rng *rng)
                        break;
                case 2:
                        gen_function(rng, d);
+                       if (p && p->type == CDECL_DECL_POINTER) {
+                               struct cdecl_pointer *ptr = &p->u.pointer;
+
+                               gen_free_declspecs(ptr->qualifiers);
+                               ptr->qualifiers = gen_qualifiers(rng, false);
+                       }
                        limit = 1;
                        break;
                default: