/*
* Parse and validate C declarations.
- * Copyright © 2011 Nick Bowler
+ * Copyright © 2011-2012 Nick Bowler
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "i18n.h"
#include "normalize.h"
-/*
- * Determine if a declarator declares an identifier (other than a function
- * parameter).
- */
-static bool is_abstract(struct cdecl_declarator *d)
-{
- while (d->child)
- d = d->child;
-
- return d->type != CDECL_DECL_IDENT;
-}
-
/*
* Verify the declaration specifiers of a declaration. If top is true, treat
* this as a top-level declaration. Otherwise, treat this as a function
{
struct cdecl_declspec *specs = decl->specifiers;
struct cdecl_declarator *d = decl->declarators;
- bool abstract = is_abstract(d);
+ bool abstract = cdecl_is_abstract(d);
unsigned num_storage = 0;
unsigned long typemap;
if (!valid_declspecs(param, false))
return -1;
+ /* Check for "void" function parameters as a special case. */
for (spec = param->specifiers; spec; spec = spec->next) {
- if (spec->type == CDECL_TYPE_VOID
- && param->declarators->type == CDECL_DECL_NULL)
- has_void = true;
+ if (param->declarators->type != CDECL_DECL_NULL)
+ continue;
+ if (spec->type != CDECL_TYPE_VOID)
+ continue;
+
+ if (spec != param->specifiers || spec->next != NULL) {
+ fprintf(stderr, "void parameter must not have extra specifiers\n");
+ return -1;
+ } else if (d->u.function.parameters->next) {
+ fprintf(stderr, "a void parameter must stand alone\n");
+ return -1;
+ } else if (d->u.function.variadic) {
+ fprintf(stderr, "variadic functions cannot have a void parameter\n");
+ return -1;
+ }
}
}
- if (has_void && d->u.function.parameters->next) {
- fprintf(stderr, "a void parameter must stand alone\n");
- return -1;
- } else if (has_void && d->u.function.variadic) {
- fprintf(stderr, "variadic functions cannot have a void parameter\n");
- return -1;
- }
-
return 0;
}
return 0;
}
+static int
+check_qualifiers(struct cdecl_declarator **p, struct cdecl_declarator *d)
+{
+ struct cdecl_declspec *spec;
+ struct cdecl_pointer *ptr;
+
+ if (!d->child || d->child->type != CDECL_DECL_POINTER)
+ return 0;
+
+ ptr = &d->child->u.pointer;
+ for (spec = ptr->qualifiers; spec; spec = spec->next) {
+ if (spec->type == CDECL_QUAL_RESTRICT
+ && d->type == CDECL_DECL_FUNCTION) {
+ fprintf(stderr, "function pointers cannot be restrict-qualified\n");
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
/*
* Traverse the parse tree, calling a function on every declarator in a
* depth-first preorder traversal. The function is given a pointer to the
goto err;
if (!forall_declarators(i, normalize_specs))
goto err;
+ if (!forall_declarators(i, check_qualifiers))
+ goto err;
if (!valid_declspecs(i, true))
goto err;
- if (is_abstract(i->declarators) && (i != decl || i->next)) {
+ if (cdecl_is_abstract(i->declarators)
+ && (i != decl || i->next)) {
fprintf(stderr, "mixing type names and declarations is not allowed\n");
goto err;
}
goto err;
if (!forall_declarators(i, normalize_specs))
goto err;
+ if (!forall_declarators(i, check_qualifiers))
+ goto err;
if (!valid_declspecs(i, true))
goto err;