X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/ddbdd8cec2a54faef7b3a25d998ba350ec026cfe..f78c5d06a8775b33890071166d56be82d9233c8b:/test/declgen.c

diff --git a/test/declgen.c b/test/declgen.c
index af7dd8d..4fb39cb 100644
--- 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;
 	}
 }
 
@@ -369,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: