X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/31ac11cc668bb8ecc1317fd2e8bd79b7925bceeb..0c61f9637a469ac7a28b5a329551b03e6ad14d62:/src/parse-decl.c
diff --git a/src/parse-decl.c b/src/parse-decl.c
index 42931a3..2757703 100644
--- a/src/parse-decl.c
+++ b/src/parse-decl.c
@@ -1,43 +1,30 @@
/*
- * Parse and validate C declarations.
- * Copyright © 2011 Nick Bowler
+ * Parse and validate C declarations.
+ * Copyright © 2011-2012, 2020-2021 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
*/
+
#include
#include
#include
#include
#include "cdecl.h"
-#include "typemap.h"
+#include "cdecl-internal.h"
#include "parse.h"
#include "scan.h"
-#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
@@ -48,7 +35,7 @@ static bool valid_declspecs(struct cdecl *decl, bool top)
{
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;
@@ -128,12 +115,6 @@ static bool valid_declspecs(struct cdecl *decl, bool top)
* if a declarator could be interpreted as something other than a function,
* do that.
*
- * - The function declarator has a null child declarator.
- * - The function declarator has exactly one parameter, and is not variadic.
- * - The function parameter has a type specifier, and it is a typedef name.
- * - The function parameter has no other declaration specifiers.
- * - The function parameter does not declare an identifier.
- *
* Since cdecl99 supports things like [*] in any context (in C, such constructs
* are only valid in function parameter lists), we don't treat them specially
* here.
@@ -177,6 +158,8 @@ static bool function_is_reducible(struct cdecl_declarator *d)
return false; /* e.g. int (int) */
if (d->u.function.parameters->specifiers->next)
return false; /* e.g. int (size_t const) */
+ if (d->u.function.parameters->declarators->type == CDECL_DECL_POINTER)
+ return false; /* e.g. int (x *) */
return true;
}
@@ -295,21 +278,26 @@ check_parameters(struct cdecl_declarator **p, struct cdecl_declarator *d)
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;
}
@@ -371,6 +359,27 @@ normalize_specs(struct cdecl_declarator **p, struct cdecl_declarator *d)
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
@@ -436,10 +445,12 @@ struct cdecl *cdecl_parse_decl(const char *declstr)
* new specifier list.
*/
norm_specs = cdecl__normalize_specs(decl->specifiers);
-
for (struct cdecl *i = decl; i; i = i->next) {
i->specifiers = norm_specs;
+ }
+ /* Now perform checks and simplifications on each declarator. */
+ for (struct cdecl *i = decl; i; i = i->next) {
if (!forall_declarators(i, reduce_parentheses))
goto err;
if (!forall_declarators(i, simplify_functions))
@@ -452,11 +463,14 @@ struct cdecl *cdecl_parse_decl(const char *declstr)
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;
}
@@ -500,6 +514,8 @@ struct cdecl *cdecl_parse_english(const char *english)
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;