Hand-code the normalized specifier ordering.

[cdecl99.git] / test / declgen.c

diff --git a/test/declgen.c b/test/declgen.c
index d7bdbc1a40526c1262fa4b5dc908450b0f9dd739..c02613a23cd4cb632097c1176122838d521e876a 100644 (file)
--- a/test/declgen.c
+++ b/test/declgen.c
@@ -150,21 +150,15 @@ struct cdecl_declspec *gen_storspecs(struct gen_rng *rng, bool registeronly)
  * Generate random type specifiers.  There is a short list of valid
  * combinations, from which we can select one uniformly at random.
  */
-static const unsigned long total_types;
-static struct cdecl_declspec *gen_raw_typespecs(struct gen_rng *rng)
-{
-       switch (gsl_rng_uniform_int(rng->rng, total_types)) {
-#      include "typegen.h"
-       }
-}
-static const unsigned long total_types = TOTAL_TYPES;
+#include "typegen.h"
 
 struct cdecl_declspec *gen_typespecs(struct gen_rng *rng, bool voidtype)
 {
        struct cdecl_declspec *specs;
 
 retry:
-       specs = gen_raw_typespecs(rng);
+       specs = gen_raw_typespecs(gsl_rng_uniform_int(rng->rng,
+                                                     GEN_TOTAL_TYPES));
 
        switch (specs->type) {
        /* void is not always valid, so we might need to pick again. */
@@ -337,6 +331,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;
        }
 }
 
@@ -384,6 +396,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: